diff options
Diffstat (limited to 'pkgs/development')
304 files changed, 4459 insertions, 710 deletions
diff --git a/pkgs/development/compilers/boo/config.patch b/pkgs/development/compilers/boo/config.patch new file mode 100644 index 000000000000..f6e0eee29b1b --- /dev/null +++ b/pkgs/development/compilers/boo/config.patch @@ -0,0 +1,45 @@ +diff --git a/default.build b/default.build +index e48fd9e..b0dee4f 100644 +--- a/default.build ++++ b/default.build +@@ -23,14 +23,14 @@ + <property name="skip.ast" value="False" /> + <property name="skip.vs" value="False" /> + +- <property name="gsv.name" value="gtksourceview-1.0" /> ++ <property name="gsv.name" value="gtksourceview-2.0" /> + + <property name="build.dir" value="build" dynamic="True"/> + <property name="distrobuild.dir" value="distrobuild"/> + <property name="docs.dir" value="docs" /> + <property name="examples.dir" value="examples" /> + +- <property name="install.prefix" value="/usr/local" /> ++ <property name="install.prefix" value="$out" /> + <property name="install.destdir" value="/" /> + + <property name="install.share" value="${path::combine(install.prefix,'share')}" /> +@@ -575,9 +575,9 @@ + key files for mime detection, etc + --> + +- <property name="sharedmime.prefix" value="${pkg-config::get-variable('shared-mime-info','prefix')}" /> ++ <property name="sharedmime.prefix" value="$out" /> + <property name="fakeroot.sharedmime" value="${fakeroot}/${sharedmime.prefix}" /> +- <property name="gsv.prefix" value="${pkg-config::get-variable(gsv.name,'prefix')}" /> ++ <property name="gsv.prefix" value="$out" /> + <property name="fakeroot.gsv" value="${fakeroot}/${gsv.prefix}" /> + + <mkdir dir="${fakeroot.boolib}"/> +@@ -707,9 +707,9 @@ + key files for mime detection, etc + --> + +- <property name="sharedmime.prefix" value="${pkg-config::get-variable('shared-mime-info','prefix')}" /> ++ <property name="sharedmime.prefix" value="$out" /> + <property name="fakeroot.sharedmime" value="${fakeroot}/${sharedmime.prefix}" /> +- <property name="gsv.prefix" value="${pkg-config::get-variable(gsv.name,'prefix')}" /> ++ <property name="gsv.prefix" value="$out" /> + <property name="fakeroot.gsv" value="${fakeroot}/${gsv.prefix}" /> + + <foreach item="File" property="filename"> diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix new file mode 100644 index 000000000000..c57d4de87678 --- /dev/null +++ b/pkgs/development/compilers/boo/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant +, shared_mime_info, gtksourceview, gtk +, targetVersion ? "4.5" }: + +let + release = "alpha"; +in stdenv.mkDerivation rec { + name = "boo-${version}"; + version = "2013-10-21"; + + src = fetchFromGitHub { + owner = "boo-lang"; + repo = "boo"; + + rev = "${release}"; + sha256 = "174abdwfpq8i3ijx6bwqll16lx7xwici374rgsbymyk8g8mla094"; + }; + + buildInputs = [ + pkgconfig mono makeWrapper nant shared_mime_info gtksourceview + gtk + ]; + + patches = [ ./config.patch ]; + + postPatch = '' + sed -e 's|\$out|'$out'|' -i default.build + ''; + + buildPhase = '' + nant -t:mono-4.5 + ''; + + installPhase = '' + nant install + cp $out/lib/mono/boo/*.dll $out/lib/boo/ + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "The Boo Programming Language"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index e6fe97c6fe8f..0b4ea9a18239 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { name = "fstar-${version}"; - version = "2016-01-12"; + version = "0.9.2.0"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; - rev = "af9a231566ca52c9bc3409398c801ae9e8191cfa"; - sha256 = "1zri4gqr6j6hygnh0ckfhq93mqwk9i19vng8chnmvlr27zq734a2"; + rev = "v${version}"; + sha256 = "0vrxmxfaslngvbvkzpm1gfl1s34hdsprv8msasxf9sjqc3hlir3l"; }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with ocamlPackages; [ - mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl makeWrapper + mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl ]; preBuild = '' diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 0eddde15a58e..0c0520533bcd 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -7,6 +7,8 @@ , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra , openblas, arpack, suitesparse +# Darwin frameworks +, CoreServices, ApplicationServices }: with stdenv.lib; @@ -19,6 +21,9 @@ in let arpack = arpack_.override { inherit openblas; }; suitesparse = suitesparse_.override { inherit openblas; }; + llvmShared = if stdenv.isDarwin + then llvm.override { enableSharedLibraries = true; } + else llvm; in let @@ -68,10 +73,11 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - arpack fftw fftwSinglePrec gmp libgit2 libunwind llvm mpfr + arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr pcre2 openblas openlibm openspecfun readline suitesparse utf8proc zlib - ]; + ] ++ + stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; @@ -127,6 +133,8 @@ stdenv.mkDerivation rec { openspecfun pcre2 suitesparse ]; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; + dontStrip = true; dontPatchELF = true; diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index a0fe441b1538..67e7c932e555 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { homepage = http://protz.github.io/mezzo/; description = "A programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory"; license = licenses.gpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix new file mode 100644 index 000000000000..827dd774e788 --- /dev/null +++ b/pkgs/development/compilers/rgbds/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchFromGitHub, yacc}: + +stdenv.mkDerivation rec { + name = "rgbds-${version}"; + version = "0.2.4"; + src = fetchFromGitHub { + owner = "bentley"; + repo = "rgbds"; + rev = "v${version}"; + sha256 = "0dwq0p9g1lci8sm12a2rfk0g33z2vr75x78zdf1g84djwbz8ipc6"; + }; + nativeBuildInputs = [ yacc ]; + installFlags = "PREFIX=\${out}"; + + meta = with stdenv.lib; { + homepage = "https://www.anjbe.name/rgbds/"; + description = "An assembler/linker package that produces Game Boy programs"; + license = licenses.free; + maintainers = with maintainers; [ mbauer ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index ec80317c7777..d452d0abe300 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.11.7"; + name = "scala-2.11.8"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1l16571fw5l339wd02w2pnr3556j804zpbsbymnad67f2dpikr7z"; + sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix new file mode 100644 index 000000000000..535868bee3ba --- /dev/null +++ b/pkgs/development/compilers/wla-dx/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromGitHub, cmake}: + +stdenv.mkDerivation rec { + name = "wla-dx-git-2016-02-27"; + src = fetchFromGitHub { + owner = "vhelin"; + repo = "wla-dx"; + rev = "8189fe8d5620584ea16563875ff3c5430527c86a"; + sha256 = "02zgkcyfx7y8j6jvyi12lm29fydnd7m3rxv6g2psv23fyzmpkkir"; + }; + installPhase = '' + mkdir -p $out/bin + install binaries/* $out/bin + ''; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "http://www.villehelin.com/wla.html"; + description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; + license = licenses.gpl2; + maintainers = with maintainers; [ mbauer ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix index 4d608f4caa9d..c7704d87fad2 100644 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { homepage = "http://gnu.org/s/guile-opengl"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index 8c1706be5835..4a0f23457ba6 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { homepage = "http://gnu.org/s/guile-sdl"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index fc02ab305a38..a60a10c5c042 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation { homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 71e31de1f6a3..af494197edb5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -49,6 +49,9 @@ self: super: { # The package doesn't compile with ruby 1.9, which is our default at the moment. hruby = super.hruby.override { ruby = pkgs.ruby_2_1; }; + # help blake finding its native library + hs-blake2 = super.hs-blake2.override { b2 = pkgs.libb2; }; + # Use the default version of mysql to build this package (which is actually mariadb). mysql = super.mysql.override { mysql = pkgs.mysql.lib; }; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 2486d91b95af..af7ea54082f5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3962,6 +3965,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5037,6 +5041,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6328,6 +6333,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6806,6 +6812,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7018,6 +7025,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7214,6 +7222,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7397,6 +7406,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7957,6 +7967,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8034,6 +8045,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9071,6 +9083,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9163,6 +9176,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 9ec9fd73f469..6c5c25b89386 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3962,6 +3965,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5037,6 +5041,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6328,6 +6333,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6806,6 +6812,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7018,6 +7025,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7214,6 +7222,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7397,6 +7406,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7957,6 +7967,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8034,6 +8045,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9071,6 +9083,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9163,6 +9176,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 6f09f2d24182..eb1af4c83e76 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3962,6 +3965,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5037,6 +5041,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6328,6 +6333,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6806,6 +6812,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7018,6 +7025,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7214,6 +7222,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7397,6 +7406,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7957,6 +7967,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8034,6 +8045,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9071,6 +9083,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9163,6 +9176,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index a24c6905c07a..e4d33f2efe5d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3962,6 +3965,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5037,6 +5041,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6328,6 +6333,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6806,6 +6812,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7018,6 +7025,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7214,6 +7222,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7397,6 +7406,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7957,6 +7967,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8034,6 +8045,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9071,6 +9083,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9163,6 +9176,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index f979f700e91e..43ffde620d25 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3959,6 +3962,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5034,6 +5038,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6325,6 +6330,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6803,6 +6809,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7015,6 +7022,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7210,6 +7218,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7393,6 +7402,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7953,6 +7963,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8030,6 +8041,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9067,6 +9079,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9159,6 +9172,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 6ee51f7c6994..85d80b933525 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3959,6 +3962,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5034,6 +5038,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6325,6 +6330,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6803,6 +6809,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7015,6 +7022,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7210,6 +7218,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7393,6 +7402,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7953,6 +7963,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8030,6 +8041,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9067,6 +9079,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9159,6 +9172,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 8fe1d730c807..a0567225d9ce 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -1782,6 +1782,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1970,6 +1971,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2582,6 +2584,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3958,6 +3961,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5032,6 +5036,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6323,6 +6328,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6801,6 +6807,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7013,6 +7020,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7207,6 +7215,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7390,6 +7399,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7950,6 +7960,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8027,6 +8038,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9062,6 +9074,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9153,6 +9166,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 48f29fddd71c..30e31c1e0846 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -1782,6 +1782,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1970,6 +1971,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2582,6 +2584,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3958,6 +3961,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5032,6 +5036,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6323,6 +6328,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6801,6 +6807,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7013,6 +7020,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7207,6 +7215,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7390,6 +7399,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7950,6 +7960,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8027,6 +8038,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9062,6 +9074,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9153,6 +9166,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 49ec22af7c75..0f0c488d2e5c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -927,6 +927,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_6_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1777,6 +1778,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1963,6 +1965,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2574,6 +2577,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3949,6 +3953,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5021,6 +5026,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6312,6 +6318,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6790,6 +6797,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7002,6 +7010,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7195,6 +7204,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7378,6 +7388,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7937,6 +7948,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8014,6 +8026,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9048,6 +9061,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9139,6 +9153,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 3d4a16f325a6..c1b4d8e61127 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -927,6 +927,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_6_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1777,6 +1778,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1962,6 +1964,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2572,6 +2575,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3946,6 +3950,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5015,6 +5020,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6305,6 +6311,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6783,6 +6790,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6995,6 +7003,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7188,6 +7197,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7371,6 +7381,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7928,6 +7939,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8005,6 +8017,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9035,6 +9048,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9126,6 +9140,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 67857ee4b1c6..7da0500abde8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3936,6 +3940,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4999,6 +5004,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6285,6 +6291,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6763,6 +6770,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6974,6 +6982,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7167,6 +7176,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7349,6 +7359,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7905,6 +7916,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7981,6 +7993,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9005,6 +9018,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9096,6 +9110,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index c27a46a88c8e..437962990c39 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3935,6 +3939,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4996,6 +5001,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6281,6 +6287,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6759,6 +6766,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6970,6 +6978,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7163,6 +7172,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7345,6 +7355,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7901,6 +7912,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7977,6 +7989,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9001,6 +9014,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9092,6 +9106,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index a5a7d7fa3608..4b22bce4ac1e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3935,6 +3939,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4995,6 +5000,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6280,6 +6286,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6758,6 +6765,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6969,6 +6977,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7162,6 +7171,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7344,6 +7354,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7900,6 +7911,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7976,6 +7988,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8999,6 +9012,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9090,6 +9104,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 66812de0443e..191c04f8984b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3934,6 +3938,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4994,6 +4999,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6279,6 +6285,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6757,6 +6764,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6968,6 +6976,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7161,6 +7170,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7343,6 +7353,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7899,6 +7910,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7975,6 +7987,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8997,6 +9010,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9088,6 +9102,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index e125520cf715..6ba78851f21e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -925,6 +925,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1774,6 +1775,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1958,6 +1960,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2565,6 +2568,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3931,6 +3935,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4991,6 +4996,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6274,6 +6280,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6752,6 +6759,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6962,6 +6970,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7155,6 +7164,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7337,6 +7347,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7893,6 +7904,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7969,6 +7981,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8991,6 +9004,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9082,6 +9096,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 47821d85dab1..710db92a7e53 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -924,6 +924,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1773,6 +1774,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1957,6 +1959,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2562,6 +2565,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3927,6 +3931,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4987,6 +4992,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6268,6 +6274,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6746,6 +6753,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6955,6 +6963,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7148,6 +7157,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7330,6 +7340,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7884,6 +7895,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7960,6 +7972,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8981,6 +8994,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9072,6 +9086,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 8469c6f17c7c..ca6f51c7e0f7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -927,6 +927,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1777,6 +1778,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1962,6 +1964,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2570,6 +2573,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3943,6 +3947,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5012,6 +5017,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6301,6 +6307,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6779,6 +6786,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6990,6 +6998,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7183,6 +7192,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7365,6 +7375,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7922,6 +7933,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7999,6 +8011,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9029,6 +9042,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9120,6 +9134,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 8b9dedb59fe2..10f704082f5a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1961,6 +1963,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2569,6 +2572,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3941,6 +3945,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5009,6 +5014,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6297,6 +6303,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6775,6 +6782,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6986,6 +6994,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7179,6 +7188,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7361,6 +7371,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7918,6 +7929,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7995,6 +8007,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9024,6 +9037,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9115,6 +9129,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 23909c3d2e75..540aa779d7eb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3940,6 +3944,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5008,6 +5013,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6296,6 +6302,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6774,6 +6781,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6985,6 +6993,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7178,6 +7187,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7360,6 +7370,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7917,6 +7928,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7994,6 +8006,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9021,6 +9034,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9112,6 +9126,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 127f3e905091..b9b74b373295 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3940,6 +3944,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5003,6 +5008,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6291,6 +6297,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6769,6 +6776,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6980,6 +6988,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7173,6 +7182,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7355,6 +7365,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7912,6 +7923,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7989,6 +8001,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9016,6 +9029,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9107,6 +9121,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index efbf9037a6fb..6831e5a994d7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3937,6 +3941,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5000,6 +5005,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6287,6 +6293,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6765,6 +6772,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6976,6 +6984,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7169,6 +7178,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7351,6 +7361,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7908,6 +7919,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7985,6 +7997,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9011,6 +9024,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9102,6 +9116,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 99dc38c7f80e..fadfe04c4f6b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3936,6 +3940,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4999,6 +5004,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6286,6 +6292,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6764,6 +6771,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6975,6 +6983,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7168,6 +7177,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7350,6 +7360,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7907,6 +7918,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7984,6 +7996,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9010,6 +9023,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9101,6 +9115,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 568076876a71..b3b5b5677407 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -919,6 +919,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1763,6 +1764,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1947,6 +1949,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2354,6 +2357,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2548,6 +2552,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3909,6 +3914,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4961,6 +4967,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6225,6 +6232,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6700,6 +6708,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6909,6 +6918,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7102,6 +7112,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7283,6 +7294,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7832,6 +7844,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7907,6 +7920,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8921,6 +8935,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9012,6 +9027,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 498229f2a845..eb82bb1cece4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -919,6 +919,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1763,6 +1764,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1946,6 +1948,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2353,6 +2356,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2547,6 +2551,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3908,6 +3913,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4960,6 +4966,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6224,6 +6231,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6699,6 +6707,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6908,6 +6917,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7101,6 +7111,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7282,6 +7293,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7831,6 +7843,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7906,6 +7919,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8919,6 +8933,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9010,6 +9025,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index d779e935a1c1..453c0b845e6e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1754,6 +1755,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1935,6 +1937,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2341,6 +2344,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2534,6 +2538,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3889,6 +3894,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4937,6 +4943,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6193,6 +6200,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6665,6 +6673,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6873,6 +6882,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7065,6 +7075,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7245,6 +7256,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7788,6 +7800,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7861,6 +7874,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8870,6 +8884,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8961,6 +8976,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 88fa6fdbe079..0b26c8a2da0b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1753,6 +1754,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1934,6 +1936,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2340,6 +2343,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2533,6 +2537,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3887,6 +3892,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4934,6 +4940,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6187,6 +6194,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6659,6 +6667,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6867,6 +6876,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7058,6 +7068,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7238,6 +7249,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7779,6 +7791,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7852,6 +7865,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8861,6 +8875,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8952,6 +8967,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 265cb7ab4690..a23586c45573 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1753,6 +1754,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1934,6 +1936,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2340,6 +2343,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2533,6 +2537,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3887,6 +3892,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4934,6 +4940,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6187,6 +6194,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6659,6 +6667,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6867,6 +6876,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7058,6 +7068,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7237,6 +7248,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7778,6 +7790,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7851,6 +7864,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8860,6 +8874,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8951,6 +8966,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 64f691c05ec5..53688afb8ecb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1753,6 +1754,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1934,6 +1936,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2340,6 +2343,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2533,6 +2537,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3886,6 +3891,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4932,6 +4938,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6185,6 +6192,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6657,6 +6665,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6865,6 +6874,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7056,6 +7066,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7235,6 +7246,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7776,6 +7788,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7849,6 +7862,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8858,6 +8872,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8949,6 +8964,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 0ac7dfa05a47..ec0396321909 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1752,6 +1753,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1933,6 +1935,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2339,6 +2342,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2532,6 +2536,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3884,6 +3889,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4929,6 +4935,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6182,6 +6189,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6654,6 +6662,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6862,6 +6871,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7053,6 +7063,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7232,6 +7243,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7772,6 +7784,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7845,6 +7858,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8852,6 +8866,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8943,6 +8958,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 9070ce99658a..a3d804303551 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1752,6 +1753,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1933,6 +1935,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2339,6 +2342,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2532,6 +2536,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3883,6 +3888,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4928,6 +4934,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6180,6 +6187,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6652,6 +6660,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6860,6 +6869,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7051,6 +7061,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7230,6 +7241,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7769,6 +7781,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7842,6 +7855,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8849,6 +8863,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8939,6 +8954,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 37eff2fd08b7..aa482072e721 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1752,6 +1753,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1933,6 +1935,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2337,6 +2340,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2530,6 +2534,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3879,6 +3884,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4924,6 +4930,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6175,6 +6182,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6647,6 +6655,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6855,6 +6864,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7046,6 +7056,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7225,6 +7236,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7764,6 +7776,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7837,6 +7850,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8844,6 +8858,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8933,6 +8948,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 83f4314bb129..8f78f48e28bc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1931,6 +1933,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2335,6 +2338,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2528,6 +2532,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3875,6 +3880,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4920,6 +4926,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6170,6 +6177,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6642,6 +6650,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6850,6 +6859,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7041,6 +7051,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7220,6 +7231,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7759,6 +7771,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7832,6 +7845,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8839,6 +8853,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8928,6 +8943,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index fad6e89bae90..b73043843f58 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1930,6 +1932,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2334,6 +2337,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2527,6 +2531,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3873,6 +3878,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4917,6 +4923,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6166,6 +6173,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6638,6 +6646,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6846,6 +6855,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7037,6 +7047,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7216,6 +7227,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7754,6 +7766,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7827,6 +7840,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8833,6 +8847,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8922,6 +8937,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index de41ab241a43..44086d11797e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1930,6 +1932,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2334,6 +2337,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2527,6 +2531,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3872,6 +3877,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4916,6 +4922,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6164,6 +6171,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6636,6 +6644,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6844,6 +6853,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7035,6 +7045,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7214,6 +7225,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7750,6 +7762,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7823,6 +7836,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8828,6 +8842,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8917,6 +8932,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 56704b5a5dc0..082dd709074f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -918,6 +918,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1762,6 +1763,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1943,6 +1945,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2350,6 +2353,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2544,6 +2548,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3905,6 +3910,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4957,6 +4963,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6221,6 +6228,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6696,6 +6704,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6905,6 +6914,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7098,6 +7108,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7279,6 +7290,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7828,6 +7840,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7903,6 +7916,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8915,6 +8929,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9006,6 +9021,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 14b71d7d3627..e4088e83fda9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1930,6 +1932,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2333,6 +2336,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2526,6 +2530,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3871,6 +3876,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4915,6 +4921,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6163,6 +6170,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6634,6 +6642,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6842,6 +6851,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7033,6 +7043,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7212,6 +7223,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7747,6 +7759,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7820,6 +7833,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8825,6 +8839,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8914,6 +8929,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index a4c6afbdc206..a5feb068167e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1930,6 +1932,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2333,6 +2336,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2526,6 +2530,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3871,6 +3876,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4915,6 +4921,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6162,6 +6169,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6632,6 +6640,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6840,6 +6849,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7031,6 +7041,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7210,6 +7221,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7745,6 +7757,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7818,6 +7831,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8820,6 +8834,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8909,6 +8924,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 6b945f2af102..0cc8eb33e20a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1930,6 +1932,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2333,6 +2336,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2526,6 +2530,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3871,6 +3876,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4914,6 +4920,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6160,6 +6167,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6630,6 +6638,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6838,6 +6847,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7029,6 +7039,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7208,6 +7219,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7743,6 +7755,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7816,6 +7829,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8818,6 +8832,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8907,6 +8922,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 3ce4419e3e02..9d44f450ac39 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -918,6 +918,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1762,6 +1763,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1943,6 +1945,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2350,6 +2353,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2544,6 +2548,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3904,6 +3909,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4955,6 +4961,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6219,6 +6226,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6694,6 +6702,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6903,6 +6912,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7096,6 +7106,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7277,6 +7288,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7826,6 +7838,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7901,6 +7914,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8913,6 +8927,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9004,6 +9019,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 402e65f8b8f0..8a2b3b4deac5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -918,6 +918,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1761,6 +1762,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1942,6 +1944,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2349,6 +2352,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2543,6 +2547,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3903,6 +3908,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4954,6 +4960,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6217,6 +6224,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6691,6 +6699,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6900,6 +6909,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7092,6 +7102,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7273,6 +7284,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7822,6 +7834,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7897,6 +7910,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8909,6 +8923,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9000,6 +9015,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 489f310c2d0e..67671cfa058d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -918,6 +918,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1761,6 +1762,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1942,6 +1944,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2348,6 +2351,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2542,6 +2546,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3902,6 +3907,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4953,6 +4959,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6216,6 +6223,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6690,6 +6698,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6899,6 +6908,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7091,6 +7101,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7272,6 +7283,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7821,6 +7833,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7896,6 +7909,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8908,6 +8922,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8999,6 +9014,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 171d7187d196..395eed7a4666 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -918,6 +918,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1758,6 +1759,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1939,6 +1941,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2345,6 +2348,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2539,6 +2543,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3897,6 +3902,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4948,6 +4954,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6210,6 +6217,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6684,6 +6692,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6893,6 +6902,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7085,6 +7095,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7266,6 +7277,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7815,6 +7827,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7890,6 +7903,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8900,6 +8914,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8991,6 +9006,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index d48d29125147..56b294f3a0d5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -917,6 +917,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1757,6 +1758,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1938,6 +1940,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2344,6 +2347,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2538,6 +2542,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3896,6 +3901,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4947,6 +4953,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6209,6 +6216,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6683,6 +6691,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6892,6 +6901,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7084,6 +7094,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7265,6 +7276,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7814,6 +7826,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7889,6 +7902,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8899,6 +8913,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8990,6 +9005,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 2363e401c297..ed5076569f0c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1756,6 +1757,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1937,6 +1939,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2343,6 +2346,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2537,6 +2541,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3894,6 +3899,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4945,6 +4951,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6207,6 +6214,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6681,6 +6689,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6890,6 +6899,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7082,6 +7092,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7262,6 +7273,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7808,6 +7820,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7883,6 +7896,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8893,6 +8907,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8984,6 +8999,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 2c924184096c..154ac6f5c764 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1754,6 +1755,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1935,6 +1937,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2341,6 +2344,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2535,6 +2539,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3890,6 +3895,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4939,6 +4945,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6199,6 +6206,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6672,6 +6680,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6881,6 +6890,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7073,6 +7083,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7253,6 +7264,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7797,6 +7809,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7870,6 +7883,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8879,6 +8893,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8970,6 +8985,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index aa9d7348a733..26901fe517d1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -898,6 +898,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_0_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1701,6 +1702,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1876,6 +1878,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2272,6 +2275,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2462,6 +2466,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3332,6 +3337,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3776,6 +3782,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4797,6 +4804,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5995,6 +6003,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6451,6 +6460,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6657,6 +6667,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6850,6 +6861,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7027,6 +7039,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7548,6 +7561,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7620,6 +7634,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -7879,7 +7894,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8595,6 +8609,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8682,6 +8697,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 1e1afff1d7a3..22bf6130b779 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -898,6 +898,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1700,6 +1701,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1875,6 +1877,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2271,6 +2274,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2461,6 +2465,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3329,6 +3334,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3773,6 +3779,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4794,6 +4801,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5990,6 +5998,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6445,6 +6454,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6651,6 +6661,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6843,6 +6854,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7020,6 +7032,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7541,6 +7554,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7613,6 +7627,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -7872,7 +7887,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8587,6 +8601,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8674,6 +8689,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 6be62d0311f6..7b6a5fc116df 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -164,7 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -893,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1384,6 +1387,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1686,6 +1690,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1861,6 +1866,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2224,6 +2230,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2254,6 +2261,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2444,6 +2452,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3300,6 +3309,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3742,6 +3752,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4757,6 +4768,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4840,6 +4852,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5940,6 +5953,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6388,6 +6402,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6593,6 +6608,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6784,6 +6800,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6961,6 +6978,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7476,6 +7494,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7548,6 +7567,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7802,7 +7822,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8220,6 +8239,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8505,6 +8525,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8590,6 +8611,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 6968b8f22fff..6d667e44406e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -164,7 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -893,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1384,6 +1387,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1686,6 +1690,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1860,6 +1865,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2223,6 +2229,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2253,6 +2260,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2443,6 +2451,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3298,6 +3307,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3740,6 +3750,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4755,6 +4766,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4838,6 +4850,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5938,6 +5951,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6385,6 +6399,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6590,6 +6605,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6781,6 +6797,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6958,6 +6975,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7472,6 +7490,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7544,6 +7563,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7798,7 +7818,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8216,6 +8235,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8501,6 +8521,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8586,6 +8607,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 54a18bac10a1..e57cb676ac9d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -892,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1383,6 +1387,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1685,6 +1690,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1859,6 +1865,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1981,6 +1988,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2219,6 +2228,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2249,6 +2259,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2439,6 +2450,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3294,6 +3306,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3735,6 +3748,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4750,6 +4764,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4833,6 +4848,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5933,6 +5949,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6379,6 +6396,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6584,6 +6602,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6775,6 +6794,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6952,6 +6972,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7466,6 +7487,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7538,6 +7560,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7790,7 +7813,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8208,6 +8230,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8493,6 +8516,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8576,6 +8600,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index e2f847f30df1..b9cb47decb04 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -892,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1383,6 +1387,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1685,6 +1690,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1859,6 +1865,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1981,6 +1988,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2219,6 +2228,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2249,6 +2259,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2439,6 +2450,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3294,6 +3306,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3735,6 +3748,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4749,6 +4763,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4832,6 +4847,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5931,6 +5947,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6376,6 +6393,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6581,6 +6599,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6772,6 +6791,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6949,6 +6969,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7463,6 +7484,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7535,6 +7557,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7787,7 +7810,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8204,6 +8226,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8489,6 +8512,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8572,6 +8596,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 1757791208f1..e587a7ad38af 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -892,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1381,6 +1385,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1683,6 +1688,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1856,6 +1862,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1978,6 +1985,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2216,6 +2225,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2245,6 +2255,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2435,6 +2446,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3288,6 +3300,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3729,6 +3742,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4742,6 +4756,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4825,6 +4840,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5923,6 +5939,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6368,6 +6385,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6573,6 +6591,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6764,6 +6783,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6941,6 +6961,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7455,6 +7476,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7527,6 +7549,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7779,7 +7802,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8196,6 +8218,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8480,6 +8503,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8563,6 +8587,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index 11783029b1aa..2be3799d16d2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -892,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1381,6 +1385,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1683,6 +1688,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1856,6 +1862,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1978,6 +1985,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2216,6 +2225,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2245,6 +2255,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2435,6 +2446,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3288,6 +3300,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3729,6 +3742,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4739,6 +4753,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4822,6 +4837,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5920,6 +5936,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6365,6 +6382,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6570,6 +6588,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6761,6 +6780,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6938,6 +6958,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7451,6 +7472,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7523,6 +7545,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7775,7 +7798,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8192,6 +8214,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8476,6 +8499,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8559,6 +8583,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index e188ec15cbbc..efd1b082339a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -891,6 +894,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1380,6 +1384,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1682,6 +1687,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1855,6 +1861,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1977,6 +1984,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2215,6 +2224,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2244,6 +2254,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2434,6 +2445,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3286,6 +3298,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3726,6 +3739,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4736,6 +4750,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4819,6 +4834,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5915,6 +5931,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6003,6 +6020,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6358,6 +6376,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6562,6 +6581,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6753,6 +6773,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6929,6 +6950,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7442,6 +7464,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7514,6 +7537,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7763,7 +7787,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8180,6 +8203,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8464,6 +8488,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8547,6 +8572,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index 5875789a2af1..b2af59ffb82d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -891,6 +894,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1379,6 +1383,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1681,6 +1686,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1854,6 +1860,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1975,6 +1982,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2213,6 +2222,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2242,6 +2252,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2432,6 +2443,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3284,6 +3296,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3723,6 +3736,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4732,6 +4746,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4815,6 +4830,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5909,6 +5925,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5997,6 +6014,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6352,6 +6370,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6556,6 +6575,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6747,6 +6767,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6923,6 +6944,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7436,6 +7458,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7508,6 +7531,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7757,7 +7781,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8174,6 +8197,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8457,6 +8481,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8540,6 +8565,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix index 58b5849579c6..2668b094d9dc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -891,6 +894,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1379,6 +1383,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1681,6 +1686,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1853,6 +1859,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1974,6 +1981,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2212,6 +2221,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2241,6 +2251,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2431,6 +2442,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3283,6 +3295,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3719,6 +3732,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4723,6 +4737,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4806,6 +4821,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5900,6 +5916,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5987,6 +6004,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6340,6 +6358,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6544,6 +6563,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6735,6 +6755,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6911,6 +6932,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7423,6 +7445,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7495,6 +7518,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7744,7 +7768,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8161,6 +8184,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8444,6 +8468,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8527,6 +8552,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix index 3eeb0194a49f..fc230510d8df 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix @@ -163,6 +163,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -890,6 +893,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1377,6 +1381,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1678,6 +1683,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1848,6 +1854,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1969,6 +1976,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2206,6 +2215,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2235,6 +2245,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2425,6 +2436,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3277,6 +3289,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3713,6 +3726,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4714,6 +4728,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4797,6 +4812,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5888,6 +5904,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5975,6 +5992,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6080,6 +6098,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6326,6 +6345,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6530,6 +6550,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6721,6 +6742,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6897,6 +6919,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7408,6 +7431,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7480,6 +7504,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7729,7 +7754,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8146,6 +8170,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8428,6 +8453,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8511,6 +8537,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 69483ad17f03..450ccc34a9ab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1698,6 +1699,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1873,6 +1875,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2269,6 +2272,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2459,6 +2463,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3325,6 +3330,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3769,6 +3775,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4790,6 +4797,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5984,6 +5992,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6438,6 +6447,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6643,6 +6653,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6835,6 +6846,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7012,6 +7024,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7531,6 +7544,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7603,6 +7617,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -7862,7 +7877,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8284,6 +8298,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8576,6 +8591,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8663,6 +8679,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix index 535391a6252b..8bab2133709a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix @@ -163,6 +163,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -889,6 +892,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1376,6 +1380,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1677,6 +1682,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1847,6 +1853,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1968,6 +1975,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2205,6 +2214,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2234,6 +2244,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2424,6 +2435,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3276,6 +3288,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3712,6 +3725,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4713,6 +4727,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4796,6 +4811,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -4935,6 +4951,7 @@ self: super: { "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_4"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -5886,6 +5903,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5973,6 +5991,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6077,6 +6096,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6323,6 +6343,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6527,6 +6548,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6717,6 +6739,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6893,6 +6916,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7403,6 +7427,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7475,6 +7500,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7723,7 +7749,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8140,6 +8165,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8421,6 +8447,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8504,6 +8531,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix index 3f7fe51cd18b..5627d7f15203 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix @@ -163,6 +163,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -889,6 +892,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1376,6 +1380,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1677,6 +1682,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1847,6 +1853,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1968,6 +1975,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2204,6 +2213,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2233,6 +2243,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2423,6 +2434,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3273,6 +3285,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3708,6 +3721,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4707,6 +4721,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4790,6 +4805,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -4929,6 +4945,7 @@ self: super: { "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_4"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -5879,6 +5896,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5965,6 +5983,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6069,6 +6088,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6314,6 +6334,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6517,6 +6538,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6706,6 +6728,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6878,6 +6901,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -7382,6 +7406,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7454,6 +7479,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7702,7 +7728,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8115,6 +8140,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8394,6 +8420,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8476,6 +8503,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix index e3fb760f5380..2d4131a2761d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix @@ -163,6 +163,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -889,6 +892,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1376,6 +1380,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1677,6 +1682,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1847,6 +1853,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1968,6 +1975,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2204,6 +2213,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2233,6 +2243,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2423,6 +2434,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3271,6 +3283,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3706,6 +3719,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4701,6 +4715,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4784,6 +4799,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -4923,6 +4939,7 @@ self: super: { "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_4"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -5873,6 +5890,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5959,6 +5977,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6063,6 +6082,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6308,6 +6328,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6511,6 +6532,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6700,6 +6722,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6872,6 +6895,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -7376,6 +7400,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7448,6 +7473,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7696,7 +7722,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8109,6 +8134,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8388,6 +8414,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8470,6 +8497,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index fe46fd0999f2..2c6fede1d7cd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1697,6 +1698,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1872,6 +1874,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2237,6 +2240,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2267,6 +2271,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2457,6 +2462,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3322,6 +3328,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3766,6 +3773,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4786,6 +4794,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5980,6 +5989,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6434,6 +6444,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6639,6 +6650,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6830,6 +6842,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7007,6 +7020,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7525,6 +7539,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7597,6 +7612,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -7855,7 +7871,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8276,6 +8291,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8567,6 +8583,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8654,6 +8671,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 6d56cc3fd654..c6050740cf6d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1697,6 +1698,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1872,6 +1874,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2237,6 +2240,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2267,6 +2271,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2457,6 +2462,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3322,6 +3328,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3766,6 +3773,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4786,6 +4794,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5980,6 +5989,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6434,6 +6444,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6639,6 +6650,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6830,6 +6842,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7007,6 +7020,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7524,6 +7538,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7596,6 +7611,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -7854,7 +7870,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8275,6 +8290,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8565,6 +8581,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8652,6 +8669,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index bc5a71482e49..3ae2f390006e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1696,6 +1697,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1871,6 +1873,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2236,6 +2239,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2266,6 +2270,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2456,6 +2461,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3320,6 +3326,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3764,6 +3771,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4780,6 +4788,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5973,6 +5982,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6425,6 +6435,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6630,6 +6641,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6821,6 +6833,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6998,6 +7011,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7515,6 +7529,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7587,6 +7602,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7842,7 +7858,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8263,6 +8278,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8552,6 +8568,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8637,6 +8654,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index f9bb0ec0e00f..51691d09fe52 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1696,6 +1697,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1871,6 +1873,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2236,6 +2239,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2266,6 +2270,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2456,6 +2461,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3319,6 +3325,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3761,6 +3768,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4777,6 +4785,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5966,6 +5975,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6418,6 +6428,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6623,6 +6634,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6814,6 +6826,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6991,6 +7004,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7508,6 +7522,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7580,6 +7595,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7835,7 +7851,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8254,6 +8269,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8543,6 +8559,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8628,6 +8645,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index fb31054c6e7b..2617995e3b36 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1694,6 +1695,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1869,6 +1871,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2233,6 +2236,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2263,6 +2267,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2453,6 +2458,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3316,6 +3322,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3758,6 +3765,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4773,6 +4781,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4856,6 +4865,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5961,6 +5971,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6411,6 +6422,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6616,6 +6628,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6807,6 +6820,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6984,6 +6998,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7500,6 +7515,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7572,6 +7588,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7827,7 +7844,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8246,6 +8262,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8533,6 +8550,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8618,6 +8636,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index f5c350e91c1a..d3da3959e8f5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1692,6 +1693,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1867,6 +1869,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2230,6 +2233,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2260,6 +2264,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2450,6 +2455,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3309,6 +3315,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3751,6 +3758,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4766,6 +4774,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4849,6 +4858,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5952,6 +5962,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6401,6 +6412,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6606,6 +6618,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6797,6 +6810,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6974,6 +6988,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7490,6 +7505,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7562,6 +7578,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7816,7 +7833,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8235,6 +8251,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8522,6 +8539,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8607,6 +8625,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index e2d045ed44d2..f76aae3bf7a2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -895,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1689,6 +1690,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1864,6 +1866,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2227,6 +2230,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2257,6 +2261,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2447,6 +2452,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3304,6 +3310,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3746,6 +3753,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4761,6 +4769,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4844,6 +4853,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5946,6 +5956,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6395,6 +6406,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6600,6 +6612,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6791,6 +6804,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6968,6 +6982,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7484,6 +7499,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7556,6 +7572,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7810,7 +7827,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8229,6 +8245,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8516,6 +8533,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8601,6 +8619,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix index d744f166c32d..ae2745ddee85 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix @@ -163,6 +163,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -870,6 +872,7 @@ self: super: { "SpinCounter" = dontDistribute super."SpinCounter"; "Spintax" = dontDistribute super."Spintax"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1285,6 +1288,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1563,6 +1567,7 @@ self: super: { "bliplib" = dontDistribute super."bliplib"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_10_0_0"; "bloxorz" = dontDistribute super."bloxorz"; "blubber" = dontDistribute super."blubber"; "blubber-server" = dontDistribute super."blubber-server"; @@ -1572,6 +1577,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1737,6 +1743,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = doDistribute super."carray_0_1_6_2"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1855,6 +1862,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2080,6 +2089,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2108,6 +2118,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2295,6 +2306,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3118,6 +3130,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3544,6 +3557,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4231,6 +4245,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4485,6 +4500,7 @@ self: super: { "irc-client" = doDistribute super."irc-client_0_2_5_0"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4563,6 +4579,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5625,6 +5642,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5708,6 +5726,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = doDistribute super."patches-vector_0_1_5_0"; + "path" = doDistribute super."path_0_5_3"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5804,6 +5823,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6037,6 +6057,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; @@ -6234,6 +6255,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; @@ -6406,6 +6428,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6574,6 +6597,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -7056,6 +7080,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -7126,6 +7151,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7217,7 +7243,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7354,12 +7379,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7747,6 +7772,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8007,6 +8033,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8082,6 +8109,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix index 8645bceb82eb..0e765572ffe9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix @@ -163,6 +163,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -870,6 +872,7 @@ self: super: { "SpinCounter" = dontDistribute super."SpinCounter"; "Spintax" = dontDistribute super."Spintax"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1283,6 +1286,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1561,6 +1565,7 @@ self: super: { "bliplib" = dontDistribute super."bliplib"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_10_0_0"; "bloxorz" = dontDistribute super."bloxorz"; "blubber" = dontDistribute super."blubber"; "blubber-server" = dontDistribute super."blubber-server"; @@ -1570,6 +1575,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1735,6 +1741,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = doDistribute super."carray_0_1_6_2"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1853,6 +1860,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2078,6 +2087,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2106,6 +2116,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2293,6 +2304,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3112,6 +3124,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3538,6 +3551,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4224,6 +4238,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4473,6 +4488,7 @@ self: super: { "irc-client" = doDistribute super."irc-client_0_2_5_0"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4551,6 +4567,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5610,6 +5627,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5692,6 +5710,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5788,6 +5807,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6020,6 +6040,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; @@ -6217,6 +6238,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; @@ -6389,6 +6411,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6557,6 +6580,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -7039,6 +7063,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -7109,6 +7134,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7200,7 +7226,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7337,12 +7362,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7729,6 +7754,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7988,6 +8014,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8063,6 +8090,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix index ecca396a71cc..ae22300df635 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix @@ -163,6 +163,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -867,6 +869,7 @@ self: super: { "SpinCounter" = dontDistribute super."SpinCounter"; "Spintax" = dontDistribute super."Spintax"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1278,6 +1281,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1556,6 +1560,7 @@ self: super: { "bliplib" = dontDistribute super."bliplib"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_10_0_0"; "bloxorz" = dontDistribute super."bloxorz"; "blubber" = dontDistribute super."blubber"; "blubber-server" = dontDistribute super."blubber-server"; @@ -1565,6 +1570,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1727,6 +1733,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1844,6 +1851,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2067,6 +2076,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2095,6 +2105,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2281,6 +2292,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3093,6 +3105,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3516,6 +3529,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4193,6 +4207,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4438,6 +4453,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4516,6 +4532,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5571,6 +5588,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5653,6 +5671,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5749,6 +5768,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -5978,6 +5998,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; @@ -6174,6 +6195,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; @@ -6343,6 +6365,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6510,6 +6533,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -6986,6 +7010,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -7055,6 +7080,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7145,7 +7171,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7282,12 +7307,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7672,6 +7697,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7929,6 +7955,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8004,6 +8031,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix index 9934d049508b..c299aa73e676 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix @@ -162,6 +162,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -855,6 +857,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1263,6 +1266,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1398,7 +1402,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1544,6 +1547,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1701,6 +1705,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1749,6 +1754,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1815,6 +1821,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2034,6 +2042,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2061,6 +2070,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2243,6 +2253,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2817,6 +2828,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -3033,6 +3046,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3451,6 +3465,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4127,6 +4142,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4368,6 +4384,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4446,6 +4463,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5486,6 +5504,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5565,6 +5584,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5659,6 +5679,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -5883,6 +5904,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; @@ -6076,6 +6098,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-deriv" = dontDistribute super."regex-deriv"; @@ -6244,6 +6267,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6407,6 +6431,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6873,6 +6898,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6941,6 +6967,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7027,7 +7054,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7161,12 +7187,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7543,6 +7569,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -7797,6 +7824,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7872,6 +7900,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix index 37a5a87c4f2d..69f2161732c4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix @@ -161,6 +161,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -853,6 +855,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1260,6 +1263,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1392,7 +1396,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1537,6 +1540,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1693,6 +1697,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1741,6 +1746,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1804,6 +1810,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2023,6 +2031,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2050,6 +2059,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2231,6 +2241,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2805,6 +2816,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -3021,6 +3034,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3439,6 +3453,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4115,6 +4130,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4355,6 +4371,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4433,6 +4450,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5471,6 +5489,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5550,6 +5569,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5644,6 +5664,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -5868,6 +5889,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; @@ -6060,6 +6082,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-deriv" = dontDistribute super."regex-deriv"; @@ -6228,6 +6251,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6390,6 +6414,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6856,6 +6881,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6923,6 +6949,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7009,7 +7036,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7143,12 +7169,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7524,6 +7550,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -7778,6 +7805,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7852,6 +7880,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix index 0e4e457bf1ea..de127967a26a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix @@ -161,6 +161,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -852,6 +854,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1259,6 +1262,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1391,7 +1395,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1536,6 +1539,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1623,6 +1627,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-info" = dontDistribute super."cabal-info"; + "cabal-install" = doDistribute super."cabal-install_1_22_8_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; @@ -1691,6 +1696,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1739,6 +1745,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1802,6 +1809,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2021,6 +2030,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2048,6 +2058,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2229,6 +2240,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2799,6 +2811,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -3014,6 +3028,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3332,6 +3347,7 @@ self: super: { "hGelf" = dontDistribute super."hGelf"; "hLLVM" = dontDistribute super."hLLVM"; "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3"; "hPDB-examples" = dontDistribute super."hPDB-examples"; "hPushover" = dontDistribute super."hPushover"; "hR" = dontDistribute super."hR"; @@ -3430,6 +3446,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4106,6 +4123,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4344,6 +4362,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4422,6 +4441,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5454,6 +5474,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5533,6 +5554,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5624,6 +5646,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -5847,6 +5870,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6037,6 +6061,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-deriv" = dontDistribute super."regex-deriv"; @@ -6204,6 +6229,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6366,6 +6392,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6831,6 +6858,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6898,6 +6926,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -6984,7 +7013,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7118,12 +7146,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7498,6 +7526,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -7649,6 +7678,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7751,6 +7781,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7825,6 +7856,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix index 2e3c31fe650b..942d47f5868b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix @@ -161,6 +161,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -849,6 +851,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1253,6 +1256,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1385,7 +1389,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1528,6 +1531,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1615,6 +1619,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-info" = dontDistribute super."cabal-info"; + "cabal-install" = doDistribute super."cabal-install_1_22_8_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; @@ -1683,6 +1688,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1730,6 +1736,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1788,6 +1795,9 @@ self: super: { "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5_1"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2005,6 +2015,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2032,6 +2043,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2212,6 +2224,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2597,6 +2610,7 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_2"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; @@ -2773,6 +2787,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -2987,6 +3003,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3304,6 +3321,7 @@ self: super: { "hGelf" = dontDistribute super."hGelf"; "hLLVM" = dontDistribute super."hLLVM"; "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3"; "hPDB-examples" = dontDistribute super."hPDB-examples"; "hPushover" = dontDistribute super."hPushover"; "hR" = dontDistribute super."hR"; @@ -3402,6 +3420,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4078,6 +4097,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4315,6 +4335,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4393,6 +4414,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5421,6 +5443,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5498,6 +5521,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5589,6 +5613,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -5811,6 +5836,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5999,6 +6025,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; @@ -6164,6 +6191,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6326,6 +6354,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6706,6 +6735,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; @@ -6785,6 +6815,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6852,6 +6883,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -6937,7 +6969,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7071,12 +7102,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7450,6 +7481,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7598,6 +7630,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7699,6 +7732,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7773,6 +7807,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix index a167ad714b80..beb5cb4ebf8e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix @@ -161,6 +161,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -848,6 +850,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1251,6 +1254,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1383,7 +1387,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1526,6 +1529,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1613,6 +1617,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-info" = dontDistribute super."cabal-info"; + "cabal-install" = doDistribute super."cabal-install_1_22_8_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; @@ -1681,6 +1686,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1728,6 +1734,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1786,6 +1793,9 @@ self: super: { "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5_1"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -1912,10 +1922,12 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_6_2"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_10_1"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -1999,6 +2011,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2026,6 +2039,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2206,6 +2220,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2584,6 +2599,7 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_2"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; @@ -2759,6 +2775,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -2972,6 +2990,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3289,6 +3308,7 @@ self: super: { "hGelf" = dontDistribute super."hGelf"; "hLLVM" = dontDistribute super."hLLVM"; "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3"; "hPDB-examples" = dontDistribute super."hPDB-examples"; "hPushover" = dontDistribute super."hPushover"; "hR" = dontDistribute super."hR"; @@ -3387,6 +3407,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4058,6 +4079,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4295,6 +4317,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4373,6 +4396,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5151,6 +5175,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_1_1"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5390,6 +5415,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5466,6 +5492,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5557,6 +5584,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bzip" = dontDistribute super."pipes-bzip"; @@ -5778,6 +5806,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5965,6 +5994,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; @@ -6053,6 +6083,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_7_2"; "respond" = dontDistribute super."respond"; "rest-core" = doDistribute super."rest-core_0_37"; "rest-example" = dontDistribute super."rest-example"; @@ -6129,6 +6160,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6291,6 +6323,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6671,6 +6704,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; @@ -6750,6 +6784,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6817,6 +6852,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -6901,7 +6937,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7035,12 +7070,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7412,6 +7447,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7560,6 +7596,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7660,6 +7697,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7734,6 +7772,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix index 90bd4fed4035..516852b98a03 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix @@ -161,6 +161,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -848,6 +850,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1251,6 +1254,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1382,7 +1386,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1525,6 +1528,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1611,6 +1615,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-info" = dontDistribute super."cabal-info"; + "cabal-install" = doDistribute super."cabal-install_1_22_8_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; @@ -1679,6 +1684,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1726,6 +1732,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1784,6 +1791,9 @@ self: super: { "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5_1"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -1908,10 +1918,12 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_6_2"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_10_1"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -1995,6 +2007,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2022,6 +2035,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2202,6 +2216,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2580,6 +2595,7 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_2"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; @@ -2755,6 +2771,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -2968,6 +2986,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3285,6 +3304,7 @@ self: super: { "hGelf" = dontDistribute super."hGelf"; "hLLVM" = dontDistribute super."hLLVM"; "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3"; "hPDB-examples" = dontDistribute super."hPDB-examples"; "hPushover" = dontDistribute super."hPushover"; "hR" = dontDistribute super."hR"; @@ -3383,6 +3403,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4052,6 +4073,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4289,6 +4311,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4366,6 +4389,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5143,6 +5167,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_1_1"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5382,6 +5407,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5458,6 +5484,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5549,6 +5576,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bzip" = dontDistribute super."pipes-bzip"; @@ -5770,6 +5798,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5957,6 +5986,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; @@ -6045,6 +6075,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_7_2"; "respond" = dontDistribute super."respond"; "rest-core" = doDistribute super."rest-core_0_37"; "rest-example" = dontDistribute super."rest-example"; @@ -6121,6 +6152,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6283,6 +6315,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6663,6 +6696,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; @@ -6742,6 +6776,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6809,6 +6844,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -6893,7 +6929,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7027,12 +7062,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7402,6 +7437,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7548,6 +7584,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7648,6 +7685,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7722,6 +7760,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 09e2ef0ec8e9..4d3f9edbf7b3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -750,8 +750,8 @@ self: { pname = "Agda"; version = "2.4.2.5"; sha256 = "959658a372d93b735d92191b372d221461026c98de4f92e56d198b576dfb67ee"; - revision = "1"; - editedCabalFile = "85d09d8a607a351be092c5e168c35b8c303b20765ceb0f01cd34956c44ba7f5a"; + revision = "2"; + editedCabalFile = "9c7786cfae8d92deb077650a31f41d15b8e1c8f15450419c268fd16162753515"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2575,6 +2575,7 @@ self: { HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; + doCheck = false; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; @@ -2804,7 +2805,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart" = callPackage + "Chart_1_5_4" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector }: @@ -2819,9 +2820,10 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart_1_6" = callPackage + "Chart" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector }: @@ -2836,7 +2838,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-cairo_1_5_1" = callPackage @@ -2858,7 +2859,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart-cairo" = callPackage + "Chart-cairo_1_5_4" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time }: @@ -2870,12 +2871,14 @@ self: { array base cairo Chart colour data-default-class lens mtl old-locale operational time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart-cairo_1_6" = callPackage + "Chart-cairo" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time }: @@ -2887,11 +2890,9 @@ self: { array base cairo Chart colour data-default-class lens mtl old-locale operational time ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-diagrams_1_3_2" = callPackage @@ -2961,7 +2962,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart-diagrams" = callPackage + "Chart-diagrams_1_5_4" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib , diagrams-postscript, diagrams-svg, lens, lucid-svg, mtl @@ -2979,12 +2980,14 @@ self: { diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts text time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart-diagrams_1_6" = callPackage + "Chart-diagrams" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib , diagrams-postscript, diagrams-svg, lens, lucid-svg, mtl @@ -3000,11 +3003,9 @@ self: { diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts text time ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-gtk" = callPackage @@ -3019,7 +3020,6 @@ self: { array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; @@ -6975,8 +6975,8 @@ self: { ({ mkDerivation, base, directory, gtk3, process, temporary }: mkDerivation { pname = "Gifcurry"; - version = "0.1.0.6"; - sha256 = "73a6b620ced2f499d52563803fc5684d4470947713328afe347df63ce115772f"; + version = "0.1.1.0"; + sha256 = "21f72f6c440eec80cb2e7df3fc8ed65124b64ab45ba55b4adf5dfccdca0e257a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -13287,7 +13287,6 @@ self: { base data-default ghc-prim kan-extensions mmorph monad-products mtl parallel random transformers transformers-compat ]; - jailbreak = true; homepage = "http://alkalisoftware.net"; description = "Methods for composing monads"; license = stdenv.lib.licenses.bsd3; @@ -13347,7 +13346,6 @@ self: { libraryHaskellDepends = [ base mtl random transformers transformers-compat ]; - jailbreak = true; description = "Random-number generation monad"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -13366,7 +13364,6 @@ self: { libraryHaskellDepends = [ base mtl random transformers transformers-compat ]; - jailbreak = true; description = "Random-number generation monad"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -13383,7 +13380,6 @@ self: { libraryHaskellDepends = [ base mtl random transformers transformers-compat ]; - jailbreak = true; description = "Random-number generation monad"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -18100,7 +18096,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "Spock-worker" = callPackage + "Spock-worker_0_2_1_3" = callPackage ({ mkDerivation, base, containers, HTF, lifted-base, mtl, Spock , stm, text, time, transformers, vector }: @@ -18116,6 +18112,25 @@ self: { homepage = "http://github.com/agrafix/Spock-worker"; description = "Background workers for Spock"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "Spock-worker" = callPackage + ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl + , Spock, stm, text, time, transformers, vector + }: + mkDerivation { + pname = "Spock-worker"; + version = "0.3.0.0"; + sha256 = "f5ec5c09125a6dd6c6cd0534a1eb7bc0d6bfe9908f7328d999bf14bd785835f3"; + libraryHaskellDepends = [ + base containers errors lifted-base mtl Spock stm text time + transformers vector + ]; + testHaskellDepends = [ base containers HTF stm vector ]; + homepage = "http://github.com/agrafix/Spock-worker"; + description = "Background workers for Spock"; + license = stdenv.lib.licenses.mit; }) {}; "SpreadsheetML" = callPackage @@ -22494,6 +22509,8 @@ self: { pname = "aeson-compat"; version = "0.3.1.0"; sha256 = "9275040d031433eb0006bce8228a0828e058d547c7d07d61ab0b22154286d736"; + revision = "1"; + editedCabalFile = "88dde146e4177a807888b7058f8e24d057fa826205a005ade669ce1fc395f4a2"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers exceptions hashable nats scientific text time time-locale-compat unordered-containers @@ -24001,8 +24018,8 @@ self: { ({ mkDerivation, base, containers, mtl, syb, vector }: mkDerivation { pname = "alloy"; - version = "1.2.1"; - sha256 = "db73b7f02b642aec6a007c1542874d1bb674e482bc0d19f916a9410f466c7601"; + version = "1.2.2"; + sha256 = "f0a389f7008687b6244b7d6bb5598e1d0bd1e089c96c7a45cfc0f0160feac343"; libraryHaskellDepends = [ base containers mtl syb vector ]; description = "Generic programming library"; license = stdenv.lib.licenses.bsd3; @@ -30960,7 +30977,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "atomic-primops" = callPackage + "atomic-primops_0_8_0_2" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "atomic-primops"; @@ -30970,6 +30987,19 @@ self: { homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; description = "A safe approach to CAS and other atomic ops in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "atomic-primops" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.0.3"; + sha256 = "1dbf0ac681bec29ee51125be1303536f54dc8640af9d57a92fc184152a38c997"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "atomic-primops-foreign" = callPackage @@ -34287,6 +34317,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "basic-prelude_0_5_1" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath, hashable + , lifted-base, ReadArgs, safe, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "basic-prelude"; + version = "0.5.1"; + sha256 = "0c15557a2f561a7b2472e6a34386d22917e603c14fa54d5a2069feef66b985f2"; + libraryHaskellDepends = [ + base bytestring containers filepath hashable lifted-base ReadArgs + safe text transformers unordered-containers vector + ]; + homepage = "https://github.com/snoyberg/basic-prelude"; + description = "An enhanced core prelude; a common foundation for alternate preludes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "basic-sop" = callPackage ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }: mkDerivation { @@ -34960,14 +35009,13 @@ self: { testHaskellDepends = [ base hspec QuickCheck transformers transformers-compat ]; - jailbreak = true; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bifunctors_5_2" = callPackage + "bifunctors" = callPackage ({ mkDerivation, base, comonad, containers, hspec, QuickCheck , semigroups, tagged, template-haskell, transformers , transformers-compat @@ -34983,14 +35031,13 @@ self: { testHaskellDepends = [ base hspec QuickCheck transformers transformers-compat ]; - jailbreak = true; + doHaddock = false; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bifunctors" = callPackage + "bifunctors_5_2_1" = callPackage ({ mkDerivation, base, comonad, containers, hspec, QuickCheck , semigroups, tagged, template-haskell, transformers , transformers-compat @@ -35006,10 +35053,11 @@ self: { testHaskellDepends = [ base hspec QuickCheck transformers transformers-compat ]; - doHaddock = false; + jailbreak = true; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -35525,8 +35573,8 @@ self: { pname = "binary-orphans"; version = "0.1.4.0"; sha256 = "0a952a7521747a7aacf4aa1638674130262f2efacb7121727c1932d49017f742"; - revision = "3"; - editedCabalFile = "b81b44514f6b9e69bb1cb36484268470dd9268112d974960fb6070a4bb1f307c"; + revision = "4"; + editedCabalFile = "5c473d152fd0cc986ec5330e6138d3c3b62b29f2d3ae7ebfad0832ba82593ce6"; libraryHaskellDepends = [ aeson base binary hashable scientific semigroups tagged text text-binary time unordered-containers vector @@ -38489,7 +38537,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bloodhound" = callPackage + "bloodhound_0_10_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , data-default-class, derive, directory, doctest, doctest-prop , errors, exceptions, filepath, hashable, hspec, http-client @@ -38518,6 +38566,37 @@ self: { homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bloodhound" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , data-default-class, derive, directory, doctest, doctest-prop + , errors, exceptions, filepath, hashable, hspec, http-client + , http-types, mtl, mtl-compat, network-uri, QuickCheck + , quickcheck-properties, scientific, semigroups, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "bloodhound"; + version = "0.11.0.0"; + sha256 = "df3c708675ad1e113aa31f6d1492bcf55dbef6c7e86e6202b118670a6fcbb939"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring containers data-default-class + exceptions hashable http-client http-types mtl mtl-compat + network-uri scientific semigroups text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers derive directory doctest + doctest-prop errors filepath hspec http-client http-types mtl + QuickCheck quickcheck-properties semigroups text time + unordered-containers vector + ]; + jailbreak = true; + homepage = "https://github.com/bitemyapp/bloodhound"; + description = "ElasticSearch client library for Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "bloomfilter" = callPackage @@ -38683,6 +38762,7 @@ self: { testHaskellDepends = [ array base containers QuickCheck random transformers utility-ht ]; + jailbreak = true; homepage = "http://code.haskell.org/~thielema/games/"; description = "Three games for inclusion in a web server"; license = "GPL"; @@ -38736,6 +38816,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bond-haskell-compiler" = callPackage + ({ mkDerivation, aeson, base, bond, bytestring, cmdargs, directory + , filepath, haskell-src-exts, monad-loops + }: + mkDerivation { + pname = "bond-haskell-compiler"; + version = "0.1.0.0"; + sha256 = "06bbfd191a7a2d901df2862196ae4e518306af9c363e908fd03802d7dfe27ba5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bond filepath haskell-src-exts ]; + executableHaskellDepends = [ + aeson base bond bytestring cmdargs directory filepath monad-loops + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/rblaze/bond-haskell-compiler#readme"; + description = "Bond code generator for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bool-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -39308,6 +39408,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_5" = callPackage + ({ mkDerivation, base, containers, contravariant, data-default + , deepseq, lens, template-haskell, text, text-zipper, transformers + , vector, vty + }: + mkDerivation { + pname = "brick"; + version = "0.5"; + sha256 = "70819394a586d768e31bbf34b225ce642f682b625256ebe3c8651ee203f5e942"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers contravariant data-default deepseq lens + template-haskell text text-zipper transformers vector vty + ]; + executableHaskellDepends = [ + base data-default lens text vector vty + ]; + homepage = "https://github.com/jtdaugherty/brick/"; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brillig" = callPackage ({ mkDerivation, base, binary, cmdargs, containers, directory , filepath, ListZipper, text @@ -41675,7 +41799,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "cabal-install" = callPackage + "cabal-install_1_22_8_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl , network, network-uri, pretty, process, QuickCheck, random @@ -41706,10 +41830,11 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "cabal-install_1_22_9_0" = callPackage + "cabal-install" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl , network, network-uri, pretty, process, QuickCheck, random @@ -41732,6 +41857,7 @@ self: { pretty process QuickCheck regex-posix stm test-framework test-framework-hunit test-framework-quickcheck2 time unix zlib ]; + doCheck = false; postInstall = '' mkdir $out/etc mv bash-completion $out/etc/bash_completion.d @@ -41739,7 +41865,6 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; @@ -43407,6 +43532,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "casa-abbreviations-and-acronyms" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "casa-abbreviations-and-acronyms"; + version = "0.0.1"; + sha256 = "5ebea4d5c229fbbf97fac6cd91016ef41fe712995d6f8719db330c2753e0ec8a"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/casa-abbreviations-and-acronyms"; + description = "CASA Abbreviations and Acronyms"; + license = "unknown"; + }) {}; + "casadi-bindings" = callPackage ({ mkDerivation, base, binary, casadi, casadi-bindings-core , casadi-bindings-internal, cereal, containers, doctest, linear @@ -44293,19 +44435,19 @@ self: { "cblrepo" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal , containers, directory, filepath, mtl, optparse-applicative - , process, safe, stringsearch, tar, transformers, unix, Unixutils - , utf8-string, zlib + , process, safe, stringsearch, tar, text, transformers, unix + , Unixutils, utf8-string, zlib }: mkDerivation { pname = "cblrepo"; - version = "0.19.1"; - sha256 = "e06276a14157bf82b86f3a534bc51620134253b1e9472e676616cec58ab8b436"; + version = "0.20.0"; + sha256 = "0cc8cf5888d0dc87be47a2e11c641e8f3c8f64f3e09b242694c74b69a1b093e5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers directory filepath mtl optparse-applicative process safe stringsearch tar - transformers unix Unixutils utf8-string zlib + text transformers unix Unixutils utf8-string zlib ]; jailbreak = true; description = "Tool to maintain a database of CABAL packages and their dependencies"; @@ -44790,7 +44932,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cgi" = callPackage + "cgi_3001_2_2_3" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, mtl , multipart, network, network-uri, old-locale, old-time, parsec , xhtml @@ -44806,6 +44948,26 @@ self: { homepage = "https://github.com/cheecheeo/haskell-cgi"; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cgi" = callPackage + ({ mkDerivation, base, bytestring, containers, doctest, exceptions + , mtl, multipart, network, network-uri, parsec, QuickCheck, time + , xhtml + }: + mkDerivation { + pname = "cgi"; + version = "3001.3.0.0"; + sha256 = "917d08354d9b613def8412fcb096d6adab62d62379a4f761c6cd3021d8bb644b"; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl multipart network + network-uri parsec time xhtml + ]; + testHaskellDepends = [ base doctest QuickCheck ]; + homepage = "https://github.com/cheecheeo/haskell-cgi"; + description = "A library for writing CGI programs"; + license = stdenv.lib.licenses.bsd3; }) {}; "cgi-undecidable" = callPackage @@ -46059,7 +46221,6 @@ self: { lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit tasty-th transformers-compat ]; - jailbreak = true; homepage = "http://clafer.org"; description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; license = stdenv.lib.licenses.mit; @@ -46092,7 +46253,6 @@ self: { array base clafer cmdargs directory filepath HUnit tasty tasty-hunit tasty-th transformers transformers-compat ]; - jailbreak = true; homepage = "http://clafer.org"; description = "claferIG is an interactive tool that generates instances of Clafer models"; license = stdenv.lib.licenses.mit; @@ -46112,7 +46272,6 @@ self: { network-uri process SHA split time transformers transformers-compat utf8-string ]; - jailbreak = true; homepage = "http://github.com/gsdlab/claferwiki"; description = "A wiki-based IDE for literate modeling with Clafer"; license = stdenv.lib.licenses.mit; @@ -47428,7 +47587,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude" = callPackage + "classy-prelude_0_12_5_1" = callPackage ({ mkDerivation, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl @@ -47453,6 +47612,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.6"; + sha256 = "85abaa21998914465e553421aacaf64b0dc734c5e785d3974e24027c5b33e333"; + 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 @@ -47643,7 +47830,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude-conduit" = callPackage + "classy-prelude-conduit_0_12_5" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet , transformers, void @@ -47659,6 +47846,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.6"; + sha256 = "afaee71828145632914ebe83d5f635367ed702a95a1d327dadac13daa93d69ee"; + 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; @@ -47832,7 +48042,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude-yesod" = callPackage + "classy-prelude-yesod_0_12_5" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types , persistent, yesod, yesod-newsfeed, yesod-static @@ -47846,6 +48056,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.6"; + sha256 = "db65c7f0d49a4edf0c27bce0e614ffcbc54dc37afd08d368f239322240f60839"; + 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; @@ -51138,7 +51369,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit" = callPackage + "conduit_1_2_6_2" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, mtl, QuickCheck, resourcet, safe, transformers , transformers-base @@ -51158,6 +51389,29 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, mtl, QuickCheck, resourcet, safe, transformers + , transformers-base + }: + mkDerivation { + pname = "conduit"; + version = "1.2.6.3"; + sha256 = "6816ba600c8cbd14ce9fe89f8e101dedf10dda43d2a178576324678c1722d589"; + libraryHaskellDepends = [ + base exceptions lifted-base mmorph mtl resourcet transformers + transformers-base + ]; + testHaskellDepends = [ + base containers exceptions hspec mtl QuickCheck resourcet safe + transformers + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; }) {}; "conduit-audio" = callPackage @@ -51747,7 +52001,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit-extra" = callPackage + "conduit-extra_1_1_10_1" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, directory, exceptions, filepath , hspec, monad-control, network, primitive, process, resourcet, stm @@ -51770,6 +52024,32 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit-extra" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , bytestring-builder, conduit, directory, exceptions, filepath + , hspec, monad-control, network, primitive, process, resourcet, stm + , streaming-commons, text, transformers, transformers-base + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.1.11"; + sha256 = "670009f95b16d74d1ffab5fe7f9e667249384cdddf80b8eda32413e11861ea2f"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring conduit directory + exceptions filepath monad-control network primitive process + resourcet stm streaming-commons text transformers transformers-base + ]; + testHaskellDepends = [ + async attoparsec base blaze-builder bytestring bytestring-builder + conduit exceptions hspec process resourcet stm streaming-commons + text transformers transformers-base + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Batteries included conduit: adapters for common libraries"; + license = stdenv.lib.licenses.mit; }) {}; "conduit-iconv" = callPackage @@ -54072,7 +54352,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cpphs" = callPackage + "cpphs_1_19_3" = callPackage ({ mkDerivation, base, directory, old-locale, old-time, polyparse }: mkDerivation { @@ -54090,6 +54370,27 @@ self: { homepage = "http://projects.haskell.org/cpphs/"; description = "A liberalised re-implementation of cpp, the C pre-processor"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cpphs" = callPackage + ({ mkDerivation, base, directory, old-locale, old-time, polyparse + }: + mkDerivation { + pname = "cpphs"; + version = "1.20.1"; + sha256 = "bd6eab851ec39ed5c5e4b0eb0b956f5892a36dedabcdf127a1ffa84c8e4f6017"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory old-locale old-time polyparse + ]; + executableHaskellDepends = [ + base directory old-locale old-time polyparse + ]; + homepage = "http://projects.haskell.org/cpphs/"; + description = "A liberalised re-implementation of cpp, the C pre-processor"; + license = "LGPL"; }) {}; "cprng-aes" = callPackage @@ -54752,7 +55053,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "criterion" = callPackage + "criterion_1_1_0_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , cassava, containers, deepseq, directory, filepath, Glob, hastache , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck @@ -54782,9 +55083,10 @@ self: { homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "criterion_1_1_1_0" = callPackage + "criterion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , cassava, containers, deepseq, directory, filepath, Glob, hastache , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck @@ -54814,7 +55116,6 @@ self: { homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-plus" = callPackage @@ -56696,12 +56997,12 @@ self: { ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist , directory, filepath, FindBin, hashable, haskeline, html, HTTP - , HUnit, mmap, mtl, network, network-uri, old-locale, old-time - , parsec, process, QuickCheck, random, regex-applicative - , regex-compat-tdfa, sandi, shelly, split, tar, terminfo - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, transformers, transformers-compat, unix, unix-compat - , utf8-string, vector, zip-archive, zlib + , HUnit, mmap, mtl, network, network-uri, old-time, parsec, process + , QuickCheck, random, regex-applicative, regex-compat-tdfa, sandi + , shelly, split, tar, terminfo, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, transformers-compat, unix, unix-compat, utf8-string + , vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; @@ -56715,9 +57016,9 @@ self: { libraryHaskellDepends = [ array attoparsec base base16-bytestring binary bytestring containers cryptohash data-ordlist directory filepath hashable - haskeline html HTTP mmap mtl network network-uri old-locale - old-time parsec process random regex-applicative regex-compat-tdfa - sandi tar terminfo text time transformers transformers-compat unix + haskeline html HTTP mmap mtl network network-uri old-time parsec + process random regex-applicative regex-compat-tdfa sandi tar + terminfo text time transformers transformers-compat unix unix-compat utf8-string vector zip-archive zlib ]; librarySystemDepends = [ curl ]; @@ -56729,7 +57030,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text unix-compat zip-archive zlib ]; - jailbreak = true; postInstall = '' mkdir -p $out/etc/bash_completion.d mv contrib/darcs_completion $out/etc/bash_completion.d/darcs @@ -57340,8 +57640,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.0.7.4"; - sha256 = "769f40b42d01d6e917a15fdfd381daafaabaed8d550bd7f85e6d45cb1cb2d96e"; + version = "0.1.0.0"; + sha256 = "f22ba783032ad904fc797ee3ff9d015a43cf26b7670addf4d3b74f5d6f359f45"; libraryHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/sw17ch/data-clist"; description = "Simple functional ring type"; @@ -57759,8 +58059,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; - version = "0.0.1"; - sha256 = "f93a17bedc61402014fa8b7ffdea2dfe3cee13866e4d5ec6356a8ab433452027"; + version = "0.0.2"; + sha256 = "27335dc34276f3915a42db3e49d6e63abf8eb4a673b302651acdd6f4933b2248"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/anton-k/data-fix"; description = "Fixpoint data types"; @@ -58863,8 +59163,8 @@ self: { }: mkDerivation { pname = "dbmigrations"; - version = "1.1"; - sha256 = "fe8075f25f1b55a55e792e654b8708e7f093c78b2cd75c1f1867efbf1a3cc2bc"; + version = "1.1.1"; + sha256 = "d36742052ed45f933e7883bb542c070c881685df721e526d4abc25e7a1444c9f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59021,8 +59321,8 @@ self: { }: mkDerivation { pname = "dbus-th"; - version = "0.1.1.1"; - sha256 = "6c113c42bc87a9c874f0a0d408368aa021b197f88e2d0a2ce8ecb4e6503db36b"; + version = "0.1.2.0"; + sha256 = "58560b8ae7215786b6d632e05a0ab74665abc59b66e18555493dd937cbee4909"; libraryHaskellDepends = [ base containers dbus syb template-haskell text ]; @@ -59030,6 +59330,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dbus-th-introspection" = callPackage + ({ mkDerivation, base, cmdargs, containers, dbus, dbus-th + , template-haskell + }: + mkDerivation { + pname = "dbus-th-introspection"; + version = "0.1.0.0"; + sha256 = "42c5e05f11789d9c738b5ce9495e0a25f15738db85637c49a5bb03c1ed768481"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers dbus dbus-th template-haskell + ]; + executableHaskellDepends = [ + base cmdargs containers dbus dbus-th template-haskell + ]; + jailbreak = true; + description = "Generate bindings for DBus calls by using DBus introspection and dbus-th"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dclabel" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck , quickcheck-instances, test-framework, test-framework-quickcheck2 @@ -64015,20 +64336,19 @@ self: { "distributed-process" = callPackage ({ mkDerivation, base, binary, bytestring, containers - , data-accessor, deepseq, distributed-static, ghc-prim, hashable - , mtl, network-transport, random, rank1dynamic, stm, syb + , data-accessor, deepseq, distributed-static, exceptions, ghc-prim + , hashable, mtl, network-transport, random, rank1dynamic, stm, syb , template-haskell, time, transformers }: mkDerivation { pname = "distributed-process"; - version = "0.6.0"; - sha256 = "d79f7e24e7b2896681f9f4b798da0e987742caab4c34917a0d04f40f9aef6b5b"; - revision = "2"; - editedCabalFile = "3931f513026c2190a6117df582f6ff72d06898b69fddfafe65c25d2d0460f140"; + version = "0.6.1"; + sha256 = "e533facdab2311bdfdea2dbb58e8920ad8121af36417ba98489146e5c224d555"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq - distributed-static ghc-prim hashable mtl network-transport random - rank1dynamic stm syb template-haskell time transformers + distributed-static exceptions ghc-prim hashable mtl + network-transport random rank1dynamic stm syb template-haskell time + transformers ]; doCheck = false; homepage = "http://haskell-distributed.github.com/"; @@ -64342,8 +64662,8 @@ self: { }: mkDerivation { pname = "distributed-process-lifted"; - version = "0.2.0.0"; - sha256 = "c0c323de903c6f6770c9e95e4c3dbbfc9295f55ad309220fd64710dae3a5e27f"; + version = "0.2.0.1"; + sha256 = "9f2d96e2148bdc3be54365810f2e8689e7ab2d133d6b8248701d997a92a32950"; libraryHaskellDepends = [ base deepseq distributed-process distributed-process-monad-control lifted-base monad-control mtl network-transport transformers @@ -64354,7 +64674,6 @@ self: { network-transport network-transport-tcp rematch test-framework test-framework-hunit transformers ]; - jailbreak = true; homepage = "https://github.com/jeremyjh/distributed-process-lifted"; description = "monad-control style typeclass and transformer instances for Process monad"; license = stdenv.lib.licenses.bsd3; @@ -64366,13 +64685,12 @@ self: { }: mkDerivation { pname = "distributed-process-monad-control"; - version = "0.5.1.1"; - sha256 = "dab2eb3396e4afa5fdf9f84dd51a3e6bf634c2971a28c782946cc9f4b0e7fa43"; + version = "0.5.1.2"; + sha256 = "284ff6a793a78e4d587cd5f408520b259e2e9d36ec9c69a161abe3103a18e0c7"; libraryHaskellDepends = [ base distributed-process monad-control transformers transformers-base ]; - jailbreak = true; homepage = "http://haskell-distributed.github.io"; description = "Orphan instances for MonadBase and MonadBaseControl"; license = stdenv.lib.licenses.bsd3; @@ -64702,8 +65020,8 @@ self: { }: mkDerivation { pname = "distributed-process-zookeeper"; - version = "0.2.0.0"; - sha256 = "b14f2f6a6f8f0e37bee40fd57a6e4c3491cf687a1de65f593fbac94962a912ed"; + version = "0.2.1.0"; + sha256 = "98e74ca698daf1434fda5ac2cb277e8849080ef897e907716a196c1348c84bcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64717,7 +65035,6 @@ self: { lifted-base monad-control network network-transport network-transport-tcp transformers ]; - jailbreak = true; homepage = "https://github.com/jeremyjh/distributed-process-zookeeper"; description = "A Zookeeper back-end for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; @@ -65838,13 +66155,14 @@ self: { }) {}; "download" = callPackage - ({ mkDerivation, base, bytestring, feed, tagsoup, xml }: + ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: mkDerivation { pname = "download"; - version = "0.3.2"; - sha256 = "839f46eae433b824e7013b84cfd253134a718319949447ad2b6cb28411760b5a"; + version = "0.3.2.3"; + sha256 = "8fa68c80182f763202a9301443613fe642af64b1d48251ba01b4d63c83715fc2"; libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; - homepage = "http://code.haskell.org/~dons/code/download"; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/psibi/download"; description = "High-level file download based on URLs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70054,7 +70372,6 @@ self: { libraryHaskellDepends = [ base safe transformers transformers-compat ]; - jailbreak = true; description = "Simplified error-handling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -70870,7 +71187,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore" = callPackage + "eventstore_0_10_0_2" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cereal, containers , network, protobuf, random, stm, tasty, tasty-hunit, text, time , unordered-containers, uuid @@ -70891,6 +71208,32 @@ self: { description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "eventstore" = callPackage + ({ mkDerivation, aeson, array, async, base, bytestring, cereal + , containers, dns, http-client, network, protobuf, random + , semigroups, stm, tasty, tasty-hunit, text, time + , unordered-containers, uuid + }: + mkDerivation { + pname = "eventstore"; + version = "0.11.0.0"; + sha256 = "841ea8c033dde7b59aa9eed6dfb5726866f53c4a4309fa074e357bc7cfb72915"; + libraryHaskellDepends = [ + aeson array async base bytestring cereal containers dns http-client + network protobuf random semigroups stm text time + unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base stm tasty tasty-hunit text time + ]; + doCheck = false; + homepage = "http://github.com/YoEight/eventstore"; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "every-bit-counts" = callPackage @@ -71137,7 +71480,6 @@ self: { base HUnit test-framework test-framework-hunit transformers transformers-compat ]; - jailbreak = true; description = "Type classes and monads for unchecked extensible exceptions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -75070,8 +75412,8 @@ self: { }: mkDerivation { pname = "fit"; - version = "0.5.1"; - sha256 = "ab192e41436054b04b476670748d43ff486fc90c5f80e01397bf51103fdbf278"; + version = "0.5.2"; + sha256 = "2e5ef15c5b4ea60f9861377a133801a3e2c28dcff74fa7aa5f9d8e6b115f3cf7"; libraryHaskellDepends = [ attoparsec base bytestring containers contravariant mtl text ]; @@ -76131,7 +76473,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fn" = callPackage + "fn_0_2_0_2" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, text, unordered-containers, wai , wai-extra @@ -76151,9 +76493,10 @@ self: { homepage = "http://github.com/dbp/fn#readme"; description = "A functional web framework"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fn_0_3_0_0" = callPackage + "fn" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, text, unordered-containers, wai , wai-extra @@ -76173,7 +76516,6 @@ self: { homepage = "http://github.com/dbp/fn#readme"; description = "A functional web framework"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fn-extra_0_2_0_0" = callPackage @@ -76194,7 +76536,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fn-extra" = callPackage + "fn-extra_0_2_0_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, either, fn, heist , http-types, lens, mtl, text, wai, wai-util, xmlhtml }: @@ -76209,9 +76551,10 @@ self: { homepage = "http://github.com/dbp/fn#readme"; description = "Extras for Fn, a functional web framework"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fn-extra_0_3_0_0" = callPackage + "fn-extra" = callPackage ({ mkDerivation, base, blaze-builder, bytestring , digestive-functors, directory, either, fn, heist, http-types , lens, mtl, resourcet, text, wai, wai-extra, wai-util, xmlhtml @@ -76228,7 +76571,6 @@ self: { homepage = "http://github.com/dbp/fn#readme"; description = "Extras for Fn, a functional web framework"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "focus_0_1_3" = callPackage @@ -78041,8 +78383,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "frown"; - version = "0.6.2.2"; - sha256 = "d061880b6b3fca4f2a5c054f5669d9c0747139386c47ccf57db4d5521c02c447"; + version = "0.6.2.3"; + sha256 = "fcca75244343a976a397f7d50687a80d41192e9eaa47d77799d11892f5fe400c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory ]; @@ -80239,8 +80581,8 @@ self: { }: mkDerivation { pname = "geojson"; - version = "1.3.0"; - sha256 = "1adba5e0bcfc4efad8ed9742279d78cc85d45be845257dd64999f66a872dd9a1"; + version = "1.3.1"; + sha256 = "b4f6624c79d7f1ba66519b3711c2f67b682c6c7b126fb7b4ccf87edd4c7f9661"; libraryHaskellDepends = [ aeson base lens semigroups text transformers validation vector ]; @@ -81440,7 +81782,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghcid" = callPackage + "ghcid_0_5" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time @@ -81468,9 +81810,10 @@ self: { homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghcid_0_5_1" = callPackage + "ghcid" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time @@ -81492,10 +81835,10 @@ self: { ansi-terminal base cmdargs containers directory extra filepath fsnotify process tasty tasty-hunit terminal-size time ]; + doCheck = false; homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-codemirror" = callPackage @@ -82979,15 +83322,14 @@ self: { }: mkDerivation { pname = "gitignore"; - version = "1.0.1"; - sha256 = "14bf2fb4a56ec53514986536c1b63bd5c0b1404f5c9f7b7d645cf7733585520f"; + version = "1.1"; + sha256 = "59cc0668488d3fc587b48b04293cd67fcefde64125fefc4f1d0f5682b9401084"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base base64-bytestring bytestring http-conduit network safe text ]; - jailbreak = true; homepage = "https://github.com/relrod/gitignore"; description = "Apply GitHub .gitignore templates to already existing repositories."; license = stdenv.lib.licenses.bsd3; @@ -88971,7 +89313,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hOpenPGP" = callPackage + "hOpenPGP_2_4_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib , conduit, conduit-extra, containers, crypto-cipher-types @@ -89009,6 +89351,47 @@ self: { homepage = "http://floss.scru.org/hOpenPGP/"; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hOpenPGP" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib + , conduit, conduit-extra, containers, crypto-cipher-types + , cryptonite, data-default-class, errors, hashable + , incremental-parser, ixset-typed, lens, memory, monad-loops + , nettle, network, network-uri, newtype, openpgp-asciiarmor + , QuickCheck, quickcheck-instances, resourcet, securemem + , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text + , time, time-locale-compat, transformers, unordered-containers + , wl-pprint-extras, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.4.4"; + sha256 = "6d137b38a2a60f711fd34612849f34a1731271c6a2cc83aa57c37cfea1f5a806"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bifunctors binary + binary-conduit byteable bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype openpgp-asciiarmor resourcet + securemem semigroups split text time time-locale-compat + transformers unordered-containers wl-pprint-extras zlib + ]; + testHaskellDepends = [ + aeson attoparsec base bifunctors binary binary-conduit byteable + bytestring bzlib conduit conduit-extra containers + crypto-cipher-types cryptonite data-default-class errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri newtype QuickCheck quickcheck-instances + resourcet securemem semigroups split tasty tasty-hunit + tasty-quickcheck text time time-locale-compat transformers + unordered-containers wl-pprint-extras zlib + ]; + homepage = "http://floss.scru.org/hOpenPGP/"; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; }) {}; "hPDB_1_2_0" = callPackage @@ -91694,6 +92077,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "handwriting" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, lens, lens-aeson, random, split, text, transformers + , wreq + }: + mkDerivation { + pname = "handwriting"; + version = "0.1.0.0"; + sha256 = "ce50861bc2b6957e34cc52d05cb6f7837806988bcc82edc30123e1525bdc79f9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers lens lens-aeson split text + transformers wreq + ]; + executableHaskellDepends = [ + base bytestring directory filepath random text + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/ismailmustafa/handwriting-haskell#readme"; + description = "API Client for the handwriting.io API."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hangman" = callPackage ({ mkDerivation, base, mtl, random, utility-ht }: mkDerivation { @@ -91784,8 +92191,8 @@ self: { }: mkDerivation { pname = "haphviz"; - version = "0.1.2.0"; - sha256 = "d7dcb9cc3c345a3886206fc2c50ce375fbafea5c44124602a6124d144d172f8e"; + version = "0.2.0.0"; + sha256 = "352fd5f9b696341f33ef262a15df817d3831f0bea09de1d5babb34d4388e238d"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base checkers hspec QuickCheck quickcheck-text text @@ -92484,7 +92891,6 @@ self: { testHaskellDepends = [ base bytestring containers HUnit parsec zlib ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -92515,7 +92921,6 @@ self: { testHaskellDepends = [ base bytestring containers HUnit parsec zlib ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -98674,21 +99079,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_7_1" = callPackage - ({ mkDerivation, attoparsec, base, BoundedChan, bytestring - , bytestring-lexing, deepseq, HUnit, mtl, network, resource-pool + "hedis_0_7_6" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing + , deepseq, HUnit, mtl, network, resource-pool, slave-thread , test-framework, test-framework-hunit, time, vector }: mkDerivation { pname = "hedis"; - version = "0.7.1"; - sha256 = "741dce86d4a331c64f7720ad9650e5af77ccb8c0a3301266287ae07093f7a0a0"; + version = "0.7.6"; + sha256 = "5108932156140465b41915fc043dc6e23491480576c48a4a81dd9bbb570f5cbe"; libraryHaskellDepends = [ - attoparsec base BoundedChan bytestring bytestring-lexing deepseq - mtl network resource-pool time vector + attoparsec base bytestring bytestring-lexing deepseq mtl network + resource-pool time vector ]; testHaskellDepends = [ - base bytestring HUnit mtl test-framework test-framework-hunit time + base bytestring HUnit mtl slave-thread test-framework + test-framework-hunit time ]; homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; @@ -100541,8 +100947,8 @@ self: { }: mkDerivation { pname = "higher-leveldb"; - version = "0.3.0.0"; - sha256 = "668557a64c3df44ab1ddb3f9ffd9bdaf2a88fb6f56b7712daf8ee8418370f051"; + version = "0.3.0.1"; + sha256 = "42d99bd80aa8ca53b537529a580ba9222ad840f50bc7d300120254165cb888fa"; libraryHaskellDepends = [ base bytestring cereal data-default leveldb-haskell lifted-base monad-control mtl resourcet transformers transformers-base @@ -100551,7 +100957,6 @@ self: { base bytestring cereal hspec leveldb-haskell lifted-base monad-control mtl process resourcet transformers transformers-base ]; - jailbreak = true; homepage = "https://github.com/jeremyjh/higher-leveldb"; description = "A rich monadic API for working with leveldb databases"; license = stdenv.lib.licenses.bsd3; @@ -105560,6 +105965,7 @@ self: { array base containers cpphs filemanip filepath Glob haskell-src-exts optparse-applicative split ]; + jailbreak = true; homepage = "http://github.com/luqui/hothasktags"; description = "Generates ctags for Haskell, incorporating import lists and qualified imports"; license = stdenv.lib.licenses.bsd3; @@ -110902,7 +111308,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {com_err = null; zephyr = null;}; - "htaglib" = callPackage + "htaglib_1_0_1" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HUnit , taglib, test-framework, test-framework-hunit, text }: @@ -110918,6 +111324,25 @@ self: { homepage = "https://github.com/mrkkrp/htaglib"; description = "Bindings to TagLib, audio meta-data library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) taglib;}; + + "htaglib" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, HUnit + , taglib, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "htaglib"; + version = "1.0.2"; + sha256 = "dbf110578fb4f30426a538756efa6b0bb9af5650c9d3752732973c9725385478"; + libraryHaskellDepends = [ base bytestring text ]; + librarySystemDepends = [ taglib ]; + testHaskellDepends = [ + base directory filepath HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/mrkkrp/htaglib"; + description = "Bindings to TagLib, audio meta-data library"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) taglib;}; "htags" = callPackage @@ -113107,8 +113532,8 @@ self: { }: mkDerivation { pname = "http-test"; - version = "0.2.4"; - sha256 = "03e5ea74bc05ce46b2cfabae00c307db86fdc31dc6636d33cb32655f67b4c71b"; + version = "0.2.5"; + sha256 = "06254d86b26a7df3ac6e5bee7e8c4cf74bdde12e825567a10ca81c8ae6fdb3a3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117503,13 +117928,11 @@ self: { }: mkDerivation { pname = "indentation"; - version = "0.2.1.1"; - sha256 = "72134a7c01812ccadacf1c5db86e40892136e7bf583b85c083b088cec19e65f1"; - revision = "1"; - editedCabalFile = "642875a7d7d3b8bd626f1671ff1dad1a8584bfa0fab236e5e404d8b26345317e"; + version = "0.2.1.2"; + sha256 = "dd7161daaf85a26af3ac18113760ef2af69c6d2ccef6e3febab103cd299205df"; libraryHaskellDepends = [ base mtl parsec parsers trifecta ]; testHaskellDepends = [ base parsec tasty tasty-hunit trifecta ]; - homepage = "https://bitbucket.org/adamsmd/indentation"; + homepage = "https://bitbucket.org/mdmkolbe/indentation"; description = "Indentation sensitive parsing combinators for Parsec and Trifecta"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -118606,8 +119029,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.6"; - sha256 = "8cd3cdd44e80f65f79c88a3a18580ce4bf02dc5086652f8af46ec90d18cadb42"; + version = "0.6.1"; + sha256 = "da202b4ce7d57dd675695fedfbf5bbc2a203d160e72c5fae8994a7bb7eca254c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119472,6 +119895,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-dcc" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, errors + , hspec-attoparsec, io-streams, iproute, irc-ctcp, network, path + , tasty, tasty-hspec, transformers, utf8-string + }: + mkDerivation { + pname = "irc-dcc"; + version = "1.0.0"; + sha256 = "5cb2dc63d786b76a6d6145a2b6e5599855284c1c3d9609a59f21842905d9cd3f"; + libraryHaskellDepends = [ + attoparsec base binary bytestring errors io-streams iproute + irc-ctcp network path transformers utf8-string + ]; + testHaskellDepends = [ + attoparsec base binary bytestring hspec-attoparsec iproute irc-ctcp + network path tasty tasty-hspec utf8-string + ]; + homepage = "https://github.com/JanGe/irc-dcc"; + description = "A DCC message parsing and helper library for IRC clients"; + license = stdenv.lib.licenses.mit; + }) {}; + "irc-fun-bot" = callPackage ({ mkDerivation, aeson, auto-update, base, case-insensitive, clock , containers, data-default-class, fast-logger, formatting @@ -120422,8 +120867,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.0.2"; - sha256 = "2d633a0410423ad12840449bb809f3bc3ffbc9aae7db6b365379b02ebeb3829c"; + version = "0.5.0.3"; + sha256 = "90917b080f69f47982c0c8851e7a7781e1627b42f291f11f6543214da2a7a1b4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120432,7 +120877,6 @@ self: { vector xml ]; executableHaskellDepends = [ base boxes directory filepath ]; - jailbreak = true; homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; license = "GPL"; @@ -121412,7 +121856,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "json-autotype" = callPackage + "json-autotype_1_0_10" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, GenericPretty, hashable, hflags, hint, lens, mtl , pretty, process, QuickCheck, scientific, smallcheck, text @@ -121442,9 +121886,10 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "json-autotype_1_0_11" = callPackage + "json-autotype" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, GenericPretty, hashable, hflags, hint, lens, mmap, mtl , pretty, process, QuickCheck, scientific, smallcheck, text @@ -121474,7 +121919,6 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-b" = callPackage @@ -122299,8 +122743,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.3"; - sha256 = "e57562e66b77b22f9297f5bc9e8c0e0fb00d6073f3ab0a04839284db5c6f67f9"; + version = "0.2.7"; + sha256 = "7b52f0890ed569f5962fbbb3fa9a340496711b4ca13fb4ab6bb843aea64828ab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125379,7 +125823,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c-quote" = callPackage + "language-c-quote_0_11_4" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb @@ -125403,6 +125847,32 @@ 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.4.1"; + sha256 = "37c2183ddbf95ee21d298e241266a09f73ac74065e51a0cf2fb28b45aefa9591"; + 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 + ]; + homepage = "http://www.cs.drexel.edu/~mainland/"; + description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; + license = stdenv.lib.licenses.bsd3; }) {}; "language-cil" = callPackage @@ -127086,6 +127556,7 @@ self: { leksah-server ltk monad-loops QuickCheck stm text transformers webkitgtk3 ]; + jailbreak = true; homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; @@ -129302,6 +129773,8 @@ self: { pname = "linear"; version = "1.20.3"; sha256 = "50f63a5b6019acb53ae06886749dea80443b18876c2990ca5376578c94537ac4"; + revision = "1"; + editedCabalFile = "3c3139b3d84be69cc9ec8b122cbce075d498076a4e5b4e4f8bfbda34523b91de"; libraryHaskellDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -129331,6 +129804,8 @@ self: { pname = "linear"; version = "1.20.4"; sha256 = "7bd91c482611f9b7226ec346a9630d2cf1975672b3a67e1b52ae24cdd039ddd3"; + revision = "1"; + editedCabalFile = "0f9612cde0983a35d53d29dee617abdd1d350f602ac1da7f3fcfbbc3012572b1"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection @@ -132312,6 +132787,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lucid_2_9_5" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "lucid"; + version = "2.9.5"; + sha256 = "ae73ed5490f11f23252e98b3b8c4aa4b86acc0019370e1a54e5957ebf948cbb8"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers hashable mmorph mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + homepage = "https://github.com/chrisdone/lucid"; + description = "Clear to write, read and edit DSL for HTML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-foundation" = callPackage ({ mkDerivation, base, hspec, lucid, QuickCheck , quickcheck-instances, text @@ -132900,8 +133397,8 @@ self: { }: mkDerivation { pname = "machinecell"; - version = "3.0.1"; - sha256 = "a018aa83f998b5c94daf1886269fe442566039c26060e4705095b40fa3639236"; + version = "3.1.0"; + sha256 = "0dde8e806b5418ac6c5610a3ed65dcd54ddc5f7232c516be31a5b375f6e67feb"; libraryHaskellDepends = [ arrows base free mtl profunctors semigroups ]; @@ -136884,8 +137381,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.0.0"; - sha256 = "fbae487cc6e61fa6cde0ba79b4d0df28c75e1af9c0d75970b7685a7beb18b63a"; + version = "0.5.0.1"; + sha256 = "2fe50795fe7a1826d1a24e66f5f31823cc83621de5137dd98196e2ce7420db10"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base mtl murmur-hash network random resource-pool semigroups transformers @@ -136894,7 +137391,6 @@ self: { base bytestring lens mtl network QuickCheck semigroups tasty tasty-hspec tasty-quickcheck ]; - jailbreak = true; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -138185,7 +138681,6 @@ self: { libraryHaskellDepends = [ base transformers transformers-base transformers-compat ]; - jailbreak = true; homepage = "https://github.com/basvandijk/monad-control"; description = "Lift control operations, like exception catching, through monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -138270,7 +138765,6 @@ self: { libraryHaskellDepends = [ base monad-parallel transformers transformers-compat ]; - jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine"; description = "Coroutine monad transformer for suspending and resuming monadic computations"; license = "GPL"; @@ -138934,7 +139428,6 @@ self: { libraryHaskellDepends = [ base parallel transformers transformers-compat ]; - jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; description = "Parallel execution of monadic computations"; license = stdenv.lib.licenses.bsd3; @@ -138951,7 +139444,6 @@ self: { libraryHaskellDepends = [ base parallel transformers transformers-compat ]; - jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; description = "Parallel execution of monadic computations"; license = stdenv.lib.licenses.bsd3; @@ -142137,13 +142629,12 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.1.1"; - sha256 = "b97122c1df6b5eb569e75cbc2a4c84a06e8ab942f68110a2f56b9cdac1bd34f5"; + version = "1.1.2"; + sha256 = "26b6c80efce2c38db22c46c27ba07f2d7bad0d3cddf6093b9d51d649643f8fcf"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers ]; - jailbreak = true; description = "Model-view-controller"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142209,8 +142700,8 @@ self: { ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; - version = "1.1.3"; - sha256 = "a7190d8f2b12d5aff0344a1bdc5a85386cb12960fe31e346b14806e615773363"; + version = "1.2.1"; + sha256 = "c06d839399b1bd64db11288f017badb13bea2e87afb22bd3ff1888a6171574fd"; libraryHaskellDepends = [ base mwc-random primitive transformers ]; homepage = "http://github.com/jtobin/mwc-probability"; description = "Sampling function-based probability distributions"; @@ -143321,7 +143812,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "neat-interpolation" = callPackage + "neat-interpolation_0_3_1_1" = callPackage ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell , text }: @@ -143336,9 +143827,10 @@ self: { homepage = "https://github.com/nikita-volkov/neat-interpolation"; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "neat-interpolation_0_3_2" = callPackage + "neat-interpolation" = callPackage ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell , text }: @@ -143353,7 +143845,6 @@ self: { homepage = "https://github.com/nikita-volkov/neat-interpolation"; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "needle" = callPackage @@ -146164,8 +146655,8 @@ self: { ({ mkDerivation, base, containers, numeric-prelude, primes }: mkDerivation { pname = "np-extras"; - version = "0.3.0.1"; - sha256 = "15ac78e4ba39331eee1b4db52dd822e2adabb3770c0e24d1ae58ed8b9141b2a6"; + version = "0.3.1"; + sha256 = "3e0a363aa70842155dfe0046f0e96c3feac56f7e543f6307a9d764b4af1991d1"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -148686,7 +149177,6 @@ self: { libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; - jailbreak = true; homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; @@ -148704,7 +149194,6 @@ self: { libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; - jailbreak = true; homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; @@ -149089,6 +149578,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "osm-conduit" = callPackage + ({ mkDerivation, base, conduit, exceptions, hspec, resourcet, text + , transformers, xml-conduit, xml-types + }: + mkDerivation { + pname = "osm-conduit"; + version = "0.1.0.0"; + sha256 = "df65ea545cfea5c2f274248670769a970709f2b7799b7384df4ce7211d7451f2"; + libraryHaskellDepends = [ + base conduit exceptions resourcet text transformers xml-conduit + xml-types + ]; + testHaskellDepends = [ + base conduit exceptions hspec resourcet text xml-conduit xml-types + ]; + homepage = "http://github.com/przembot/osm-conduit#readme"; + description = "Parse and operate on OSM data in efficient way"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "osm-download" = callPackage ({ mkDerivation, base, bytestring, conduit, containers , data-default, directory, gps, http-conduit, http-types @@ -150406,26 +150915,29 @@ self: { "pandoc-crossref" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor - , data-accessor-transformers, data-default, hspec, mtl, pandoc - , pandoc-types, process, yaml + , data-accessor-template, data-accessor-transformers, data-default + , hspec, mtl, pandoc, pandoc-types, process, roman-numerals, syb + , template-haskell, yaml }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.6.5"; - sha256 = "6b92a2730ed28c0242b81e47c0e21902321f98eb2b580d2114d906ca89a451e2"; + version = "0.2.0.0"; + sha256 = "e7039ced02eaaec80f0814d1d242dd06002d76dc3bed784fd18e50ddec77e3bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers data-accessor data-accessor-transformers - data-default mtl pandoc pandoc-types yaml + base bytestring containers data-accessor data-accessor-template + data-accessor-transformers data-default mtl pandoc pandoc-types + roman-numerals syb template-haskell yaml ]; executableHaskellDepends = [ base bytestring containers data-default mtl pandoc pandoc-types yaml ]; testHaskellDepends = [ - base bytestring containers data-accessor data-accessor-transformers - data-default hspec mtl pandoc pandoc-types process yaml + base bytestring containers data-accessor data-accessor-template + data-accessor-transformers data-default hspec mtl pandoc + pandoc-types process roman-numerals syb template-haskell yaml ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; @@ -151766,7 +152278,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "path" = callPackage + "path_0_5_3" = callPackage ({ mkDerivation, base, exceptions, filepath, hspec, HUnit, mtl , template-haskell }: @@ -151780,6 +152292,24 @@ self: { testHaskellDepends = [ base hspec HUnit mtl ]; description = "Path"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "path" = callPackage + ({ mkDerivation, base, deepseq, exceptions, filepath, hspec, HUnit + , mtl, template-haskell + }: + mkDerivation { + pname = "path"; + version = "0.5.7"; + sha256 = "5b631abc6cedcb634ec6886d43291e01c694d8088c5faee13a3b64010beb05ab"; + libraryHaskellDepends = [ + base deepseq exceptions filepath template-haskell + ]; + testHaskellDepends = [ base hspec HUnit mtl ]; + doHaddock = false; + description = "Support for well-typed paths"; + license = stdenv.lib.licenses.bsd3; }) {}; "path-extra" = callPackage @@ -151826,14 +152356,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_0_1" = callPackage + "path-io_1_1_0" = callPackage ({ mkDerivation, base, directory, exceptions, filepath, hspec, path , temporary, time, transformers }: mkDerivation { pname = "path-io"; - version = "1.0.1"; - sha256 = "92e4763c88c21d46d009baedb14eb724699b583bc6675b4513bb35186f421336"; + version = "1.1.0"; + sha256 = "b94af45683e0c39d259fac8cad906957b97991a3cdac45e067fd1dc9baebe59f"; libraryHaskellDepends = [ base directory exceptions filepath path temporary time transformers ]; @@ -155483,8 +156013,8 @@ self: { }: mkDerivation { pname = "pinchot"; - version = "0.12.0.0"; - sha256 = "5fbbb77f122dbb51fac0004b607b486e317df08b17dfcaccb8dd7d300f4980de"; + version = "0.14.0.0"; + sha256 = "5b7ff31987e51ff69fe75b950ac3b4d27c4d7b530b15ea3f8057b314834aad10"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155672,7 +156202,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes-aeson" = callPackage + "pipes-aeson_0_4_1_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers }: @@ -155687,6 +156217,24 @@ self: { homepage = "https://github.com/k0001/pipes-aeson"; description = "Encode and decode JSON streams using Aeson and Pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pipes-aeson" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes + , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers + }: + mkDerivation { + pname = "pipes-aeson"; + version = "0.4.1.6"; + sha256 = "fb91280e7e12c1ea1c78a36b264eafea707d08e7cd52c792a06b194ff78b03dc"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring pipes pipes-attoparsec + pipes-bytestring pipes-parse transformers + ]; + homepage = "https://github.com/k0001/pipes-aeson"; + description = "Encode and decode JSON streams using Aeson and Pipes"; + license = stdenv.lib.licenses.bsd3; }) {}; "pipes-async" = callPackage @@ -161826,6 +162374,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psql-helpers" = callPackage + ({ mkDerivation, base, postgresql-simple }: + mkDerivation { + pname = "psql-helpers"; + version = "0.1.0.0"; + sha256 = "f13ca642072477d3ab0246c514e3fc78e0c5cb419345240fbad994ed2a3219f4"; + libraryHaskellDepends = [ base postgresql-simple ]; + homepage = "http://github.com/agrafix/psql-helpers#readme"; + description = "A small collection of helper functions to generate postgresql queries"; + license = stdenv.lib.licenses.mit; + }) {}; + "psqueues_0_2_0_2" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit @@ -166452,6 +167012,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflex-orphans" = callPackage + ({ mkDerivation, base, deepseq, dependent-map, mtl, ref-tf, reflex + , tasty, tasty-hunit, these + }: + mkDerivation { + pname = "reflex-orphans"; + version = "0.1.0.1"; + sha256 = "bcebc4227af7a3a3e5b3293d135c1f7085bee563bbc7542b73ca8f8d88c7fdea"; + libraryHaskellDepends = [ base reflex these ]; + testHaskellDepends = [ + base deepseq dependent-map mtl ref-tf reflex tasty tasty-hunit + ]; + description = "Useful missing instances for Reflex"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reflex-transformers" = callPackage ({ mkDerivation, base, containers, lens, mtl, reflex, semigroups , stateWriter, transformers @@ -168137,8 +168713,8 @@ self: { ({ mkDerivation, base, containers, haskeline, mtl, process }: mkDerivation { pname = "repline"; - version = "0.1.4.0"; - sha256 = "32ae73f4343e5b4a0530259a5b23f35ff784d00e62a6adb50dc656ff2e1d119b"; + version = "0.1.5.0"; + sha256 = "9e807cf92d5f8a8e68787f6d93597bac41ace50997305105451bf852ce7ce3a4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers haskeline mtl ]; @@ -168619,7 +169195,6 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -168640,7 +169215,6 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -168661,7 +169235,6 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -168682,7 +169255,6 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -168709,7 +169281,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "resourcet" = callPackage + "resourcet_1_1_7_2" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base , transformers-compat @@ -168726,6 +169298,26 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "resourcet" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, monad-control, mtl, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "resourcet"; + version = "1.1.7.3"; + sha256 = "fccc5a897abb38156e61c801e8e0eba29f31a8ec1ad81598dec134ed1c20e1bf"; + libraryHaskellDepends = [ + base containers exceptions lifted-base mmorph monad-control mtl + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ base hspec lifted-base transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; }) {}; "respond" = callPackage @@ -168888,7 +169480,6 @@ self: { monad-control mtl resourcet rest-types tostring transformers transformers-base transformers-compat uri-encode utf8-string ]; - jailbreak = true; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -168911,7 +169502,6 @@ self: { monad-control mtl resourcet rest-types tostring transformers transformers-base transformers-compat uri-encode utf8-string ]; - jailbreak = true; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -171521,6 +172111,33 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "rss-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , conduit-parse, containers, data-default, exceptions, foldl, hlint + , lens-simple, mono-traversable, parsers, QuickCheck + , quickcheck-instances, resourcet, safe, tasty, tasty-hunit + , tasty-quickcheck, text, time, timerep, uri-bytestring + , xml-conduit, xml-conduit-parse, xml-types + }: + mkDerivation { + pname = "rss-conduit"; + version = "0.2.0.0"; + sha256 = "feff18d16f9c23e3180a7a4ae9efebcce52cdc8b8ad78791948dba33f5af53a6"; + libraryHaskellDepends = [ + base conduit conduit-parse containers exceptions foldl lens-simple + mono-traversable parsers safe text time timerep uri-bytestring + xml-conduit xml-conduit-parse xml-types + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra conduit-parse data-default + exceptions hlint lens-simple mono-traversable parsers QuickCheck + quickcheck-instances resourcet tasty tasty-hunit tasty-quickcheck + text time uri-bytestring xml-conduit xml-conduit-parse xml-types + ]; + description = "Streaming parser/renderer for the RSS 2.0 standard."; + license = "unknown"; + }) {}; + "rss2irc" = callPackage ({ mkDerivation, base, bytestring, cabal-file-th, cmdargs , containers, deepseq, feed, http-client, http-conduit, http-types @@ -173735,7 +174352,6 @@ self: { async base data-default-class directory hspec hspec-wai http-types lifted-base network text wai ]; - jailbreak = true; homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; @@ -174517,8 +175133,8 @@ self: { }: mkDerivation { pname = "secp256k1"; - version = "0.4.4"; - sha256 = "33532973312cafa00b12f5fe21ed65bd89810bd8e19be95b29c5d5aa0b9946d2"; + version = "0.4.5"; + sha256 = "0e01ac093dc418a2d9b4f3a6dafa2c527220b9e79861921119898391b9a43b2b"; libraryHaskellDepends = [ base base16-bytestring binary bytestring entropy largeword mtl QuickCheck string-conversions @@ -174528,7 +175144,7 @@ self: { mtl QuickCheck string-conversions test-framework test-framework-hunit test-framework-quickcheck2 ]; - homepage = "http://github.com/haskoin/secp256k1#readme"; + homepage = "http://github.com/haskoin/secp256k1-haskell#readme"; description = "Bindings for secp256k1 library from Bitcoin Core"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -174907,7 +175523,6 @@ self: { distributive semigroups tagged transformers transformers-compat ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; doCheck = false; homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; @@ -176248,6 +176863,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-haxl-client" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , deepseq, either, exceptions, hashable, haxl, hspec, http-client + , http-client-tls, http-media, http-types, HUnit, network + , network-uri, QuickCheck, safe, servant, servant-server + , string-conversions, text, transformers, wai, warp + }: + mkDerivation { + pname = "servant-haxl-client"; + version = "0.1.0.0"; + sha256 = "c9433881ea1aa4ff0f1eb99356cb223b7d7595859f3a1abac936488f1b18fc59"; + revision = "1"; + editedCabalFile = "9c5cd1e5bd9ba4fdb1b07de37a7aad75bd8f32d64a7f59f5cee3ec86975dbee9"; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring either exceptions hashable + haxl http-client http-client-tls http-media http-types network-uri + safe servant string-conversions text transformers + ]; + testHaskellDepends = [ + aeson base bytestring deepseq either haxl hspec http-client + http-client-tls http-media http-types HUnit network QuickCheck + servant servant-server text wai warp + ]; + homepage = "http://github.com/ElvishJerricco/servant-haxl-client/"; + description = "automatical derivation of querying functions for servant webservices"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-jquery_0_2_2_1" = callPackage ({ mkDerivation, aeson, base, filepath, hspec, language-ecmascript , lens, servant, servant-server, stm, transformers, warp @@ -184095,6 +184738,8 @@ self: { pname = "species"; version = "0.3.4.2"; sha256 = "9e1683448aa2152561c65b02fb832e366ce9f47542e5e963abd82d5e08eeb11f"; + revision = "1"; + editedCabalFile = "397aa0a55ea7021bec1f866b9dde980b9ae67319ae2838339f865babf856c431"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -186944,7 +187589,6 @@ self: { libraryHaskellDepends = [ base mtl transformers transformers-compat ]; - jailbreak = true; description = "Simple State-like monad transformer with saveable and restorable state"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -188572,7 +189216,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "streaming-commons" = callPackage + "streaming-commons_0_1_15_1" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , deepseq, directory, hspec, network, process, QuickCheck, random , stm, text, transformers, unix, zlib @@ -188592,6 +189236,29 @@ self: { homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "streaming-commons" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , deepseq, directory, hspec, network, process, QuickCheck, random + , stm, text, transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.1.15.2"; + sha256 = "230ad154608ce7c081d1367c77216c85ac47a05623903d45ce693dcea67d499d"; + libraryHaskellDepends = [ + array async base blaze-builder bytestring directory network process + random stm text transformers unix zlib + ]; + testHaskellDepends = [ + array async base blaze-builder bytestring deepseq hspec network + QuickCheck text unix zlib + ]; + homepage = "https://github.com/fpco/streaming-commons"; + description = "Common lower-level functions needed by various streaming data libraries"; + license = stdenv.lib.licenses.mit; }) {}; "streaming-histogram" = callPackage @@ -190767,6 +191434,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "symengine-hs" = callPackage + ({ mkDerivation, base, gmp, gmpxx, symengine }: + mkDerivation { + pname = "symengine-hs"; + version = "0.1.1.0"; + sha256 = "f4aa385e16a13007aaa369dfa771c8e3880ed00139a02fbc1d20d346a0d20156"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + executableSystemDepends = [ gmp gmpxx symengine ]; + testHaskellDepends = [ base ]; + testSystemDepends = [ gmp gmpxx symengine ]; + homepage = "http://github.com/bollu/symengine.hs#readme"; + description = "SymEngine symbolic mathematics engine for Haskell"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + "sync" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -192674,6 +193359,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "task-distribution" = callPackage + ({ mkDerivation, async, base, binary, bytestring, containers + , directory, distributed-process + , distributed-process-simplelocalnet, distributed-static, filepath + , hadoop-rpc, hashable, hint, hslogger, hspec, json, packman + , process, rank1dynamic, split, strings, temporary, text, time + , transformers, vector, zlib + }: + mkDerivation { + pname = "task-distribution"; + version = "0.1.0.0"; + sha256 = "70c40ecf27e8a170029b0fedf8ca0b2ffde6c6bd96d79a2310e3a1678a4e4fa4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base binary bytestring containers directory + distributed-process distributed-process-simplelocalnet + distributed-static filepath hadoop-rpc hashable hint hslogger + packman process rank1dynamic split temporary text time transformers + vector zlib + ]; + executableHaskellDepends = [ + async base binary bytestring containers directory + distributed-process filepath hadoop-rpc hslogger json process split + strings temporary text time vector zlib + ]; + testHaskellDepends = [ + base binary bytestring directory distributed-process + distributed-process-simplelocalnet distributed-static filepath + hadoop-rpc hint hslogger hspec packman process rank1dynamic split + temporary text transformers vector + ]; + homepage = "http://github.com/michaxm/task-distribution#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "taskpool" = callPackage ({ mkDerivation, async, base, containers, fgl, hspec, stm , transformers @@ -193573,8 +194295,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.2.1.0"; - sha256 = "02e564a45e095053f36e77772fc8dd9847b65f95087d47c6d50b96418f373a4f"; + version = "0.2.1.1"; + sha256 = "fd2ca89b40cdf7128c8739e5d3ff32278c5ab30aa9de21e8ab5a4ff0a2867705"; libraryHaskellDepends = [ aeson base either servant servant-client text ]; @@ -194520,7 +195242,6 @@ self: { hspec-expectations-lifted mtl process QuickCheck regex-posix template-haskell text transformers transformers-compat unix ]; - jailbreak = true; homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "Sandbox for system tests"; license = stdenv.lib.licenses.bsd3; @@ -195574,7 +196295,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-show_2_1_2" = callPackage + "text-show" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, generic-deriving , ghc-prim, hspec, integer-gmp, nats, QuickCheck @@ -195598,14 +196319,12 @@ self: { quickcheck-instances tagged text transformers transformers-compat void ]; - jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-show" = callPackage + "text-show_3_0_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, generic-deriving , ghc-prim, hspec, integer-gmp, nats, QuickCheck @@ -195628,9 +196347,11 @@ self: { integer-gmp nats QuickCheck quickcheck-instances semigroups tagged template-haskell text th-lift transformers transformers-compat void ]; + jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances" = callPackage @@ -195660,6 +196381,7 @@ self: { transformers transformers-compat unix unordered-containers vector xhtml ]; + jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; @@ -198959,7 +199681,7 @@ self: { license = "LGPL"; }) {}; - "tracy" = callPackage + "tracy_0_1_2_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "tracy"; @@ -198968,6 +199690,18 @@ self: { libraryHaskellDepends = [ base ]; description = "Convenience wrappers for non-intrusive debug tracing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tracy" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "tracy"; + version = "0.1.3.0"; + sha256 = "9c298b7ff70dd4f5aaf839e7bccbc9810f0235833bb5b723babe0838eac5d301"; + libraryHaskellDepends = [ base ]; + description = "Convenience wrappers for non-intrusive debug tracing"; + license = stdenv.lib.licenses.mit; }) {}; "trajectory" = callPackage @@ -199147,7 +199881,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers-compat_0_4_0_4" = callPackage + "transformers-compat" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "transformers-compat"; @@ -199158,10 +199892,9 @@ self: { homepage = "http://github.com/ekmett/transformers-compat/"; description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers-compat" = callPackage + "transformers-compat_0_5_1_4" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; @@ -199171,6 +199904,7 @@ self: { homepage = "http://github.com/ekmett/transformers-compat/"; description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-compose" = callPackage @@ -200387,37 +201121,21 @@ self: { }) {}; "turtle-options" = callPackage - ({ mkDerivation, base, optional-args, parsec, text, turtle }: - mkDerivation { - pname = "turtle-options"; - version = "0.1.0.2"; - sha256 = "6c1b02d67663d8849aa41c0e54ef824e013abbd6e89c71fb14c34aeb6434c8fd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base optional-args parsec text turtle ]; - executableHaskellDepends = [ base turtle ]; - testHaskellDepends = [ base ]; - homepage = "http://github.com/githubuser/turtle-options#readme"; - description = "Collection of command line options and parsers for these options"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle-options_0_1_0_3" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: mkDerivation { pname = "turtle-options"; - version = "0.1.0.3"; - sha256 = "d77e55a1a0b3ae2a5117e20780e5b98aab183ff65e9f532a03040d6b050a14d8"; + version = "0.1.0.4"; + sha256 = "c2c76b0bc0bc93397827c12b6f049e682afe702f9f662a1b0818e8e221d51ace"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base optional-args parsec text turtle ]; executableHaskellDepends = [ base turtle ]; testHaskellDepends = [ base HUnit parsec ]; + doCheck = false; homepage = "https://github.com/elaye/turtle-options#readme"; description = "Collection of command line options and parsers for these options"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tweak" = callPackage @@ -201532,8 +202250,8 @@ self: { }: mkDerivation { pname = "type-unary"; - version = "0.2.21"; - sha256 = "93ed75c592bfd4916cd89654ed15ea6d7df1fd83bf9e91f43c6e343a403ca627"; + version = "0.3.0"; + sha256 = "14083b3bdcefd7a25dd459178818602e18a1c3fa22a1017c8f58f7ee0e5f04e9"; libraryHaskellDepends = [ applicative-numbers base constraints newtype ty vector-space ]; @@ -209416,7 +210134,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-middleware-throttle" = callPackage + "wai-middleware-throttle_0_2_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, hlint , hspec, http-types, HUnit, network, stm, token-bucket , transformers, wai, wai-extra @@ -209436,6 +210154,28 @@ self: { doCheck = false; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-middleware-throttle" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, hspec + , http-types, HUnit, network, stm, token-bucket, transformers, wai + , wai-extra + }: + mkDerivation { + pname = "wai-middleware-throttle"; + version = "0.2.1.0"; + sha256 = "862ac07bb8c8e21b4f56a6398444e2e6bdf9512a198ae394fa9d023f7cfcf87c"; + libraryHaskellDepends = [ + base containers hashable http-types network stm token-bucket + transformers wai + ]; + testHaskellDepends = [ + base bytestring hspec http-types HUnit stm transformers wai + wai-extra + ]; + description = "WAI Middleware for Request Throttling"; + license = stdenv.lib.licenses.bsd3; }) {}; "wai-middleware-verbs" = callPackage @@ -211920,8 +212660,10 @@ self: { }: mkDerivation { pname = "webapi"; - version = "0.1.0.0"; - sha256 = "c0d16e251abc585bcf5f3f65a7e8c24039efc08c335515af9c491bc48c2e2465"; + version = "0.2.0.0"; + sha256 = "473b1051b0833d90d5485f467cfaa69bc7777a24973cf0628ec0d006da60500b"; + revision = "1"; + editedCabalFile = "e374eaff480d32831ea7ec5cddfdaed5c58ed38a1517635a8ec5fbb321956535"; libraryHaskellDepends = [ aeson base binary blaze-builder bytestring bytestring-lexing bytestring-trie case-insensitive containers cookie exceptions @@ -211929,8 +212671,8 @@ self: { QuickCheck resourcet text time transformers vector wai wai-extra ]; testHaskellDepends = [ - base bytestring hspec hspec-wai http-types QuickCheck text time - vector wai wai-extra warp + aeson base bytestring case-insensitive hspec hspec-wai http-media + http-types QuickCheck text time vector wai wai-extra warp ]; jailbreak = true; homepage = "http://byteally.github.io/webapi/"; @@ -215714,7 +216456,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xml-conduit" = callPackage + "xml-conduit_1_3_3_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet @@ -215736,9 +216478,10 @@ self: { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xml-conduit_1_3_4" = callPackage + "xml-conduit" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet @@ -215760,7 +216503,6 @@ self: { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-parse" = callPackage @@ -221559,6 +222301,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-richtext" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-form-richtext"; + version = "0.1.0.0"; + sha256 = "b404fed16d56aac153e2f7a6c512f1b02653edb77bfea7e5331eac08ac6c11d1"; + libraryHaskellDepends = [ + base blaze-builder blaze-html shakespeare text xss-sanitize + yesod-core yesod-form + ]; + homepage = "http://github.com/geraldus/yesod-form-richtext#readme"; + description = "Various rich-text WYSIWYG editors for Yesod forms"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-gitrepo_0_1_1_0" = callPackage ({ mkDerivation, base, directory, enclosed-exceptions, http-types , lifted-base, process, system-filepath, temporary, text, wai @@ -224047,6 +224806,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "zip" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, containers, digest, exceptions + , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck + , resourcet, semigroups, text, time, transformers + }: + mkDerivation { + pname = "zip"; + version = "0.1.0"; + sha256 = "77dff5313dbab62d8078708acbdf2369277cbe757044bd20b0f5dffa5ef13a05"; + revision = "2"; + editedCabalFile = "3f8587754a06ce6e0b4f68bf54dd91f1dc9c0384eaffa065a553fff7a6ba8bad"; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest exceptions filepath mtl path + path-io plan-b resourcet semigroups text time transformers + ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions filepath hspec path + path-io QuickCheck text time transformers + ]; + jailbreak = true; + homepage = "https://github.com/mrkkrp/zip"; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zip-archive_0_2_3_5" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 4f2e100c684a..88490e9cd9c6 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { backtracking, multi-threading, and much more... ''; license = licenses.bsd2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 25b0b02a33bc..3977b32bad70 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "0ml0sl1l5ibb8qh505fsd7y87wq9qjvaxw9y1dyfcw00d3i1z989"; + sha256 = "09s8469830s4070i0m04fxdhqimkdyc5k9jylm5vpfz9l3z4wvl8"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 4b5f3bd8b3bd..355723ba3375 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { homepage = "http://renpy.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix index 1ce2528291eb..21b42ae020a3 100644 --- a/pkgs/development/interpreters/ruby/bundix/default.nix +++ b/pkgs/development/interpreters/ruby/bundix/default.nix @@ -5,9 +5,9 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.0.5"; + version = "2.0.6"; - sha256 = "0bsynhr44jz6nih0xn7v32h1qvywnb5335ka208gn7jp6bjwabhy"; + sha256 = "0yd960awd427mg29r2yzhccd0vjimn1ljr8d8hncj6m6wg84nvh5"; buildInputs = [bundler]; diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index ad2bf945f966..91ae67474ff1 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, autoreconfHook, scheme48 }: +{ stdenv, fetchgit, autoreconfHook, scheme48 }: stdenv.mkDerivation { name = "scsh-0.7pre"; @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "0fz1r0bmiii9ld91r84dqkqwhnqk0h6drdycq93zcy5ndyn12fqp"; }; - buildInputs = [ autoconf automake autoreconfHook scheme48 ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ scheme48 ]; configureFlags = ''--with-scheme48=${scheme48}''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/apache-activemq/5.12.nix b/pkgs/development/libraries/apache-activemq/5.12.nix new file mode 100644 index 000000000000..e2e3af96532a --- /dev/null +++ b/pkgs/development/libraries/apache-activemq/5.12.nix @@ -0,0 +1,6 @@ +import ./recent.nix + rec { + version = "5.12.1"; + sha256 = "1hn6pls12dzc2fngz6lji7kmz7blvd3z1dq4via8gd4fjflmw5c9"; + mkUrl = name: "mirror://apache/activemq/${version}/${name}-bin.tar.gz"; + } diff --git a/pkgs/development/libraries/apache-activemq/5.8.nix b/pkgs/development/libraries/apache-activemq/5.8.nix new file mode 100644 index 000000000000..7e4644895e96 --- /dev/null +++ b/pkgs/development/libraries/apache-activemq/5.8.nix @@ -0,0 +1,6 @@ +import ./recent.nix + rec { + version = "5.8.0"; + sha256 = "12a1lmmqapviqdgw307jm07vw1z5q53r56pkbp85w9wnqwspjrbk"; + mkUrl = name: "mirror://apache/activemq/apache-activemq/${version}/${name}-bin.tar.gz"; + } diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/recent.nix index 2f2792dec140..a69880233433 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/recent.nix @@ -1,12 +1,13 @@ +{ version, sha256, mkUrl }: +# use a function to make the source url, because the url schemes differ between 5.8.0 and greater { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "apache-activemq-${version}"; - version = "5.8.0"; src = fetchurl { - url = "mirror://apache/activemq/apache-activemq/${version}/${name}-bin.tar.gz"; - sha256 = "12a1lmmqapviqdgw307jm07vw1z5q53r56pkbp85w9wnqwspjrbk"; + url = mkUrl name; + inherit sha256; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 5cdfa4bc601d..5df6ac2cace8 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 3fb49c2be248..c0c4bf97b60c 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -167,6 +167,15 @@ in { }; }; + ro = buildDict { + shortName = "ro-3.3-2"; + fullName = "Romanian"; + src = fetchurl { + url = mirror://gnu/aspell/dict/ro/aspell5-ro-3.3-2.tar.bz2; + sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; + }; + }; + ru = buildDict { shortName = "ru-0.99f7-1"; fullName = "Russian"; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 03f08efca985..86cde42dfa1a 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,14 +1,25 @@ { stdenv, fetchurl, atk, glibmm, pkgconfig }: - +let + ver_maj = "2.24"; + ver_min = "2"; +in stdenv.mkDerivation rec { - name = "atkmm-2.22.7"; + name = "atkmm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/atkmm/2.22/${name}.tar.xz"; - sha256 = "06zrf2ymml2dzp53sss0d4ch4dk9v09jm8rglnrmwk4v81mq9gxz"; + url = "mirror://gnome/sources/atkmm/${ver_maj}/${name}.tar.xz"; + sha256 = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd"; }; propagatedBuildInputs = [ atk glibmm ]; nativeBuildInputs = [ pkgconfig ]; + + doCheck = true; + + meta = { + description = "C++ wrappers for ATK accessibility toolkit"; + license = stdenv.lib.licenses.lgpl21Plus; + homepage = http://gtkmm.org; + }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 90e60d59da0c..b28668e7b301 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -58,7 +58,7 @@ let "--layout=${layout}" "variant=${variant}" "threading=${threading}" - "runtime-link=${runtime-link}" + ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [ "link=${link}" "${cflags}" ] ++ optional (variant == "release") "debug-symbols=off"; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index b2500d1f49be..4a612c5351dc 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchgit, cmake, perl }: +{ stdenv, fetchgit, cmake, perl, go }: stdenv.mkDerivation rec { name = "boringssl-${version}"; - version = "20140820-a7d1363f"; + version = "2016-03-08"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "a7d1363fcb1f0d825ec2393c06be3d58b0c57efd"; - sha256 = "d27dd1416de1a2ea4ec2c219248b2ed2cce5c0405e56adb394077ddc7c319bab"; + rev = "bfb38b1a3c5e37d43188bbd02365a87bebc8d122"; + sha256 = "0g9gh915ywawqf1gq7pwkhrhbh79w7si4g34ryml7a6mnmvx8b52"; }; - buildInputs = [ cmake perl ]; + buildInputs = [ cmake perl go ]; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 97636f7a9574..67ae3b08ed83 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,16 +1,21 @@ { fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: - +let + ver_maj = "1.12"; + ver_min = "0"; +in stdenv.mkDerivation rec { - name = "cairomm-1.11.2"; + name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "http://cairographics.org/releases/${name}.tar.gz"; - sha1 = "35e190a03f760924bece5dc1204cc36b3583c806"; + url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; + sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ cairo libsigcxx ]; + buildInputs = [ fontconfig freetype ]; - propagatedBuildInputs = [ cairo xlibsWrapper fontconfig freetype libsigcxx ]; + doCheck = true; meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix new file mode 100644 index 000000000000..208288bfca1d --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-glib-${version}"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp-glib"; + + rev = "v${version}"; + sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono dbus-sharp-1_0 ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET: GLib integration module"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix new file mode 100644 index 000000000000..ef1ddd9bfff5 --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-glib-${version}"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp-glib"; + + rev = "v${version}"; + sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono dbus-sharp-2_0 ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET: GLib integration module"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix new file mode 100644 index 000000000000..c17a140b9c57 --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp"; + + rev = "v${version}"; + sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix new file mode 100644 index 000000000000..ea7d920dc828 --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-${version}"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp"; + + rev = "v${version}"; + sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index eed6a3bc763c..91974a311756 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -235,11 +235,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "2.8.5"; + version = "3.0"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; - sha256 = "0nk1j3i7qc1k3dygpq74pxq382vqg9kaf2hxl9jfw8rkad8rjv9v"; + sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi"; }; patchPhase = ''patchShebangs .''; @@ -449,7 +449,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = http://www.ffmpeg.org/; + homepage = https://www.ffmpeg.org/; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix new file mode 100644 index 000000000000..e9f5898e2eac --- /dev/null +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchsvn, pkgconfig, mono, dotnetPackages }: + +let + newtonsoft-json = dotnetPackages.NewtonsoftJson; +in stdenv.mkDerivation rec { + name = "gdata-sharp-${version}"; + version = "2.2.0.0"; + + src = fetchsvn { + url = "http://google-gdata.googlecode.com/svn/trunk/"; + rev = "1217"; + sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk"; + }; + + buildInputs = [ pkgconfig mono newtonsoft-json ]; + + sourceRoot = "svn-r1217/clients/cs"; + + dontStrip = true; + + postPatch = '' + sed -i -e 's#^\(DEFINES=.*\)\(.\)#\1 /r:third_party/Newtonsoft.Json.dll\2#' Makefile + # carriage return ^ + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/archive/p/google-gdata/; + + description = "The Google Data APIs"; + longDescription = '' + The Google Data APIs provide a simple protocol for reading and writing + data on the web. + ''; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 73d3bb92e7ec..83becae05a4c 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "geoclue-2.4.1"; + name = "geoclue-2.4.2"; src = fetchurl { url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; - sha256 = "1m1l1npdv804m98xhfpd1wl1whrrp2pjivliwwlnyk86yq0gs6cs"; + sha256 = "0g4krigdaf5ipkp4mi16rca62crr8pdk3wkhm0fxbcqnil75fyy4"; }; buildInputs = @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus dbus_glib glib ]; - meta = { + meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; - maintainers = with stdenv.lib.maintainers; [ raskin garbas ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; + maintainers = with maintainers; [ raskin garbas ]; + platforms = platforms.linux; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix index fd9d4b7e81a9..123cfca1b82c 100644 --- a/pkgs/development/libraries/giflib/libungif.nix +++ b/pkgs/development/libraries/giflib/libungif.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libungif-4.1.4"; src = fetchurl { url = mirror://sourceforge/giflib/libungif-4.1.4.tar.gz; - md5 = "efdfcf8e32e35740288a8c5625a70ccb"; + sha256 = "5e65e1e5deacd0cde489900dbf54c6c2ee2ebc818199e720dbad685d87abda3d"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix new file mode 100644 index 000000000000..ad5220cac4e9 --- /dev/null +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp }: + +stdenv.mkDerivation rec { + name = "gio-sharp-${version}"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "gio-sharp"; + + rev = "${version}"; + sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig"; + }; + + nativeBuildInputs = [ pkgconfig autoconf automake which ]; + buildInputs = [ mono gtk-sharp ]; + + dontStrip = true; + + prePatch = '' + ./autogen-2.22.sh + ''; + + meta = with stdenv.lib; { + description = "GIO API bindings"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 3c433511fc1a..fb380d60cf92 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser}: +{stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "0.23.2"; name = "libgit2-${version}"; @@ -21,4 +21,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; -} +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_LDFLAGS = "-liconv"; + propagatedBuildInputs = [ libiconv ]; +}) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 256660666019..8417179dde19 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,30 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }: +{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }: let - ver_maj = "2.44"; - ver_min = "0"; + ver_maj = "2.46"; + ver_min = "3"; in stdenv.mkDerivation rec { name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "1a1fczy7hcpn24fglyn4i79f4yjc8s50is70q03mb294bm1c02hv"; + sha256 = "c78654addeb27a1213bedd7cd21904a45bbb98a5ba2f2f0de2b2f1a5682d86cf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gnum4 ]; propagatedBuildInputs = [ glib libsigcxx ]; + enableParallelBuilding = true; #doCheck = true; # some tests need network - meta = { + meta = with stdenv.lib; { description = "C++ interface to the GLib library"; homepage = http://gtkmm.org/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [urkud raskin]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [raskin]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index dd9ddc7ec9b8..4603b3e29db6 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 9192feb1c0cf..4f592dbe31e9 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 98cfa98bfe19..754b2bb64b80 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 96dc42c3cb12..1e0ee39667e6 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 4b6e7957f5cd..9d43f3ac23c3 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 8afbfd4ff54b..75f0760747bf 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index aeefd667b34b..6d0c28d0e28a 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index b014446c7c48..540b3ba0be81 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index c88cf4897327..0b0ba11a7936 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix new file mode 100644 index 000000000000..92578f42e341 --- /dev/null +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp, gio-sharp }: + +stdenv.mkDerivation rec { + name = "gtk-sharp-beans-${version}"; + version = "2.14.0"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "gtk-sharp-beans"; + + rev = "${version}"; + sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + buildInputs = [ mono gtk-sharp gio-sharp ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "gtk-sharp-beans binds some API from Gtk+ that isn't in Gtk# 2.12.x"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 0e659fb074bd..0e659fb074bd 100644 --- a/pkgs/development/libraries/gtk-sharp-2/default.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix new file mode 100644 index 000000000000..380c43108de0 --- /dev/null +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, mono +, glib +, pango +, gtk3 +, GConf ? null +, libglade ? null +, libgtkhtml ? null +, gtkhtml ? null +, libgnomecanvas ? null +, libgnomeui ? null +, libgnomeprint ? null +, libgnomeprintui ? null +, gnomepanel ? null +, libxml2 +, monoDLLFixer +}: + +stdenv.mkDerivation { + name = "gtk-sharp-2.99.3"; + + builder = ./builder.sh; + src = fetchurl { + #"mirror://gnome/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; + url = "http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; + sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; + }; + + # patch bad usage of glib, which wasn't tolerated anymore + # prePatch = '' + # for f in glib/glue/{thread,list,slist}.c; do + # sed -i 's,#include <glib/.*\.h>,#include <glib.h>,g' "$f" + # done + # ''; + + buildInputs = [ + pkgconfig mono glib pango gtk3 GConf libglade libgnomecanvas + libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + gnomepanel + ]; + + dontStrip = true; + + inherit monoDLLFixer; + + passthru = { + inherit gtk3; + }; +} diff --git a/pkgs/development/libraries/gtk-sharp-2/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh index 4b8f757540b5..4b8f757540b5 100644 --- a/pkgs/development/libraries/gtk-sharp-2/builder.sh +++ b/pkgs/development/libraries/gtk-sharp/builder.sh diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index bc3274688555..1401f763c3d2 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: +{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy }: let - ver_maj = "3.16"; + ver_maj = "3.18"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,17 +9,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv"; + sha256 = "829fa113daed74398c49c3f2b7672807f58ba85d0fa463f5bc726e1b0138b86b"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ epoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; enableParallelBuilding = true; doCheck = true; - meta = { + meta = with stdenv.lib; { description = "C++ interface to the GTK+ graphical user interface library"; longDescription = '' @@ -34,9 +35,9 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ raskin vcunat ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index d77b5d46a79e..0ea2949659c6 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -3,11 +3,7 @@ stdenv.mkDerivation rec { name = "ilbc-rfc3951"; - script = fetchurl { - url = http://ilbcfreeware.org/documentation/extract-cfile.txt; - name = "extract-cfile.awk"; - sha256 = "0md76qlszaras9grrxaq7xfxn1yikmz4qqgnjj6y50jg31yr5wyd"; - }; + script = ./extract-cfile.awk; rfc3951 = fetchurl { url = http://www.ietf.org/rfc/rfc3951.txt; diff --git a/pkgs/development/libraries/ilbc/extract-cfile.awk b/pkgs/development/libraries/ilbc/extract-cfile.awk new file mode 100644 index 000000000000..e4b07bc08963 --- /dev/null +++ b/pkgs/development/libraries/ilbc/extract-cfile.awk @@ -0,0 +1,24 @@ +BEGIN { srcname = "nothing"; } +{ if (/^A\.[0-9][0-9]*\.* *[a-zA-Z][a-zA-Z_0-9]*\.[ch]/) { + if (srcname != "nothing") + close(srcname); + srcname = $2; + printf("creating source file %s\n", srcname); + }else if (srcname != "nothing") { + if (/Andersen,* *et* *al\./) + printf("skipping %s\n", $0); + else if (/ /) + printf("skipping2 %s\n", $0); + else if (/Internet Low Bit Rate Codec *December 2004/) + printf("skipping3 %s\n", $0); + else if (/Authors' *Addresses/){ + close(srcname); + exit;} + else + print $0 >> srcname; + } +} +END { + printf("ending file %s\n", srcname); + close(srcname); +} diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 8398f2d7db4d..44e1a1f63adb 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -1,19 +1,15 @@ -{ stdenv, fetchurl, fetchpatch, cmake, kdelibs, subversion, qt4, automoc4, phonon, +{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon, gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }: stdenv.mkDerivation rec { - name = "kdevplatform-1.7.1"; + name = "kdevplatform-1.7.3"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.7.1/src/${name}.tar.xz"; - sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac"; + url = "mirror://kde/stable/kdevelop/4.7.3/src/${name}.tar.bz2"; + sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b"; }; - patches = [(fetchpatch { - name = "svn-1.9.patch"; - url = "https://git.reviewboard.kde.org/r/124783/diff/raw/"; - sha256 = "1ixll5pvynb3l4znc65d82a5bj2s3c7c7is585s2wdpfzjgl5ay0"; - })]; + patches = [ ./gettext.patch ]; propagatedBuildInputs = [ kdelibs qt4 phonon ]; buildInputs = [ apr aprutil subversion boost qjson grantlee ]; @@ -31,5 +27,6 @@ stdenv.mkDerivation rec { IDE-like programs. It is programing-language independent, and is planned to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." ''; + homepage = https://www.kdevelop.org; }; } diff --git a/pkgs/development/libraries/kdevplatform/gettext.patch b/pkgs/development/libraries/kdevplatform/gettext.patch new file mode 100644 index 000000000000..733a542e0c8b --- /dev/null +++ b/pkgs/development/libraries/kdevplatform/gettext.patch @@ -0,0 +1,8 @@ +diff -urN kdevplatform-1.7.3.orig/po/CMakeLists.txt kdevplatform-1.7.3/po/CMakeLists.txt +--- kdevplatform-1.7.3.orig/po/CMakeLists.txt 2016-03-04 23:25:30.102112596 +0100 ++++ kdevplatform-1.7.3/po/CMakeLists.txt 2016-03-04 23:26:06.242570024 +0100 +@@ -1,3 +1,4 @@ ++cmake_policy(SET CMP0002 OLD) + find_package(Gettext REQUIRED) + if (NOT GETTEXT_MSGMERGE_EXECUTABLE) + MESSAGE(FATAL_ERROR "Please install msgmerge binary") diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index a26d8094e396..d266a97535e6 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ldb-1.1.23"; + name = "ldb-1.1.26"; src = fetchurl { url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "0ncmwgga6q9v7maiywgw21w6rb3149m1w2ca11yq8k5j0izjz2wg"; + sha256 = "1rmjv12pf57vga8s5z9p9d90rlfckc1lqjbcp89r83cq5fkwfhw8"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libbrotli/default.nix b/pkgs/development/libraries/libbrotli/default.nix new file mode 100644 index 000000000000..1e28b57dadf2 --- /dev/null +++ b/pkgs/development/libraries/libbrotli/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable}: + +stdenv.mkDerivation rec { + name = "libbrotli-20160120"; + version = "53d53e8"; + + src = fetchFromGitHub { + owner = "bagder"; + repo = "libbrotli"; + rev = "53d53e8d9c0d37398d37bac2e7a7aa20b0025e9e"; + sha256 = "10r4nx6n1r54f5cjck5mmmsj7bkasnmmz7m84imhil45q73kzd4m"; + }; + + buildInputs = [autoconf automake libtool]; + preConfigure = '' + cp -r ${brotliUnstable.src}/* brotli/ + chmod -R +700 brotli + mkdir m4 + autoreconf --install --force --symlink + ''; + + meta = with stdenv.lib; { + description = "Meta project to build libraries from the brotli source code"; + longDescription = '' + Wrapper scripts and code around the brotli code base. + Builds libraries out of the brotli decode and encode sources. Uses autotools. + 'brotlidec' is the library for decoding, decompression + 'brotlienc' is the library for encoding, compression + ''; + + homepage = https://github.com/bagder/libbrotli; + license = licenses.mit; + platforms = platforms.all; + maintainers = []; + }; +} diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 16d9d8c75a46..de3f51752b9d 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, python, llvm, clang }: stdenv.mkDerivation { - name = "libclc-2015-03-27"; + name = "libclc-2015-08-07"; src = fetchFromGitHub { owner = "llvm-mirror"; repo = "libclc"; - rev = "0a2d1619921545b52303be5608b64dc46f381e97"; - sha256 = "0hgm013c0vlfqfbbf4cdajl01hhk1mhsfk4h4bfza1san97l0vcc"; + rev = "f97d9db40718f2e68b3f0b44200760d8e0d50532"; + sha256 = "10n9qk1dild9yjkjjkzpmp9zid3ysdgvqrad554azcf755frch7g"; }; buildInputs = [ python llvm clang ]; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 6a1f28c96ff6..b4b951325a40 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, +{stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib, - libimobiledevice, python, pygobject, mutagen }: + libimobiledevice, python, pygobject, mutagen, + monoSupport ? true, mono, gtk-sharp +}: stdenv.mkDerivation rec { name = "libgpod-0.8.3"; @@ -10,13 +12,19 @@ stdenv.mkDerivation rec { }; preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )"; - configureFlags = "--without-hal --enable-udev"; + + configureFlags = [ + "--without-hal" + "--enable-udev" + ] ++ lib.optionals monoSupport [ "--with-mono" ]; + + dontStrip = true; propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils gdk_pixbuf taglib libimobiledevice python pygobject mutagen ]; nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl - libimobiledevice.swig ]; + libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp ]; meta = { homepage = http://gtkpod.sourceforge.net/; diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix index b37503df5d9d..eaf2eb170956 100644 --- a/pkgs/development/libraries/libgsystem/default.nix +++ b/pkgs/development/libraries/libgsystem/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { homepage = "https://wiki.gnome.org/Projects/LibGSystem"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 4db3913bdd2f..6d80bfdccf1f 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.2.0"; + name = "libinput-1.2.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0b3f67xsy1s84cvzw22mjfkbcv6pj4p4yns4h3m0fmb7zqbvjm0p"; + sha256 = "1hy1h0a4zx5wj23sah4kms2z0285yl0kcn4fqlrrp1gqax9qrnz2"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 2bc18a5a61da..b3d76b1c931f 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,29 +1,29 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.82"; + version = "0.7.83"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1mqmk1q2phwqwrak54jc9hfwjllhhr4nqyigisrh9rcvd6wx6r86"; + sha256 = "0kl5x07j3jp5mnmhpjvdq0a2nnlgvqnhwar0xalvg3b3msdf8417"; }; - buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libzen zlib ]; sourceRoot = "./MediaInfoLib/Project/GNU/Library/"; configureFlags = [ "--enable-shared" ]; - preConfigure = "sh autogen.sh"; postInstall = '' install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc" ''; - meta = { + meta = with stdenv.lib; { description = "Shared library for mediainfo"; homepage = http://mediaarea.net/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.devhell ]; }; } diff --git a/pkgs/development/libraries/libotr/3.2.nix b/pkgs/development/libraries/libotr/3.2.nix deleted file mode 100644 index 7dd6226a6981..000000000000 --- a/pkgs/development/libraries/libotr/3.2.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, libgcrypt}: - -stdenv.mkDerivation { - name = "libotr-3.2.1"; - src = fetchurl { - url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz; - sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq"; - }; - - propagatedBuildInputs = [libgcrypt]; -} diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index aeae2a70d6c3..0a01cd9825e2 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgcrypt, autoreconfHook }: stdenv.mkDerivation rec { - name = "libotr-4.1.0"; + name = "libotr-4.1.1"; src = fetchurl { url = "https://otr.cypherpunks.ca/${name}.tar.gz"; - sha256 = "0c6rkh58s6wqzcrpccwdik5qs91qj6dgd60a340d72gc80cqknsg"; + sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb"; }; buildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 231216cbc698..74fc4270b80e 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,10 +3,10 @@ let - listVersion = "2016-02-25"; + listVersion = "2016-03-10"; listSources = fetchFromGitHub { - sha256 = "0i9aa0bl3x50z0ba4n06pajpfncw8n780hhql13b1vppgfc6s4i7"; - rev = "84fd7e2a090f53ba4378f2a0e08cdaaa882ce3e5"; + sha256 = "10kc0b41y5cn0cnqvalz9i14j1dj6b9wgr21zz3ngqf943q6z5r9"; + rev = "1e52b7efc42b1505f9580ec15a1d692523db4a3b"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 610d14568ae5..1171fa079cf6 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,19 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, gnum4 }: - +{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }: +let + ver_maj = "2.6"; # odd major numbers are unstable + ver_min = "2"; +in stdenv.mkDerivation rec { - name = "libsigc++-2.3.1"; + name = "libsigc++-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/libsigc++/2.3/${name}.tar.xz"; - sha256 = "14q3sq6d43f6wfcmwhw4v1aal4ba0h5x9v6wkxy2dnqznd95il37"; + url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz"; + sha256 = "fdace7134c31de792c17570f9049ca0657909b28c4c70ec4882f91a03de54437"; }; + patches = [(fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/libsigc++-2.0.git/plain" + + "/debian/patches/0002-Enforce-c-11-via-pkg-config.patch?id=d451a4d195b1"; + sha256 = "19g19473syp2z3kg8vdrli89lm9kcvaqajkqfmdig1vfpkbq0nci"; + })]; - buildInputs = [ pkgconfig gnum4 ]; + nativeBuildInputs = [ pkgconfig gnum4 ]; doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://libsigc.sourceforge.net/; description = "A typesafe callback system for standard C++"; + license = licenses.lgpl21; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 5543b05ce9d1..ea74bea152c2 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha1 = "z9dvxrkcyb4b7f2zybgkrqb9zcxrj9vi"; + sha256 = "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"; }; buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; @@ -23,4 +23,3 @@ stdenv.mkDerivation rec { homepage = http://xkbcommon.org; }; } - diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 8aa8bf600a80..106fcee257f0 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 127eeaeaca9e..23597c2e03b1 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }: +{ stdenv, fetchurl, autoreconfHook }: -let version = "0.4.32"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "0.4.33"; name = "libzen-${version}"; src = fetchurl { - url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "0rhbiaywij6jj8d7vkc4v7y21ic1kv9fbn9lk82mm12yjwzlhhyd"; + url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; + sha256 = "0py5iagajz6m5zh26svkjyy85k1dmyhi6cdbmc3cb56a4ix1k2d2"; }; - buildInputs = [ automake autoconf libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-shared" ]; sourceRoot = "./ZenLib/Project/GNU/Library/"; preConfigure = "sh autogen.sh"; - meta = { + meta = with stdenv.lib; { description = "Shared library for libmediainfo and mediainfo"; - homepage = http://mediaarea.net/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + homepage = https://mediaarea.net/; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.devhell ]; }; } diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix new file mode 100644 index 000000000000..e68661b44ec3 --- /dev/null +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, gtk-sharp-2_0 }: + +stdenv.mkDerivation rec { + name = "mono-addins-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "mono-addins"; + + rev = "mono-addins-${version}"; + sha256 = "1hnn0a2qsjcjprsxas424bzvhsdwy0yc2jj5xbp698c0m9kfk24y"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono gtk-sharp-2_0 ]; + + dontStrip = true; + + meta = with stdenv.lib; { + homepage = http://www.mono-project.com/archived/monoaddins/; + description = "A generic framework for creating extensible applications"; + longDescription = '' + Mono.Addins is a generic framework for creating extensible applications, + and for creating libraries which extend those applications. + ''; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix new file mode 100644 index 000000000000..12b15c4937d7 --- /dev/null +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, autoreconfHook, which, pkgconfig, mono }: + +stdenv.mkDerivation rec { + name = "mono-zeroconf-${version}"; + version = "0.9.0"; + + src = fetchurl { + url = "http://download.banshee-project.org/mono-zeroconf/mono-zeroconf-${version}.tar.bz2"; + sha256 = "1qfp4qvsx7rc2shj1chi2y7fxn10rwi70rw2y54b2i8a4jq7gpkb"; + }; + + buildInputs = [ pkgconfig which mono ]; + + dontStrip = true; + + configureFlags = [ "--disable-docs" ]; + + meta = with stdenv.lib; { + description = "A cross platform Zero Configuration Networking library for Mono and .NET"; + homepage = http://www.mono-project.com/archived/monozeroconf/; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix new file mode 100644 index 000000000000..c7e133d94b23 --- /dev/null +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +, mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: + +stdenv.mkDerivation rec { + name = "notify-sharp-${version}"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "GNOME"; + repo = "notify-sharp"; + + rev = "${version}"; + sha256 = "1vm7mnmxdwrgy4mr07lfva8sa6a32f2ah5x7w8yzcmahaks3sj5m"; + }; + + nativeBuildInputs = [ + pkgconfig autoreconfHook + ]; + + buildInputs = [ + mono gtk-sharp-3_0 + dbus-sharp-1_0 dbus-sharp-glib-1_0 + ]; + + dontStrip = true; + + postPatch = '' + sed -i 's#^[ \t]*DOCDIR=.*$#DOCDIR=$out/lib/monodoc#' ./configure.ac + ''; + + meta = with stdenv.lib; { + description = "D-Bus for .NET"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index e8d3fb3cdf28..230c22258e2e 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.11"; in +let version = "4.12"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2"; + sha256 = "1pk98bmc5xzbl62q5wf2d6mryf0v95z6rsmxz27nclwiaqg0mcg0"; }; preConfigure = '' diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index d3c2deb609ed..060aa20967f9 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.22"; + version = "3.22.2"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_22_RTM/src/${name}.tar.gz"; - sha256 = "30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_22_2_RTM/src/${name}.tar.gz"; + sha256 = "0l1n5mwgqkcwfh10hizdv0vfj6gg9i4zip021wh33b17qn3r5m07"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index f71c52e670bf..c13af349d43e 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, cairo }: +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm }: let - ver_maj = "2.34"; - ver_min = "0"; + ver_maj = "2.38"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "pangomm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pangomm/${ver_maj}/${name}.tar.xz"; - sha256 = "0hcyvv7c5zmivprdam6cp111i6hn2y5jsxzk00m6j9pncbzvp0hf"; + sha256 = "effb18505b36d81fc32989a39ead8b7858940d0533107336a30bc3eef096bc8b"; }; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ]; + propagatedBuildInputs = [ pango glibmm cairomm ]; + + doCheck = true; meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index b4b9a6970ff8..b1cf9c83c7b2 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -5,6 +5,7 @@ let name = "suitesparse-${version}"; int_t = if openblas.blas64 then "int64_t" else "int32_t"; + SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so"; in stdenv.mkDerivation { inherit name; @@ -23,6 +24,10 @@ stdenv.mkDerivation { -e 's/METIS_PATH .*$/METIS_PATH =/' \ -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' + '' + + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ + -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/' ''; makeFlags = [ @@ -33,6 +38,8 @@ stdenv.mkDerivation { "LAPACK=" ]; + NIX_CFLAGS = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; + postInstall = '' # Build and install shared library ( @@ -40,10 +47,10 @@ stdenv.mkDerivation { for i in "$out"/lib/lib*.a; do ar -x $i done - gcc *.o --shared -o "$out/lib/libsuitesparse.so" -lopenblas + ''${CC} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse.${SHLIB_EXT}" -lopenblas ) for i in umfpack cholmod amd camd colamd spqr; do - ln -s libsuitesparse.so "$out"/lib/lib$i.so; + ln -s libsuitesparse.${SHLIB_EXT} "$out"/lib/lib$i.${SHLIB_EXT} done # Install documentation diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 83f64d1eb009..4e23a36939de 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, pkgconfig, freetype, cmake }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.3.6"; name = "graphite2-${version}"; src = fetchurl { - url = "mirror://sourceforge/silgraphite/graphite2/${name}.tgz"; - sha256 = "00xhv1mp640fr3wmdzwn4yz0g56jd4r9fb7b02mc1g19h0bdbhsb"; + url = "https://github.com/silnrsi/graphite/releases/download/" + + "${version}/graphite-${version}.tgz"; + sha256 = "0xdg6bc02bl8yz39l5i2skczfg17q4lif0qqan0dhvk0mibpcpj7"; }; buildInputs = [ pkgconfig freetype cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index d9fbde9aa09c..24be2c2a9c85 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.9.2"; + name = "sqlite-3.11.1"; src = fetchurl { - url = "http://sqlite.org/2015/sqlite-autoconf-3090200.tar.gz"; - sha1 = "dae1ae5297fece9671ae0c434a7ecd0cda09c76a"; + url = "http://sqlite.org/2016/sqlite-autoconf-3110100.tar.gz"; + sha1 = "c4b4dcd735a4daf5a2e2bb90f374484c8d4dad29"; }; buildInputs = lib.optionals interactive [ readline ncurses ]; diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix new file mode 100644 index 000000000000..6da524c23390 --- /dev/null +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }: + +stdenv.mkDerivation rec { + name = "taglib-sharp-${version}"; + version = "2.1.0.0"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "taglib-sharp"; + + rev = "taglib-sharp-${version}"; + sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + buildInputs = [ mono ]; + + dontStrip = true; + + configureFlags = [ "--disable-docs" ]; + + meta = with stdenv.lib; { + description = "Library for reading and writing metadata in media files"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 4b77ced250b5..95eb0255bdcb 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.26"; + name = "tevent-0.9.28"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "1gbh6d2m49j1v2hkaiyrh8bj02i5wxd4hqayzk2g44yyivbi8b16"; + sha256 = "0a9ml52jjnzz7qg9z750mavlvs1yibjwrzy4yl55dc95j0vm7n84"; }; buildInputs = [ diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 8ad3fcd0428d..b1f47b80d782 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = "http://webkitgtk.org/"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.iyzsong ]; + maintainers = []; }; src = fetchurl { diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 29e3206da0f1..5fd108161680 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.linux; hydraPlatforms = []; - maintainers = with maintainers; [ iyzsong koral ]; + maintainers = with maintainers; [ koral ]; }; preConfigure = "patchShebangs Tools"; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 1473910e004f..736c350bc068 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "1.7"; + version = "1.9"; src = fetchurl { urls = [ "http://get.videolan.org/x265/x265_${version}.tar.gz" "https://github.com/videolan/x265/archive/${version}.tar.gz" ]; - sha256 = "18w3whmbjlalvysny51kdq9b228iwg3rdav4kmifazksvrm4yacq"; + sha256 = "1j0mbcf10aj6zi1nxql45f9817jd2ndcpd7x123sjmyr7q9m8iiy"; }; patchPhase = '' diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index 64b4f8263ff6..615e1d1b6739 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { this part is currently work in progress). ''; license = licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index b3555d7fddbb..544db9e0d78b 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirleft/ocaml-asn1-combinators; description = "Combinators for expressing ASN.1 grammars in OCaml"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; broken = stdenv.isi686; # https://github.com/mirleft/ocaml-asn1-combinators/issues/13 diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index f7e4513d8265..aabb9f8a76a1 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirage/ocaml-base64; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Base64 encoding and decoding in OCaml"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 06618fff819a..ae4dcc930765 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { language. ''; license = stdenv.lib.licenses.lgpl21Plus; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 565176276f98..d2d3159cde14 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "${webpage}"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 61c3d6f23b40..cf8b21edb50e 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -48,7 +48,7 @@ EOF modeled after the famous log4j logging framework for Java. ''; license = licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index 48aaf9725037..c33deec9c784 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { homepage = https://forge.ocamlcore.org/projects/calendar/; description = "An Objective Caml library managing dates and times"; license = "LGPL"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 2024f5a5ab8f..de800a295bca 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { for reading from and writing to compressed files in these formats. ''; license = "LGPL+linking exceptions"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index f6d22f62ec09..9f7201708afd 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "A comprehensive Unicode library for OCaml"; license = stdenv.lib.licenses.lgpl21; branch = "0.8.2"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index ecdc5bef2958..11a7828f1e41 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; description = "A comprehensive Unicode library for OCaml"; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 43522e180b63..1753084910b9 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "A front-end for the C programming language that facilitates program analysis and transformation"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index ba955061740a..80992bdfe7c7 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix index 15eb06667778..4ca9d4a30e0d 100644 --- a/pkgs/development/ocaml-modules/config-file/default.nix +++ b/pkgs/development/ocaml-modules/config-file/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = http://config-file.forge.ocamlcore.org/; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "An OCaml library used to manage the configuration file(s) of an application"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 5c2447614ada..8a03098d84b9 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { helpers for unix and threads. ''; license = stdenv.lib.licenses.bsd2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 20f03667c3be..d29136dd434e 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.coherentpdf.com/; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "PDF Command Line Tools"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 8f18658b0f65..114aa7e5ffd3 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { itself. ''; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index cfb353bfe3e5..f56ec3cbed62 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "http://pauillac.inria.fr/~xleroy/software.html"; description = "A library of cryptographic primitives for OCaml"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 5b2eebed9e0d..57a057e0eaa9 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { description = "Map OCaml arrays onto C-like structs"; license = stdenv.lib.licenses.isc; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index e04523cd14cc..760b981dd2ca 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { homepage = https://github.com/Chris00/ocaml-csv; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 898c2b67fd69..5987c53898fc 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/UnixJunkie/dolog; description = "Minimalistic lazy logger in OCaml"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 63a48219b15e..b579c073f29f 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { homepage = http://dypgen.free.fr; description = "Dypgen GLR self extensible parser generator"; license = stdenv.lib.licenses.cecill-b; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index ef0a88fb2280..80b5b9eae0e6 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index ce20cdd47bb4..a9475649ff66 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { homepage = https://ocaml.janestreet.com/; description = "Quotation expanders for enumerating finite types"; license = stdenv.lib.licenses.asl20; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index 0ff2a725ea2b..ecfdb846ff1e 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/ermine/xml; description = "XML Parser for discrete data"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 7508a14738dc..efa239f6c332 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/ermine/xmpp; description = "OCaml based XMPP implementation"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 9f5f8119fb6d..492b10bb09b3 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = http://code.google.com/p/ocaml-extlib/; description = "Enhancements to the OCaml Standard Library modules"; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 25a9e4128bf0..fd8ce1c33898 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = https://github.com/mirage/ezjsonm; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 385487903290..bbefcc0f3cc0 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; license = licenses.asl20; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 7a8a80a446c3..3ffcfada3d5d 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = https://forge.ocamlcore.org/projects/ocaml-fileutils/; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index b0429e0e9103..77e2461bda04 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "A simple OCaml module for computing the least solution of a system of monotone equations"; license = licenses.cecill-c; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 65311683d0c0..635572ea9c8f 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Fontconfig bindings for OCaml"; license = stdenv.lib.licenses.gpl2Plus; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 35dd542af9e3..6d4deac38c47 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 51afb39ca659..ac85a03cc985 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://gapi-ocaml.forge.ocamlcore.org; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ bennofs ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 0b8f4253e76c..90f74b2c6026 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = https://github.com/c-cube/gen; description = "Simple, efficient iterators for OCaml"; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 653b627fc0b6..9351bfa7520e 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { raster data. ''; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/ocaml-modules/gtktop/default.nix b/pkgs/development/ocaml-modules/gtktop/default.nix index ca0687882879..de0334c2a183 100644 --- a/pkgs/development/ocaml-modules/gtktop/default.nix +++ b/pkgs/development/ocaml-modules/gtktop/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "A small OCaml library to ease the creation of graphical toplevels"; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index a9d30f1a9e7e..07b7773ff2c7 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = https://github.com/mirage/ocaml-hex; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 932a5811bec7..d2fa675bbd82 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://ocaml-http.forge.ocamlcore.org/; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "do it yourself (OCaml) HTTP daemon"; license = licenses.lgpl2; maintainers = with maintainers; [ roconnor vbgl ]; diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index c883175f6e0f..8580bb647134 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirage/io-page; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "IO memory page library for Mirage backends"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 4b194332d086..0aad6f7b13bb 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { homepage = http://sagotch.github.io/ISO8601.ml/; description = "ISO 8601 and RFC 3999 date parsing for OCaml"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 7272e668aa20..894c93eba4db 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "${webpage}"; license = licenses.lgpl3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index e81c94d8b24b..cc5de781beec 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { homepage = http://erratique.ch/software/jsonm; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index fbe9898fd81e..dae81f1df166 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; homepage = http://gtk-extras.forge.ocamlcore.org/; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 80e5a72abf52..68019113f388 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; homepage = http://gtk-extras.forge.ocamlcore.org/; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 1815bfc64ddd..bc4b490e8533 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { meta = { branch = "2.14"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z stdenv.lib.maintainers.roconnor diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 4c1665540ec2..a4d4314cd021 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z roconnor vbgl ]; diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index 9f4b17f9b610..026f67d8ef44 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/diml/lambda-term; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; branch = "1.6"; maintainers = [ stdenv.lib.maintainers.gal_bolle diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 0186ab055f5e..ec9232645e76 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/diml/lambda-term; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 57cf9fe4678b..2f58c41ba355 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { inherit (llvm.meta) license homepage; - inherit (ocaml.meta) platforms; + platforms = ocaml.meta.platforms or []; description = "OCaml bindings distributed with LLVM"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index a018194a2ace..e8cdc180b729 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { homepage = http://ocsigen.org/lwt; description = "Lightweight thread library for Objective Caml"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbgl gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix index 99c2a292fe8d..a24859892fa1 100644 --- a/pkgs/development/ocaml-modules/macaque/default.nix +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { description = "Macros for Caml Queries"; homepage = https://github.com/ocsigen/macaque; license = licenses.lgpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index d77c3f681158..9c42aed37df2 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirage/ocaml-magic-mime; description = "Convert file extensions to MIME types"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index 8758ff3cffbc..088c2db061be 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { qpl /* generator */ lgpl2 /* library */ ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z ]; }; } diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index a5d73839cb2e..ed13a56955b6 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirleft/ocaml-nocrypto; description = "Simplest possible crypto to support TLS"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index f77bd3acc627..f4076fbd95fe 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { homepage = http://cairographics.org/cairo-ocaml; description = "ocaml bindings for cairo library"; license = stdenv.lib.licenses.gpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix index 97178ac701f8..6b9f6f09ea32 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { and SVG file output. ''; license = licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix index 8b6e0966f7e2..f531de5118ea 100644 --- a/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { Result module defined in this library. ''; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 8bbf08e3c74a..9c84045de60d 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { homepage = "http://ocaml-text.forge.ocamlcore.org/"; description = "A library for convenient text manipulation"; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index c7427558314e..bbef4e010159 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { homepage = http://ocamlgraph.lri.fr/; description = "Graph library for Objective Caml"; license = stdenv.lib.licenses.gpl2Oss; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.kkallio ]; diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index dc5d191f75af..1aeb43b8cf44 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { x86 or x86-64 processors. Support for additional architectures and operating systems is planned, but not yet available. ''; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 0948b7132a4e..8ef940e75b00 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { homepage = http://projects.camlcity.org/projects/ocamlnet.html; description = "A library implementing Internet protocols (http, cgi, email, etc.) for OCaml"; license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL."; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index aede92fc0f0e..351f667a8c90 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "Optimised functions to read and write int16/32/64"; homepage = https://github.com/OCamlPro/ocplib-endian; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 89efb58ecbb5..d2d66994604b 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { homepage = https://github.com/ocsigen/deriving; description = "Extension to OCaml for deriving functions from type declarations"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ gal_bolle vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index a1bd7d162342..d2613830a7c2 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages. ''; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 2cfb6af68a8b..d711bae0f34b 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; homepage = http://ocurl.forge.ocamlcore.org/; maintainers = with stdenv.lib.maintainers; [ bennofs ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index eaeb7e7b22f7..b3c7ddb84331 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { description = "Store data using OCaml notation"; homepage = https://forge.ocamlcore.org/projects/odn/; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl z77z ]; diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix index c048f62e89ca..054303ac8500 100644 --- a/pkgs/development/ocaml-modules/ojquery/default.nix +++ b/pkgs/development/ocaml-modules/ojquery/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "jQuery Binding for Eliom"; homepage = http://ocsigen.org/ojquery/; license = stdenv.lib.licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index b134a842c5c0..120751454151 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { homepage = https://github.com/diml/optcomp; description = "Optional compilation for OCaml with cpp-like directives"; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 5a118c0bcd89..a2047a0fe786 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { of them. ''; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index ba0ce29bdf9d..d449296ab701 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://ounit.forge.ocamlcore.org/; description = "Unit test framework for OCaml"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 7f7caf8e5a87..dd152262ca79 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -22,7 +22,7 @@ buildOcaml { homepage = "https://bitbucket.org/mmottl/pcre-ocaml"; description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbmithr ]; }; } diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index 00c0d472f9a8..f1bc4849a7f5 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { description = "An interface to PostgreSQL databases for OCaml applications"; homepage = http://pgocaml.forge.ocamlcore.org/; license = licenses.lgpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 18cc4817b130..e28f85b475cc 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { description = "An OCaml adaptation of Wadler’s and Leijen’s prettier printer"; license = licenses.cecill-c; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 4e99dcd1af45..1fea9bbd1911 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "Tools for authors of ppx rewriters"; homepage = http://www.lexifi.com/ppx_tools; license = licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index 070bd270b11a..403c39a465d8 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -46,6 +46,6 @@ in stdenv.mkDerivation { homepage = "http://github.com/chemoelectric/pycaml"; description = "Bindings for python and ocaml"; license = "LGPL"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index 260a1fc9811a..7d904e576336 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { homepage = https://github.com/c-cube/qcheck/; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index e68a8729c014..f7e585b43b08 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; homepage = https://github.com/vincent-hugot/iTeML; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 5e7ae1cba091..6b7ba1a13b23 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/ocaml/ocaml-re; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Pure OCaml regular expressions, with support for Perl and POSIX-style strings"; license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index dfc8dcd1439c..943e5e1e8dc9 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { homepage = http://erratique.ch/software/react; description = "Applicative events and signals for OCaml"; license = licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbmithr gal_bolle]; }; } diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index eecae885302f..ef0197f60f57 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "An OCaml module for functional reactive programming (FRP) based on React"; homepage = https://github.com/hhugo/reactiveData; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 7fc5dadda74e..2f941b923e33 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { homepage = http://ocaml-safepass.forge.ocamlcore.org/; description = "An OCaml library offering facilities for the safe storage of user passwords"; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 534a7684cec4..cfc74ad16683 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "${webpage}"; license = licenses.gpl3Plus; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix index d9c49ece60d7..c689aec1904f 100644 --- a/pkgs/development/ocaml-modules/sequence/default.nix +++ b/pkgs/development/ocaml-modules/sequence/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { sequence is iterated/folded on. ''; license = stdenv.lib.licenses.bsd2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index dd9e89bcef70..40b95e09e8b7 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix index 61d46e205fa6..55b09c3fdc3a 100644 --- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 53549791b253..804e33fc7386 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = http://mmottl.github.io/sqlite3-ocaml/; description = "OCaml bindings to the SQLite 3 database access library"; license = licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbgl ]; diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index 94377a646c1c..a6ff9f44116c 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { description = "A thin wrapper for sqlite3-ocaml with a simplified interface"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 6e3ded0b0f27..6eb43d07b686 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://savonet.rastageeks.org/; description = "OCaml bindings for libssl "; license = "LGPL+link exception"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index 961ee4b1fcd5..05aa2c2da683 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/rgrinberg/stringext; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Extra string functions for OCaml"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 85ea80aeafef..79a696632e1b 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { homepage = "${webpage}"; description = "Thin bindings to the cross-platform SDL library"; license = licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index 4ddbc6705a57..e5831be93bda 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { description = "“The Whitespace Thing” for OCaml"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index d3e32105f7df..e014da8b66a9 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "Support library for OCaml preprocessor type conversions"; license = licenses.asl20; branch = "108"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z ]; }; } diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index fe42dd5ddcbd..b6747a48d95d 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "http://forge.ocamlcore.org/projects/type-conv/"; description = "Support library for OCaml preprocessor type conversions"; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ z77z ]; }; } diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index d3a0b3557c52..64c1de13fb35 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { homepage = http://ocsigen.org/tyxml/; description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML output, using static typing"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ gal_bolle vbgl ]; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 61c52278621f..1e0632387e31 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://www.cduce.org/download.html; description = "A lexer generator for Unicode and OCaml"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 03620d05f54d..dca989c88efd 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirage/ocaml-uri; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "RFC3986 URI parsing library for OCaml"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 476f0e9bbe8c..8e497560c68e 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml module to decode the data of the Unicode character database from its XML representation"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; }; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 67df949ac8bf..4e4dd67e2105 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 78869f2f1306..07ba10a74a97 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; homepage = http://erratique.ch/software/uuidm; license = licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.maurer ]; }; } diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index ece5fb5e3e3f..4e5d73e4cb37 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml module for normalizing Unicode text"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 0101c43e504d..5946fd2a70df 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OCaml library for segmenting Unicode text"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 26dc9742aeb4..7c4cff571280 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Non-blocking streaming Unicode codec for OCaml"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index bfff4c68cef9..17bb8eeb4645 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { module. An API allows to implement new renderers. ''; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 0d9b657969d1..c44ccb18982a 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirleft/ocaml-x509; description = "X509 (RFC5280) handling in OCaml"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 5eb4fbfd6b15..82f635afb684 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { homepage = "http://tech.motion-twin.com/xmllight.html"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index dacaeea49f4c..5dedfb396d5f 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml streaming codec to decode and encode the XML data format"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; }; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 34bcc08275bd..ab949f4f1f22 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { homepage = "http://mjambon.com/${pname}.html"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index ccd278a2faaf..16a1ac3b30f2 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; license = licenses.lgpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 935d3a566486..f9bf65cf8141 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/diml/zed; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2cc1a82ca09e..795019d0b411 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation { homepage = http://www.riverbankcomputing.co.uk; license = licenses.gpl3; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ sander iyzsong ]; + maintainers = with maintainers; [ sander ]; }; src = fetchurl { diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 5955f34b58e9..e89d8c113a16 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "085lm8v7biixy6rykq836gfy91jcccpz9qpk8i9x339dzy2b2q4l"; }; - buildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; + nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg''; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 29559bf8b0ef..ab9954735f35 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -1,6 +1,9 @@ -{stdenv, fetchurl, yacc }: +{ stdenv, fetchurl, makeWrapper, yacc, gcc }: -stdenv.mkDerivation rec { +let + binPath = stdenv.lib.makeBinPath [ gcc ]; + +in stdenv.mkDerivation rec { name = "spin-${version}"; version = "6.4.5"; url-version = stdenv.lib.replaceChars ["."] [""] version; @@ -13,11 +16,16 @@ stdenv.mkDerivation rec { sha256 = "0x8qnwm2xa8f176c52mzpvnfzglxs6xgig7bcgvrvkb3xf114224"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ yacc ]; sourceRoot = "Spin/Src${version}"; - installPhase = "install -D spin $out/bin/spin"; + installPhase = '' + install -D spin $out/bin/spin + wrapProgram $out/bin/spin \ + --prefix PATH : ${binPath} + ''; meta = with stdenv.lib; { description = "Formal verification tool for distributed software systems"; diff --git a/pkgs/development/tools/analysis/verasco/default.nix b/pkgs/development/tools/analysis/verasco/default.nix new file mode 100644 index 000000000000..9b3ff8e570d6 --- /dev/null +++ b/pkgs/development/tools/analysis/verasco/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, coq, ocamlPackages +, tools ? stdenv.cc +}: + +stdenv.mkDerivation rec { + name = "verasco-1.3"; + src = fetchurl { + url = "http://compcert.inria.fr/verasco/release/${name}.tgz"; + sha256 = "0zvljrpwnv443k939zlw1f7ijwx18nhnpr8jl3f01jc5v66hr2k8"; + }; + + buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir zarith ]); + + preConfigure = '' + substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' + ''; + + configureFlags = [ + "-toolprefix ${tools}/bin/" + (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux") + ]; + + prefixKey = "-prefix "; + + enableParallelBuilding = true; + buildFlags = "proof extraction ccheck"; + + installPhase = '' + mkdir -p $out/bin + cp ccheck $out/bin/ + ln -s $out/bin/ccheck $out/bin/verasco + if [ -e verasco.ini ] + then + mkdir -p $out/share + cp verasco.ini $out/share/ + fi + mkdir -p $out/lib/compcert + cp -riv runtime/include $out/lib/compcert + ''; + + meta = { + homepage = http://compcert.inria.fr/verasco/; + description = "A static analyzer for the CompCert subset of ISO C 1999"; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = stdenv.lib.licenses.unfree; + platforms = with stdenv.lib.platforms; darwin ++ linux; + }; +} diff --git a/pkgs/development/tools/chefdk/Gemfile b/pkgs/development/tools/chefdk/Gemfile index 9cd40fd3f4b6..7d974e498910 100644 --- a/pkgs/development/tools/chefdk/Gemfile +++ b/pkgs/development/tools/chefdk/Gemfile @@ -1,3 +1,17 @@ -source "https://rubygems.org" +source 'https://rubygems.org' gem 'chef-dk' +gem 'pry' +gem 'test-kitchen' +gem 'inspec' +gem 'kitchen-inspec' +gem 'kitchen-vagrant' +gem 'berkshelf' +gem 'chef-vault' +gem 'foodcritic' +gem 'ohai' +gem 'rubocop' +gem 'knife-spork' +gem 'fauxhai' +gem 'chefspec' +gem 'chef-provisioning' diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 28b0e7f8aa43..ddbb1f5f1ddf 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -1,35 +1,74 @@ GEM remote: https://rubygems.org/ specs: + addressable (2.4.0) + app_conf (0.4.2) + ast (2.2.0) + berkshelf (4.3.0) + addressable (~> 2.3, >= 2.3.4) + berkshelf-api-client (~> 2.0, >= 2.0.2) + buff-config (~> 1.0) + buff-extensions (~> 1.0) + buff-shell_out (~> 0.1) + celluloid (= 0.16.0) + celluloid-io (~> 0.16.1) + cleanroom (~> 1.0) + faraday (~> 0.9) + httpclient (~> 2.7) + minitar (~> 0.5, >= 0.5.4) + octokit (~> 4.0) + retryable (~> 2.0) + ridley (~> 4.5) + solve (~> 2.0) + thor (~> 0.19) + berkshelf-api-client (2.0.2) + faraday (~> 0.9.1) + httpclient (~> 2.7.0) + ridley (~> 4.5) + buff-config (1.0.1) + buff-extensions (~> 1.0) + varia_model (~> 0.4) + buff-extensions (1.0.0) + buff-ignore (1.1.1) + buff-ruby_engine (0.1.0) + buff-shell_out (0.2.0) + buff-ruby_engine (~> 0.1.0) builder (3.2.2) - chef (12.5.1) - chef-config (= 12.5.1) - chef-zero (~> 4.2, >= 4.2.2) + celluloid (0.16.0) + timers (~> 4.0.0) + celluloid-io (0.16.2) + celluloid (>= 0.16.0) + nio4r (>= 1.1.0) + chef (12.8.1) + bundler (>= 1.10) + chef-config (= 12.8.1) + chef-zero (~> 4.5) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) - mixlib-authentication (~> 1.3) + mixlib-authentication (~> 1.4) mixlib-cli (~> 1.4) mixlib-log (~> 1.3) mixlib-shellout (~> 2.0) - net-ssh (~> 2.6) + net-ssh (>= 2.9, < 4.0) net-ssh-multi (~> 1.1) ohai (>= 8.6.0.alpha.1, < 9) plist (~> 3.1.0) - pry (~> 0.9) - rspec-core (~> 3.2) - rspec-expectations (~> 3.2) - rspec-mocks (~> 3.2) + proxifier (~> 1.0) + rspec-core (~> 3.4) + rspec-expectations (~> 3.4) + rspec-mocks (~> 3.4) rspec_junit_formatter (~> 0.2.0) serverspec (~> 2.7) specinfra (~> 2.10) syslog-logger (~> 1.6) - chef-config (12.5.1) + uuidtools (~> 2.1.5) + chef-config (12.8.1) mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-dk (0.10.0) - chef (~> 12.0, >= 12.2.1) + chef-dk (0.11.2) + chef (~> 12.5) chef-provisioning (~> 1.2) cookbook-omnifetch (~> 0.2, >= 0.2.2) diff-lcs (~> 1.0) @@ -39,92 +78,184 @@ GEM mixlib-shellout (~> 2.0) paint (~> 1.0) solve (~> 2.0, >= 2.0.1) - chef-provisioning (1.5.0) - cheffish (~> 1.3, >= 1.3.1) + chef-provisioning (1.6.0) + cheffish (>= 1.3.1, < 3.0) inifile (~> 2.0) mixlib-install (~> 0.7.0) net-scp (~> 1.0) - net-ssh (~> 2.0) + net-ssh (>= 2.9, < 4.0) net-ssh-gateway (~> 1.2.0) winrm (~> 1.3) - chef-zero (4.3.2) + chef-vault (2.8.0) + chef-zero (4.5.0) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) rack uuidtools (~> 2.1) - cheffish (1.6.0) + cheffish (2.0.2) chef-zero (~> 4.3) - coderay (1.1.0) + compat_resource + chefspec (4.6.0) + chef (>= 11.14) + fauxhai (~> 3.0, >= 3.0.1) + rspec (~> 3.0) + cleanroom (1.0.0) + coderay (1.1.1) + compat_resource (12.8.0) cookbook-omnifetch (0.2.2) minitar (~> 0.5.4) diff-lcs (1.2.5) + diffy (3.1.0) + docker-api (1.26.2) + excon (>= 0.38.0) + json erubis (2.7.0) + excon (0.48.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + fauxhai (3.1.0) + net-ssh ffi (1.9.10) - ffi-yajl (2.2.2) + ffi-yajl (2.2.3) libyajl2 (~> 1.2) + foodcritic (6.0.1) + erubis + gherkin (~> 2.11) + nokogiri (>= 1.5, < 2.0) + rake + rufus-lru (~> 1.0) + treetop (~> 1.4) + yajl-ruby (~> 1.1) + gherkin (2.12.2) + multi_json (~> 1.3) + git (1.3.0) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) hashie (3.4.3) highline (1.7.8) - httpclient (2.7.0.1) + hitimes (1.2.3) + httpclient (2.7.1) inifile (2.0.2) - ipaddress (0.8.0) + inspec (0.14.8) + json (~> 1.8) + method_source (~> 0.8) + pry (~> 0) + r-train (~> 0.10.1) + rainbow (~> 2) + rspec (~> 3.3) + rspec-its (~> 1.2) + rubyzip (~> 1.1) + thor (~> 0.19) + ipaddress (0.8.3) + json (1.8.3) + kitchen-inspec (0.12.3) + inspec (~> 0.14.1) + test-kitchen (~> 1.6) + kitchen-vagrant (0.19.0) + test-kitchen (~> 1.4) + knife-spork (1.6.1) + app_conf (>= 0.4.0) + chef (>= 11.0.0) + diffy (>= 3.0.1) + git (>= 1.2.5) libyajl2 (1.2.0) little-plugger (1.1.4) logging (2.0.0) little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) - mime-types (2.99) + mini_portile2 (2.0.0) minitar (0.5.4) - mixlib-authentication (1.3.0) + mixlib-authentication (1.4.0) mixlib-log + rspec-core (~> 3.2) + rspec-expectations (~> 3.2) + rspec-mocks (~> 3.2) mixlib-cli (1.5.0) mixlib-config (2.2.1) - mixlib-install (0.7.0) + mixlib-install (0.7.1) mixlib-log (1.6.0) - mixlib-shellout (2.2.5) + mixlib-shellout (2.2.6) molinillo (0.2.3) multi_json (1.11.2) + multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) + net-ssh (3.0.2) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) net-telnet (0.1.1) + nio4r (1.2.1) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) nori (2.6.0) - ohai (8.7.0) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + ohai (8.12.0) chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress - mime-types (~> 2.0) mixlib-cli mixlib-config (~> 2.0) mixlib-log mixlib-shellout (~> 2.0) + plist rake (~> 10.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - paint (1.0.0) + paint (1.0.1) + parser (2.3.0.6) + ast (~> 2.2) plist (3.1.0) + polyglot (0.3.5) + powerpack (0.1.1) + proxifier (1.0.3) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) + r-train (0.10.3) + docker-api (~> 1.26.2) + json (~> 1.8) + mixlib-shellout (~> 2.1) + net-scp (~> 1.2) + net-ssh (>= 2.9, < 4.0) + winrm (~> 1.6) + winrm-fs (~> 0.3) rack (1.6.4) - rake (10.4.2) + rainbow (2.1.0) + rake (10.5.0) + retryable (2.0.3) + ridley (4.5.0) + addressable + buff-config (~> 1.0) + buff-extensions (~> 1.0) + buff-ignore (~> 1.1) + buff-shell_out (~> 0.1) + celluloid (~> 0.16.0) + celluloid-io (~> 0.16.1) + chef-config (>= 12.5.0) + erubis + faraday (~> 0.9.0) + hashie (>= 2.0.2, < 4.0.0) + httpclient (~> 2.7) + json (>= 1.7.7) + mixlib-authentication (>= 1.3.0) + retryable (~> 2.0) + semverse (~> 1.1) + varia_model (~> 0.4.0) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.1) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -132,49 +263,97 @@ GEM rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.4.0) + rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.4.0) rspec-support (3.4.1) rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubyntlm (0.4.0) + rubocop (0.38.0) + parser (>= 2.3.0.6, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + ruby-progressbar (1.7.5) + rubyntlm (0.6.0) + rubyzip (1.2.0) + rufus-lru (1.0.5) + safe_yaml (1.0.4) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) semverse (1.2.1) - serverspec (2.24.3) + serverspec (2.31.0) multi_json rspec (~> 3.0) rspec-its - specinfra (~> 2.43) + specinfra (~> 2.53) sfl (2.2) slop (3.6.0) - solve (2.0.1) + solve (2.0.2) molinillo (~> 0.2.3) semverse (~> 1.1) - specinfra (2.44.5) + specinfra (2.53.1) net-scp - net-ssh (~> 2.7) + net-ssh (>= 2.7, < 3.1) net-telnet sfl syslog-logger (1.6.8) systemu (2.6.5) + test-kitchen (1.6.0) + mixlib-install (~> 0.7) + mixlib-shellout (>= 1.2, < 3.0) + net-scp (~> 1.1) + net-ssh (>= 2.9, < 4.0) + safe_yaml (~> 1.0) + thor (~> 0.18) + thor (0.19.1) + timers (4.0.4) + hitimes + treetop (1.6.5) + polyglot (~> 0.3) + unicode-display_width (1.0.2) uuidtools (2.1.5) - winrm (1.3.6) + varia_model (0.4.1) + buff-extensions (~> 1.0) + hashie (>= 2.0.2, < 4.0.0) + winrm (1.7.2) builder (>= 2.1.2) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) - rubyntlm (~> 0.4.0) - uuidtools (~> 2.1.2) + rubyntlm (~> 0.6.0) + winrm-fs (0.3.2) + erubis (~> 2.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 1.1) + winrm (~> 1.5) wmi-lite (1.0.0) + yajl-ruby (1.2.1) PLATFORMS ruby DEPENDENCIES + berkshelf chef-dk + chef-provisioning + chef-vault + chefspec + fauxhai + foodcritic + inspec + kitchen-inspec + kitchen-vagrant + knife-spork + ohai + pry + rubocop + test-kitchen BUNDLED WITH 1.10.5 diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 3b427aae4d25..80f9ef56abce 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, ruby, perl, autoconf }: bundlerEnv { - name = "chefdk-0.10.0"; + name = "chefdk-0.11.2"; inherit ruby; gemfile = ./Gemfile; diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index cb4c1fcb67d6..87faa3105ad6 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -1,4 +1,104 @@ { + "addressable" = { + version = "2.4.0"; + source = { + type = "gem"; + sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; + }; + }; + "app_conf" = { + version = "0.4.2"; + source = { + type = "gem"; + sha256 = "1yqwhr7d9i0cgavqkkq0b4pfqpn213dbhj5ayygr293wplm0jh57"; + }; + }; + "ast" = { + version = "2.2.0"; + source = { + type = "gem"; + sha256 = "14md08f8f1mmr2v7lczqnf1n1v8bal73gvg6ldhvkds1bmbnkrlb"; + }; + }; + "berkshelf" = { + version = "4.3.0"; + source = { + type = "gem"; + sha256 = "1dsbyq3749b9133rmnzjak7rsysyps1ryalc2r4rxyihflmxhix9"; + }; + dependencies = [ + "addressable" + "berkshelf-api-client" + "buff-config" + "buff-extensions" + "buff-shell_out" + "celluloid" + "celluloid-io" + "cleanroom" + "faraday" + "httpclient" + "minitar" + "octokit" + "retryable" + "ridley" + "solve" + "thor" + ]; + }; + "berkshelf-api-client" = { + version = "2.0.2"; + source = { + type = "gem"; + sha256 = "0xbn8q2xi09x5a7ma6wqs13gkpzj4ly21vls7m7ffv3sw8x29cyc"; + }; + dependencies = [ + "faraday" + "httpclient" + "ridley" + ]; + }; + "buff-config" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "0r3h3mk1dj7pc4zymz450bdqp23faqprx363ji4zfdg8z6r31jfh"; + }; + dependencies = [ + "buff-extensions" + "varia_model" + ]; + }; + "buff-extensions" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1jqb5sn38qgx66lc4km6rljzz05myijjw12hznz1fk0k4qfw6yzk"; + }; + }; + "buff-ignore" = { + version = "1.1.1"; + source = { + type = "gem"; + sha256 = "1ghzhkgbq7f5fc7xilw0c9gspxpdhqhq3ygi1ybjm6r0dxlmvdb4"; + }; + }; + "buff-ruby_engine" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "1llpwpmzkakbgz9fc3vr1298cx1n9zv1g25fwj80xnnr7428aj8p"; + }; + }; + "buff-shell_out" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "0sphb69vxm346ys2laiz174k5jx628vfwz9ch8g2w9plc4xkxf3p"; + }; + dependencies = [ + "buff-ruby_engine" + ]; + }; "builder" = { version = "3.2.2"; source = { @@ -6,11 +106,32 @@ sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; }; }; + "celluloid" = { + version = "0.16.0"; + source = { + type = "gem"; + sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; + }; + dependencies = [ + "timers" + ]; + }; + "celluloid-io" = { + version = "0.16.2"; + source = { + type = "gem"; + sha256 = "1l1x0p6daa5vskywrvaxdlanwib3k5pps16axwyy4p8d49pn9rnx"; + }; + dependencies = [ + "celluloid" + "nio4r" + ]; + }; "chef" = { - version = "12.5.1"; + version = "12.8.1"; source = { type = "gem"; - sha256 = "0hf6766wmh1dg7f09hi80s8hn1knvzgnaimbhvc05b4q973k5lmb"; + sha256 = "16wb3ymnl7rbayy8qp35fp0947cnq2y9bac7xzhc1njp5j2p6lhg"; }; dependencies = [ "chef-config" @@ -27,7 +148,7 @@ "net-ssh-multi" "ohai" "plist" - "pry" + "proxifier" "rspec-core" "rspec-expectations" "rspec-mocks" @@ -35,13 +156,14 @@ "serverspec" "specinfra" "syslog-logger" + "uuidtools" ]; }; "chef-config" = { - version = "12.5.1"; + version = "12.8.1"; source = { type = "gem"; - sha256 = "18iqlf9x3iavh6183zlkiasxsz45drshihmk8yj56prrzfiys67m"; + sha256 = "0chgbdv9c1xfkhzx3kmpr8lj0wjdbziixgln2y3ryn84x4fg84ic"; }; dependencies = [ "mixlib-config" @@ -49,10 +171,10 @@ ]; }; "chef-dk" = { - version = "0.10.0"; + version = "0.11.2"; source = { type = "gem"; - sha256 = "0gxm8dbq7y4bf9wb8zad9q5idsl88f1nm3rvnd2am0xka6bnxv29"; + sha256 = "1qfx5qclvh3kwjgfs18iwdn0knpgka5py7mwi4r0mz2sw14wq5wk"; }; dependencies = [ "chef" @@ -68,10 +190,10 @@ ]; }; "chef-provisioning" = { - version = "1.5.0"; + version = "1.6.0"; source = { type = "gem"; - sha256 = "1xln9hf8mcm81cmw96ccmyzrak54fbjrl9wgii37rx04v4a2435n"; + sha256 = "1nxgia4zyhyqbrz65q7lgjwx8ba5iyzxdxa181y0s4aqqpv0j45g"; }; dependencies = [ "cheffish" @@ -83,11 +205,18 @@ "winrm" ]; }; + "chef-vault" = { + version = "2.8.0"; + source = { + type = "gem"; + sha256 = "0dbvawlrfx9mqjyh8q71jjfh987xqqv3f6c0pmcjp6qxs95l1dqq"; + }; + }; "chef-zero" = { - version = "4.3.2"; + version = "4.5.0"; source = { type = "gem"; - sha256 = "1djnxs97kj13vj1hxx4v6978pkwm8i03p76gbirbp3z2zs6jyvjf"; + sha256 = "1lqvmgjniviahrhim8k67qddnwh5p7wzw33r1wga4z136pfka1zx"; }; dependencies = [ "ffi-yajl" @@ -98,20 +227,47 @@ ]; }; "cheffish" = { - version = "1.6.0"; + version = "2.0.2"; source = { type = "gem"; - sha256 = "10aj660azybnf7444a604pjs8p9pvwm3n4mavy8mp3g30yr07paq"; + sha256 = "0mvp7kybgp3nm2sdcmlx8bv147hcdjx745a8k97bx1m47isv97ax"; }; dependencies = [ "chef-zero" + "compat_resource" ]; }; + "chefspec" = { + version = "4.6.0"; + source = { + type = "gem"; + sha256 = "1ikn8k6xdqixdjga50jmkqajz2z2z71dg4j3dsmd31hv1mdbp7wz"; + }; + dependencies = [ + "chef" + "fauxhai" + "rspec" + ]; + }; + "cleanroom" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1r6qa4b248jasv34vh7rw91pm61gzf8g5dvwx2gxrshjs7vbhfml"; + }; + }; "coderay" = { - version = "1.1.0"; + version = "1.1.1"; + source = { + type = "gem"; + sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r"; + }; + }; + "compat_resource" = { + version = "12.8.0"; source = { type = "gem"; - sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s"; + sha256 = "0zp1dd1wkbgxbazvs7acqyk1xjls0wq1pd5ilhj6zi63lpychgy5"; }; }; "cookbook-omnifetch" = { @@ -131,6 +287,24 @@ sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; }; }; + "diffy" = { + version = "3.1.0"; + source = { + type = "gem"; + sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj"; + }; + }; + "docker-api" = { + version = "1.26.2"; + source = { + type = "gem"; + sha256 = "0sg2xazcga21pmlb9yy1z5f3yyzqa2ly5b2h2cxfhyfda6k748wk"; + }; + dependencies = [ + "excon" + "json" + ]; + }; "erubis" = { version = "2.7.0"; source = { @@ -138,6 +312,33 @@ sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; }; }; + "excon" = { + version = "0.48.0"; + source = { + type = "gem"; + sha256 = "0hjfd2p2mhklavhy8gy1ygm390iz3imx71065dcr9r28s3wk63gf"; + }; + }; + "faraday" = { + version = "0.9.2"; + source = { + type = "gem"; + sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; + }; + dependencies = [ + "multipart-post" + ]; + }; + "fauxhai" = { + version = "3.1.0"; + source = { + type = "gem"; + sha256 = "0ff8wappc4n4v7v6969zm64c36qiadfw3igl8cyqrpp36fnqm04d"; + }; + dependencies = [ + "net-ssh" + ]; + }; "ffi" = { version = "1.9.10"; source = { @@ -146,15 +347,48 @@ }; }; "ffi-yajl" = { - version = "2.2.2"; + version = "2.2.3"; source = { type = "gem"; - sha256 = "013n5cf80p2wfpmj1mdjkbmcyx3hg4c81wl3bamglaf4i12a2qk2"; + sha256 = "14wgy2isc5yir4zdkk0l3hzh1s1ycwblqb1hllbv4g9svb9naqbz"; }; dependencies = [ "libyajl2" ]; }; + "foodcritic" = { + version = "6.0.1"; + source = { + type = "gem"; + sha256 = "06pi4984g6vwfzqvsf73zpw4h1p63bl7yn2sjb9mqd896bb3v6cn"; + }; + dependencies = [ + "erubis" + "gherkin" + "nokogiri" + "rake" + "rufus-lru" + "treetop" + "yajl-ruby" + ]; + }; + "gherkin" = { + version = "2.12.2"; + source = { + type = "gem"; + sha256 = "1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25"; + }; + dependencies = [ + "multi_json" + ]; + }; + "git" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3"; + }; + }; "gssapi" = { version = "1.2.0"; source = { @@ -189,11 +423,18 @@ sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; }; }; + "hitimes" = { + version = "1.2.3"; + source = { + type = "gem"; + sha256 = "1fr9raz7652bnnx09dllyjdlnwdxsnl0ig5hq9s4s8vackvmckv4"; + }; + }; "httpclient" = { - version = "2.7.0.1"; + version = "2.7.1"; source = { type = "gem"; - sha256 = "0k6bqsaqq6c824vrbfb5pkz8bpk565zikd10w85rzj2dy809ik6c"; + sha256 = "1y01wgmvwz8r4ycr87d12niglpk0nlh2hkpgy9bnmm8as7kgs428"; }; }; "inifile" = { @@ -203,12 +444,71 @@ sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25"; }; }; + "inspec" = { + version = "0.14.8"; + source = { + type = "gem"; + sha256 = "0whd57f82ml0awn7wgfi8gj3mwl7njww22hn2ciabxafqld9xrri"; + }; + dependencies = [ + "json" + "method_source" + "pry" + "r-train" + "rainbow" + "rspec" + "rspec-its" + "rubyzip" + "thor" + ]; + }; "ipaddress" = { - version = "0.8.0"; + version = "0.8.3"; + source = { + type = "gem"; + sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; + }; + }; + "json" = { + version = "1.8.3"; + source = { + type = "gem"; + sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + }; + }; + "kitchen-inspec" = { + version = "0.12.3"; + source = { + type = "gem"; + sha256 = "1vjb9pxb4ga9ppr35k6vsqh053k35b4fxamzg99g17y1rijp6dbj"; + }; + dependencies = [ + "inspec" + "test-kitchen" + ]; + }; + "kitchen-vagrant" = { + version = "0.19.0"; + source = { + type = "gem"; + sha256 = "0sydjihhvnr40vqnj7bg65zxf00crwvwdli1av03ghhggrp5scla"; + }; + dependencies = [ + "test-kitchen" + ]; + }; + "knife-spork" = { + version = "1.6.1"; source = { type = "gem"; - sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir"; + sha256 = "104f3xq4gfy7rszc8zbfakg9wlnwnf8k9zij9ahdq4id3sdf1ylb"; }; + dependencies = [ + "app_conf" + "chef" + "diffy" + "git" + ]; }; "libyajl2" = { version = "1.2.0"; @@ -242,11 +542,11 @@ sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; }; }; - "mime-types" = { - version = "2.99"; + "mini_portile2" = { + version = "2.0.0"; source = { type = "gem"; - sha256 = "1hravghdnk9qbibxb3ggzv7mysl97djh8n0rsswy3ssjaw7cbvf2"; + sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"; }; }; "minitar" = { @@ -257,13 +557,16 @@ }; }; "mixlib-authentication" = { - version = "1.3.0"; + version = "1.4.0"; source = { type = "gem"; - sha256 = "1c5p5ipa3cssmwgdn0q3lyy1w7asikh9qfpnn7xcfz2f9m7v02zg"; + sha256 = "0qk6mln2bkp6jgkz3sh5r69lzipzjs4dqdixqq12wzvwapmgc0zj"; }; dependencies = [ "mixlib-log" + "rspec-core" + "rspec-expectations" + "rspec-mocks" ]; }; "mixlib-cli" = { @@ -281,10 +584,10 @@ }; }; "mixlib-install" = { - version = "0.7.0"; + version = "0.7.1"; source = { type = "gem"; - sha256 = "0ll1p7v7fp3rf11dz8pifz33jhl4bdg779n4hzlnbia2z7xfsa2w"; + sha256 = "1ws2syfimnqzlff2fp6yj5v7zgnzmi3pj9kbkg7xlmd9fhnkb0n7"; }; }; "mixlib-log" = { @@ -295,10 +598,10 @@ }; }; "mixlib-shellout" = { - version = "2.2.5"; + version = "2.2.6"; source = { type = "gem"; - sha256 = "1is07rar0x8n9h67j4iyrxz2yfgis4bnhh3x7vhbbi6khqqixg79"; + sha256 = "1xfs7yp533qx3nsd4x2q2r125awyxcizgdc4dwgdlxsa1n1pj0pd"; }; }; "molinillo" = { @@ -315,6 +618,13 @@ sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r"; }; }; + "multipart-post" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + }; + }; "net-scp" = { version = "1.2.1"; source = { @@ -326,10 +636,10 @@ ]; }; "net-ssh" = { - version = "2.9.2"; + version = "3.0.2"; source = { type = "gem"; - sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; + sha256 = "1k3hrgr899dlhkn53c4hnn5qzbhc7lwks0vaqgw95gg74hn1ivqw"; }; }; "net-ssh-gateway" = { @@ -360,6 +670,23 @@ sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; }; }; + "nio4r" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "1adnm77xfxck0mrvid5d7lwng783gh580rh3y18nq4bwdikr6nha"; + }; + }; + "nokogiri" = { + version = "1.6.7.2"; + source = { + type = "gem"; + sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; + }; + dependencies = [ + "mini_portile2" + ]; + }; "nori" = { version = "2.6.0"; source = { @@ -367,34 +694,54 @@ sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; }; }; + "octokit" = { + version = "4.3.0"; + source = { + type = "gem"; + sha256 = "1hq47ck0z03vr3rzblyszihn7x2m81gv35chwwx0vrhf17nd27np"; + }; + dependencies = [ + "sawyer" + ]; + }; "ohai" = { - version = "8.7.0"; + version = "8.12.0"; source = { type = "gem"; - sha256 = "1f10kgxh89iwij54yx8q11n1q87653ckvdmdwg8cwz3qlgf4flhy"; + sha256 = "0l7vdfnfm4plla6q4qkngwpmy0ah53pnymlwfzc7iy6jn2n9ibpm"; }; dependencies = [ "chef-config" "ffi" "ffi-yajl" "ipaddress" - "mime-types" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" + "plist" "rake" "systemu" "wmi-lite" ]; }; "paint" = { - version = "1.0.0"; + version = "1.0.1"; source = { type = "gem"; - sha256 = "0mhwj6w60q40w4f6jz8xx8bv1kghjvsjc3d8q8pnslax4fkmzbp1"; + sha256 = "1z1fqyyc2jiv6yabv467h652cxr2lmxl5gqqg7p14y28kdqf0nhj"; }; }; + "parser" = { + version = "2.3.0.6"; + source = { + type = "gem"; + sha256 = "1r14k5jlsc5ivxjm1kljhk9sqp50rnd71n0mzx18hz135nvw1hbz"; + }; + dependencies = [ + "ast" + ]; + }; "plist" = { version = "3.1.0"; source = { @@ -402,6 +749,27 @@ sha256 = "0rh8nddwdya888j1f4wix3dfan1rlana3mc7mwrvafxir88a1qcs"; }; }; + "polyglot" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + }; + }; + "powerpack" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; + }; + }; + "proxifier" = { + version = "1.0.3"; + source = { + type = "gem"; + sha256 = "1abzlg39cfji1nx3i8kmb5k3anr2rd392yg2icms24wkqz9g9zj0"; + }; + }; "pry" = { version = "0.10.3"; source = { @@ -414,6 +782,22 @@ "slop" ]; }; + "r-train" = { + version = "0.10.3"; + source = { + type = "gem"; + sha256 = "1hn0aap2lq15p97mb91h32yfsw8rh4imhyjlbs4jx9x52h2q6nam"; + }; + dependencies = [ + "docker-api" + "json" + "mixlib-shellout" + "net-scp" + "net-ssh" + "winrm" + "winrm-fs" + ]; + }; "rack" = { version = "1.6.4"; source = { @@ -421,13 +805,53 @@ sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; }; }; + "rainbow" = { + version = "2.1.0"; + source = { + type = "gem"; + sha256 = "11licivacvfqbjx2rwppi8z89qff2cgs67d4wyx42pc5fg7g9f00"; + }; + }; "rake" = { - version = "10.4.2"; + version = "10.5.0"; source = { type = "gem"; - sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; + sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; }; }; + "retryable" = { + version = "2.0.3"; + source = { + type = "gem"; + sha256 = "0lr3wasxwdyzr0bag179003hs2ycn9w86m450pazc81v19j4x1dq"; + }; + }; + "ridley" = { + version = "4.5.0"; + source = { + type = "gem"; + sha256 = "0y0p45y3xp37gg8ab132x4i0iggl3p907wfklhr5gb7r5yj6sj4r"; + }; + dependencies = [ + "addressable" + "buff-config" + "buff-extensions" + "buff-ignore" + "buff-shell_out" + "celluloid" + "celluloid-io" + "chef-config" + "erubis" + "faraday" + "hashie" + "httpclient" + "json" + "mixlib-authentication" + "retryable" + "semverse" + "varia_model" + ]; + }; "rspec" = { version = "3.4.0"; source = { @@ -441,10 +865,10 @@ ]; }; "rspec-core" = { - version = "3.4.1"; + version = "3.4.4"; source = { type = "gem"; - sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn"; + sha256 = "1z2zmy3xaq00v20ykamqvnynzv2qrrnbixc6dn0jw1c5q9mqq9fp"; }; dependencies = [ "rspec-support" @@ -473,10 +897,10 @@ ]; }; "rspec-mocks" = { - version = "3.4.0"; + version = "3.4.1"; source = { type = "gem"; - sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1"; + sha256 = "0sk8ijq5d6bwhvjq94gfm02fssxkm99bgpasqazsmmll5m1cn7vr"; }; dependencies = [ "diff-lcs" @@ -501,13 +925,66 @@ "rspec-core" ]; }; + "rubocop" = { + version = "0.38.0"; + source = { + type = "gem"; + sha256 = "0qgwq558n41z2id7nwc3bh7z8h9yh7c9zdasqn8p30p0p72f5520"; + }; + dependencies = [ + "parser" + "powerpack" + "rainbow" + "ruby-progressbar" + "unicode-display_width" + ]; + }; + "ruby-progressbar" = { + version = "1.7.5"; + source = { + type = "gem"; + sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; + }; + }; "rubyntlm" = { - version = "0.4.0"; + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "00k1cll10mcyg6qpdzyrazm5pjbpj7wq54ki2y8vxz86842vbsgp"; + }; + }; + "rubyzip" = { + version = "1.2.0"; source = { type = "gem"; - sha256 = "03xmi8mxcbc5laad10r6b705dk4vyhl9lr7h940f2rhibymxq45x"; + sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s"; }; }; + "rufus-lru" = { + version = "1.0.5"; + source = { + type = "gem"; + sha256 = "1vrsbvcsl7yspzb761p2gbl7dwz0d1j82msbjsksf8hi4cv970s5"; + }; + }; + "safe_yaml" = { + version = "1.0.4"; + source = { + type = "gem"; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + }; + }; + "sawyer" = { + version = "0.7.0"; + source = { + type = "gem"; + sha256 = "1cn48ql00mf1ag9icmfpj7g7swh7mdn7992ggynjqbw1gh15bs3j"; + }; + dependencies = [ + "addressable" + "faraday" + ]; + }; "semverse" = { version = "1.2.1"; source = { @@ -516,10 +993,10 @@ }; }; "serverspec" = { - version = "2.24.3"; + version = "2.31.0"; source = { type = "gem"; - sha256 = "03v6qqshqjsvbbjf1pwbi2mzgqg84wdbhnqb3gdbl1m9bz7sxg1n"; + sha256 = "169mh6s4drxy9qs7f01gqcaq1qfkvy9hdc1ny3lnk0aiwfcm2s1p"; }; dependencies = [ "multi_json" @@ -543,10 +1020,10 @@ }; }; "solve" = { - version = "2.0.1"; + version = "2.0.2"; source = { type = "gem"; - sha256 = "0009xvg40y59bijds5njnwfshfw68wmj54yz3qy538g9rpxvmqp1"; + sha256 = "0mwdd6z3vbzna9vphnkgdghy40xawn0yiwhamvb6spfk6n2c80kb"; }; dependencies = [ "molinillo" @@ -554,10 +1031,10 @@ ]; }; "specinfra" = { - version = "2.44.5"; + version = "2.53.1"; source = { type = "gem"; - sha256 = "018i3bmmy7lc21hagvwfmz2sdfj0v87a7yy3z162lcpq62vxw89r"; + sha256 = "17jbrn7nm6c72qy1nw064c0yi9cimd295s7j6x9bm878cbyq9i6i"; }; dependencies = [ "net-scp" @@ -580,6 +1057,55 @@ sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1"; }; }; + "test-kitchen" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "1glmvjm24fmlbhm8q4lzi1ynds77ip3s4s5q6fdjlhdanh6jrgwz"; + }; + dependencies = [ + "mixlib-install" + "mixlib-shellout" + "net-scp" + "net-ssh" + "safe_yaml" + "thor" + ]; + }; + "thor" = { + version = "0.19.1"; + source = { + type = "gem"; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + }; + }; + "timers" = { + version = "4.0.4"; + source = { + type = "gem"; + sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz"; + }; + dependencies = [ + "hitimes" + ]; + }; + "treetop" = { + version = "1.6.5"; + source = { + type = "gem"; + sha256 = "1lg7j8xf8yxmnz1v8zkwhs4l6j30kq2pxvvrvpah2frlaqz077dh"; + }; + dependencies = [ + "polyglot" + ]; + }; + "unicode-display_width" = { + version = "1.0.2"; + source = { + type = "gem"; + sha256 = "1cffs73zrn788dyd1vv91p0mcxgx2g1sis6552ggmfib3f148gbi"; + }; + }; "uuidtools" = { version = "2.1.5"; source = { @@ -587,11 +1113,22 @@ sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; }; }; + "varia_model" = { + version = "0.4.1"; + source = { + type = "gem"; + sha256 = "1qm9fhizfry055yras9g1129lfd48fxg4lh0hck8h8cvjdjz1i62"; + }; + dependencies = [ + "buff-extensions" + "hashie" + ]; + }; "winrm" = { - version = "1.3.6"; + version = "1.7.2"; source = { type = "gem"; - sha256 = "1rx42y5w9d3w6axxwdj9zckzsgsjk172zxn52w2jj65spl98vxbc"; + sha256 = "1as865gd6f0g0hppw8plki1i4afpn6lcx89sgi52v1mlgwxfifff"; }; dependencies = [ "builder" @@ -601,7 +1138,19 @@ "logging" "nori" "rubyntlm" - "uuidtools" + ]; + }; + "winrm-fs" = { + version = "0.3.2"; + source = { + type = "gem"; + sha256 = "08j2ip9wx1vcx45kd9ws6lb6znfq9gib1n2j7shzs10rxwgs1bj8"; + }; + dependencies = [ + "erubis" + "logging" + "rubyzip" + "winrm" ]; }; "wmi-lite" = { @@ -611,4 +1160,11 @@ sha256 = "06pm7jr2gcnphhhswha2kqw0vhxy91i68942s7gqriadbc8pq9z3"; }; }; + "yajl-ruby" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + }; + }; } \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index f416345028f9..dc885f09b5bc 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "1.650"; + version = "1.652"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0iypkyjcsfj36j683a6yis4q0wil6m8l065fx8v2p7ba4j2ql00n"; + sha256 = "09xcsgfhxshfqgg0aighby8dx1qgzh7fkfkynyv5xg1m216z21jx"; }; meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index e5c2060b5e9b..338f3323d947 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchzip, qt4, sqlite, cmake }: +{ stdenv, fetchFromGitHub, qt4, sqlite, cmake }: stdenv.mkDerivation rec { - version = "3.7.0"; + version = "3.8.0"; name = "sqlitebrowser-${version}"; - src = fetchzip { - name = "${name}-src"; - url = "https://github.com/sqlitebrowser/sqlitebrowser/archive/v${version}.tar.gz"; - sha256 = "1zsgylnxk4lyg7p6k6pv8d3mh1k0wkfcplh5c5da3x3i9a3qs78j"; + src = fetchFromGitHub { + repo = "sqlitebrowser"; + owner = "sqlitebrowser"; + rev = "v${version}"; + sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp"; }; buildInputs = [ qt4 sqlite cmake ]; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix new file mode 100644 index 000000000000..a8806127d356 --- /dev/null +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -0,0 +1,43 @@ +{stdenv, autoconf, which, writeText, makeWrapper, fetchFromGitHub, erlang, + erlangPackages, z3, python27 }: + +stdenv.mkDerivation rec { + name = "cuter"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "aggelgian"; + repo = "cuter"; + rev = "v${version}"; + sha256 = "1ax1pj6ji4w2mg3p0nh2lzmg3n9mgfxk4cf07pll51yrcfpfrnfv"; + }; + + setupHook = writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + ''; + buildInputs = with erlangPackages; [ autoconf erlang z3 python27 makeWrapper which ]; + + buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; + configurePhase = '' + autoconf + ./configure --prefix $out + ''; + + installPhase = '' + mkdir -p "$out/lib/erlang/lib/cuter-${version}" + mkdir -p "$out/bin" + cp -r * "$out/lib/erlang/lib/cuter-${version}" + cp cuter "$out/bin/cuter" + wrapProgram $out/bin/cuter \ + --prefix PATH : "${python27}/bin" \ + --suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \ + --suffix ERL_LIBS : "$out/lib/erlang/lib" + ''; + + meta = { + description = "A concolic testing tool for the Erlang functional programming language"; + license = stdenv.lib.licenses.gpl3; + homepage = "https://github.com/aggelgian/cuter"; + maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + }; +} diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index 169c8fdd68a0..7ff283176e1d 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "galen"; - version = "2.2.1"; + version = "2.2.3"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { - url = "https://github.com/galenframework/galen/releases/download/galen-2.2.1/galen-bin-${version}.zip"; - sha256 = "0zwrh3bxcgkwip6z9lvy3hn53kfr99cdij64c57ff8d95xilclhb"; + url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; + sha256 = "13kvxbw68g82rv8bp9g4fkrrsd7nag1a4bspilqi2wnxc51c8mqq"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 14777b95b85e..6cce86a80627 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "g-wrap-1.9.15"; src = fetchurl { url = "mirror://savannah/g-wrap/${name}.tar.gz"; - sha256 = "140fcvp24pqmfmiibhjxl3s75hj26ln7pkl2wxas84lnchbj9m4d"; + sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; # Note: Glib support is optional, but it's quite useful (e.g., it's diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix index 68c85fb29515..87dc173dd878 100644 --- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "cabal2nix"; - version = "20151217"; + version = "20160308"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix index 7aac407e3ceb..5aa4370b26f9 100644 --- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -11,8 +11,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; - rev = "v20151217"; - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; + rev = "v20160308"; + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; }; postUnpack = "sourceRoot+=/${pname}"; libraryHaskellDepends = [ diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix index b2b3b46581aa..ce1d9303cdcd 100644 --- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "hackage2nix"; - version = "20151217"; + version = "20160308"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix new file mode 100644 index 000000000000..09b5edeeecdf --- /dev/null +++ b/pkgs/development/tools/jo/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchFromGitHub, autoreconfHook}: + +stdenv.mkDerivation rec { + name = "jo-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "jpmens"; + repo = "jo"; + + rev = "v${version}"; + sha256="0vyi0aaxsp6x3cvym7mlcfdsxjhj5h0b00mqc42mg8kc95cyp2c1"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A small utility to create JSON objects"; + homepage = https://github.com/jpmens/jo; + license = licenses.gpl2Plus; + maintainers = [maintainers.markus1189]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 0f99cabbb96b..606cc5146470 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { description = "Shim for vrt to enable bootstrapping"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 20373c923e7e..ae253180aee1 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A software system for writing extensible parsers for programming languages"; homepage = https://github.com/ocaml/camlp4; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix index adfdb4bd204c..e8cda36f101b 100644 --- a/pkgs/development/tools/ocaml/camlp5/5.15.nix +++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { homepage = "${webpage}"; license = stdenv.lib.licenses.bsd3; branch = "5"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index d9f364234308..83dd74d321ec 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; homepage = http://pauillac.inria.fr/~ddr/camlp5/; license = licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbgl ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 746be6dd0812..5d9757f2666e 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = http://projects.camlcity.org/projects/findlib.html; description = "O'Caml library manager"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z stdenv.lib.maintainers.vbmithr diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index ca5230d1e086..3258aaf08c2f 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://ocsigen.org/js_of_ocaml/; description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser"; license = licenses.lgpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.gal_bolle ]; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index e823466f4174..70d90752aceb 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://oasis.forge.ocamlcore.org/; description = "Configure, build and install system for OCaml projects"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl z77z ]; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 79c81c5c447c..9bea3e9dc17d 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { homepage = http://www.typerex.org/ocaml-top.html; license = stdenv.lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; - platforms = ocamlPackages.ocaml.meta.platforms; + platforms = ocamlPackages.ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index 0a402d4ba469..f3caa42b8fd7 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod; description = "Generate OCaml modules from source files"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ z77z diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 65359049a96d..7ff73ff28dc2 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod; description = "Generate OCaml modules from source files"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ z77z ]; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 1b37c21fdfa7..28efaf4cf3d2 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://martin.jambon.free.fr/ocamlscript.html; license = licenses.boost; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Natively-compiled OCaml scripts"; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 31b99ada2a38..48657a8e19d0 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { between source files. ''; license = licenses.gpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 224ce57808f9..d146dd5e9731 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 76be5f8bd47d..37f90c41100a 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { homepage = http://typerex.ocamlpro.com/ocp-index.html; description = "A simple and light-weight documentation extractor for OCaml"; license = stdenv.lib.licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 40188734a996..9f318afc67d7 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { description = "Omake build system"; homepage = "${webpage}"; license = "GPL"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index c9addf55312c..b5de65b7c10f 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/diml/utop; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix index 185ad61680b1..6e9b0bbf49ee 100644 --- a/pkgs/development/web/nodejs/v5.nix +++ b/pkgs/development/web/nodejs/v5.nix @@ -7,7 +7,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "5.7.1"; + version = "5.8.0"; deps = { inherit openssl zlib libuv; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "16016cjycg0filh15nqfh3k1fdw3kaykl87xf8dnzf666mirbm7c"; + sha256 = "165q4bbq1fjrr82ciiczbgyz37fl8sg3nqspccz0aqhwxh65ikg8"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; |