diff --git a/doc/erlang-users-guide.xml b/doc/erlang-users-guide.xml new file mode 100644 index 00000000000..778d6e709b1 --- /dev/null +++ b/doc/erlang-users-guide.xml @@ -0,0 +1,288 @@ + + +User's Guide to the Erlang Infrastructure + +
+ How to install Erlang packages + + Erlang packages are not registered in the top level simply because + they are not relevant to the vast majority of Nix users. They are + installable using the erlangPackages attribute set. + + You can list the avialable packages in the + erlangPackages with the following command: + + + +$ nix-env -f "<nixpkgs>" -qaP -A erlangPackages +erlangPackages.esqlite esqlite-0.2.1 +erlangPackages.goldrush goldrush-0.1.7 +erlangPackages.ibrowse ibrowse-4.2.2 +erlangPackages.jiffy jiffy-0.14.5 +erlangPackages.lager lager-3.0.2 +erlangPackages.meck meck-0.8.3 +erlangPackages.rebar3-pc pc-1.1.0 + + + To install any of those packages into your profile, refer to them by + their attribute path (first column): + + +$ nix-env -f "<nixpkgs>" -iA erlangPackages.ibrowse + + + The attribute path of any Erlang packages corresponds to the name + of that particular package in Hex or its OTP Application/Release name. + +
+
+ Packaging Erlang Applications +
+ Rebar3 Packages + + There is a Nix functional called + buildRebar3. We use this function to make a + derivation that understands how to build the rebar3 project. For + example, the epression we use to build the hex2nix + project follows. + + +{stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }: + +buildRebar3 rec { + name = "hex2nix"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "ericbmerritt"; + repo = "hex2nix"; + rev = "${version}"; + sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg"; + }; + + erlangDeps = [ ibrowse jsx erlware_commons ]; +} + + + The only visible difference between this derivation and + something like stdenv.mkDerivation is that we + have added erlangDeps to the derivation. If + you add your Erlang dependencies here they will be correctly + handled by the system. + + + If your package needs to compile native code via Rebar's port + compilation mechenism. You should add compilePort = + true; to the derivation. + +
+ +
+ Hex Packages + + Hex packages are based on Rebar packages. In fact, at the moment + we can only compile Hex packages that are buildable with + Rebar3. Packages that use Mix and other build systems are not + supported. That being said, we know a lot more about Hex and can + do more for you. + + +{ buildHex }: + buildHex { + name = "esqlite"; + version = "0.2.1"; + sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr"; + compilePort = true; +} + + + For Hex packages you need to provide the name, the version, and + the Sha 256 digest of the package and use + buildHex to build it. Obviously, the package + needs to have already been published to Hex. + +
+
+
+ How to develop +
+ Accessing an Environment + + Often, all you want to do is be able to access a valid + environment that contains a specific package and its + dependencies. we can do that with the env + part of a derivation. For example, lets say we want to access an + erlang repl with ibrowse loaded up. We could do the following. + + + ~/w/nixpkgs ❯❯❯ nix-shell -A erlangPackages.ibrowse.env --run "erl" + Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false] + + Eshell V7.0 (abort with ^G) + 1> m(ibrowse). + Module: ibrowse + MD5: 3b3e0137d0cbb28070146978a3392945 + Compiled: January 10 2016, 23:34 + Object file: /nix/store/g1rlf65rdgjs4abbyj4grp37ry7ywivj-ibrowse-4.2.2/lib/erlang/lib/ibrowse-4.2.2/ebin/ibrowse.beam + Compiler options: [{outdir,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/ebin"}, + debug_info,debug_info,nowarn_shadow_vars, + warn_unused_import,warn_unused_vars,warnings_as_errors, + {i,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/include"}] + Exports: + add_config/1 send_req_direct/7 + all_trace_off/0 set_dest/3 + code_change/3 set_max_attempts/3 + get_config_value/1 set_max_pipeline_size/3 + get_config_value/2 set_max_sessions/3 + get_metrics/0 show_dest_status/0 + get_metrics/2 show_dest_status/1 + handle_call/3 show_dest_status/2 + handle_cast/2 spawn_link_worker_process/1 + handle_info/2 spawn_link_worker_process/2 + init/1 spawn_worker_process/1 + module_info/0 spawn_worker_process/2 + module_info/1 start/0 + rescan_config/0 start_link/0 + rescan_config/1 stop/0 + send_req/3 stop_worker_process/1 + send_req/4 stream_close/1 + send_req/5 stream_next/1 + send_req/6 terminate/2 + send_req_direct/4 trace_off/0 + send_req_direct/5 trace_off/2 + send_req_direct/6 trace_on/0 + trace_on/2 + ok + 2> + + + Notice the -A erlangPackages.ibrowse.env.That + is the key to this functionality. + +
+
+ Creating a Shell + + Getting access to an environment often isn't enough to do real + development. Many times we need to create a + shell.nix file and do our development inside + of the environment specified by that file. This file looks a lot + like the packageing described above. The main difference is that + src points to project root and we call the + package directly. + + +{ pkgs ? import "<nixpkgs"> {} }: + +with pkgs; + +let + + f = { buildHex, ibrowse, jsx, erlware_commons }: + buildHex { + name = "hex2nix"; + version = "0.1.0"; + src = ./.; + erlangDeps = [ ibrowse jsx erlware_commons ]; + }; + drv = erlangPackages.callPackage f {}; + +in + drv + +
+ Building in a shell + + Unfortunatly for us users of Nix, Rebar isn't very cooperative + with us from the standpoint of building a hermetic + environment. When building the rebar3 support we had to do some + sneaky things to get it not to go out and pull packages on its + own. Also unfortunately, you have to do some of the same things + when building a project inside of a Nix shell. + + + + Run rebar3-nix-bootstrap every time + dependencies change + + + Set Home to the current directory. + + + + If you do these two things then Rebar will be happy with you. I + codify these into a makefile. Forunately, rebar3-nix-bootstrap + is idempotent and fairly quick. so you can run it as often as + you like. + + +# ============================================================================= +# Rules +# ============================================================================= +.PHONY= all test clean repl shell build test analyze bootstrap + +all: test + +clean: + rm -rf _build + rm -rf .cache + +repl: + nix-shell --run "erl" + +shell: + nix-shell --run "bash" + +bootstrap: + nix-shell --pure --run "rebar3-nix-bootstrap" + +build: bootstrap + nix-shell --pure --run "HOME=$(CURDIR) rebar3 compile" + +analyze: bootstrap + nix-shell --pure --run "HOME=$(CURDIR) rebar3 do compile,dialyzer" + +test: bootstrap + nix-shell --pure --run "HOME=$(CURDIR) rebar3 do compile,dialyzer,eunit" + + + + If you add the shell.nix as described and + user rebar as follows things should simply work. + +
+
+
+
+ Generating Packages from Hex with Hex2Nix + + Updating the Hex packages requires the use of the + hex2nix tool. Given the path to the Erlang + modules (usually + pkgs/development/erlang-modules). It will + happily dump a file called + hex-packages.nix. That file will contain all + the packages that use a recognized build system in Hex. However, + it can't know whether or not all those packages are buildable. + + + To make life easier for our users, it makes good sense to go + ahead and attempt to build all those packages and remove the + ones that don't build. To do that, simply run the command (in + the root of your nixpkgs repository). that follows. + + +$ nix-build -A erlangPackages + + + That will build every package in + erlangPackages. Then you can go through and + manually remove the ones that fail. Hopefully, someone will + improve hex2nix in the future to automate + that. + +
+ diff --git a/doc/manual.xml b/doc/manual.xml index b4c35d1a379..2b4f47aff1c 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -20,6 +20,7 @@ + diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 45e2674cd66..3d7e2be1553 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -335,6 +335,7 @@ wyvie = "Elijah Rum "; yarr = "Dmitry V. "; z77z = "Marco Maggesi "; + zagy = "Christian Zagrodnick "; zef = "Zef Hemel "; zimbatm = "zimbatm "; zoomulator = "Kim Simmons "; diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index c87996df885..a6657768e06 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -57,6 +57,7 @@ in users.ldap = { enable = mkOption { + type = types.bool; default = false; description = "Whether to enable authentication against an LDAP server."; }; diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 2ebc6126055..179e826ba05 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -99,6 +99,7 @@ in { package = mkOption { type = types.package; default = pulseaudioLight; + defaultText = "pkgs.pulseaudioLight"; example = literalExample "pkgs.pulseaudioFull"; description = '' The PulseAudio derivation to use. This can be used to enable diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index d0243f9775c..9642981803b 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -119,6 +119,7 @@ in environment.binsh = mkOption { default = "${config.system.build.binsh}/bin/sh"; + defaultText = "\${config.system.build.binsh}/bin/sh"; example = literalExample '' "''${pkgs.dash}/bin/dash" ''; diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix index 98929392ace..eea6477fff2 100644 --- a/nixos/modules/config/unix-odbc-drivers.nix +++ b/nixos/modules/config/unix-odbc-drivers.nix @@ -10,8 +10,9 @@ with lib; options = { environment.unixODBCDrivers = mkOption { + type = types.listOf types.package; default = []; - example = literalExample "map (x : x.ini) (with pkgs.unixODBCDrivers; [ mysql psql psqlng ] )"; + example = literalExample "with pkgs.unixODBCDrivers; [ mysql psql psqlng ]"; description = '' Specifies Unix ODBC drivers to be registered in /etc/odbcinst.ini. You may also want to @@ -26,7 +27,7 @@ with lib; config = mkIf (config.environment.unixODBCDrivers != []) { environment.etc."odbcinst.ini".text = - let inis = config.environment.unixODBCDrivers; + let inis = map (x : x.ini) config.environment.unixODBCDrivers; in lib.concatStringsSep "\n" inis; }; diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index ea7e3e16b8d..1e5e2b2615c 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -17,7 +17,9 @@ let mkdir -p $out cp -prd ${pkgs.path} $out/nixos chmod -R u+w $out/nixos - ln -s . $out/nixos/nixpkgs + if [ ! -e $out/nixos/nixpkgs ]; then + ln -s . $out/nixos/nixpkgs + fi rm -rf $out/nixos/.git echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix ''; diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix index 1156003d3f4..5da5df81ede 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix @@ -109,7 +109,7 @@ in # not be started by default on the installation CD because the # default root password is empty. services.openssh.enable = true; - jobs.openssh.startOn = lib.mkOverride 50 ""; + systemd.services.openssh.wantedBy = lib.mkOverride 50 []; # To be able to use the systemTarball to catch troubles. boot.crashDump = { diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index 773b5ac9da3..5ef4b7781bd 100644 --- a/nixos/modules/misc/crashdump.nix +++ b/nixos/modules/misc/crashdump.nix @@ -24,6 +24,7 @@ in ''; }; kernelPackages = mkOption { + type = types.package; default = pkgs.linuxPackages; # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 39ed914994c..064b4cbc4b3 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -245,6 +245,9 @@ opendkim = 221; dspam = 222; gale = 223; + matrix-synapse = 224; + rspamd = 225; + rmilter = 226; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -467,6 +470,9 @@ opendkim = 221; dspam = 222; gale = 223; + matrix-synapse = 224; + rspamd = 225; + rmilter = 226; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/nixos.nix b/nixos/modules/misc/nixos.nix index 356129211d0..84365b640a4 100644 --- a/nixos/modules/misc/nixos.nix +++ b/nixos/modules/misc/nixos.nix @@ -37,8 +37,8 @@ with lib; nixos.extraModules = mkOption { default = []; - example = literalExample "mkIf config.services.openssh.enable [ ./sshd-config.nix ]"; - type = types.listOf types.unspecified; + example = literalExample "[ ./sshd-config.nix ]"; + type = types.listOf (types.either (types.submodule ({...}:{options={};})) types.path); description = '' Define additional modules which would be loaded to evaluate the configuration. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d9e8c2da5b3..2ff61877c23 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -193,6 +193,8 @@ ./services/mail/postfix.nix ./services/mail/postsrsd.nix ./services/mail/spamassassin.nix + ./services/mail/rspamd.nix + ./services/mail/rmilter.nix ./services/misc/apache-kafka.nix ./services/misc/autofs.nix ./services/misc/bepasty.nix @@ -214,6 +216,7 @@ ./services/misc/gpsd.nix ./services/misc/ihaskell.nix ./services/misc/mathics.nix + ./services/misc/matrix-synapse.nix ./services/misc/mbpfan.nix ./services/misc/mediatomb.nix ./services/misc/mesos-master.nix diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 87a7bac208b..260888be485 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -93,7 +93,9 @@ in }; package = mkOption { + type = types.package; default = pkgs.openssh; + defaultText = "pkgs.openssh"; description = '' The package used for the openssh client and daemon. ''; @@ -142,16 +144,18 @@ in description = '' The set of system-wide known SSH hosts. ''; - example = [ - { - hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; - publicKeyFile = literalExample "./pubkeys/myhost_ssh_host_dsa_key.pub"; - } - { - hostNames = [ "myhost2" ]; - publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub"; - } - ]; + example = literalExample '' + [ + { + hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; + publicKeyFile = "./pubkeys/myhost_ssh_host_dsa_key.pub"; + } + { + hostNames = [ "myhost2" ]; + publicKeyFile = "./pubkeys/myhost2_ssh_host_dsa_key.pub"; + } + ] + ''; }; }; diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index dae7e446b4c..b51104c16fa 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -98,18 +98,18 @@ in loginShellInit = cfge.loginShellInit; interactiveShellInit = '' - ${cfge.interactiveShellInit} - - ${cfg.promptInit} - ${zshAliases} - - # Some sane history defaults + # history defaults export SAVEHIST=2000 export HISTSIZE=2000 export HISTFILE=$HOME/.zsh_history setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK + ${cfge.interactiveShellInit} + + ${cfg.promptInit} + ${zshAliases} + # Tell zsh how to find installed completions for p in ''${(z)NIX_PROFILES}; do fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions) diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixos/modules/services/audio/liquidsoap.nix index bf67d2399eb..1c19ed36bdc 100644 --- a/nixos/modules/services/audio/liquidsoap.nix +++ b/nixos/modules/services/audio/liquidsoap.nix @@ -46,7 +46,7 @@ in example = { myStream1 = literalExample "\"/etc/liquidsoap/myStream1.liq\""; myStream2 = literalExample "./myStream2.liq"; - myStream3 = literalExample "\"out(playlist(\"/srv/music/\"))\""; + myStream3 = literalExample "\"out(playlist(\\\"/srv/music/\\\"))\""; }; type = types.attrsOf (types.either types.path types.str); diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 69f3c3f8a75..8a26aae75fe 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -207,7 +207,7 @@ in { description = '' Extra configuration to be passed in Client directive. ''; - example = literalExample '' + example = '' Maximum Concurrent Jobs = 20; Heartbeat Interval = 30; ''; @@ -218,7 +218,7 @@ in { description = '' Extra configuration to be passed in Messages directive. ''; - example = literalExample '' + example = '' console = all ''; }; diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix index fb25bd9dd1e..96657cf17fc 100644 --- a/nixos/modules/services/backup/rsnapshot.nix +++ b/nixos/modules/services/backup/rsnapshot.nix @@ -43,6 +43,7 @@ in package = mkOption { type = types.package; default = pkgs.rsnapshot; + defaultText = "pkgs.rsnapshot"; example = literalExample "pkgs.rsnapshotGit"; description = '' RSnapshot package to use. diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 3a51e6b7aa6..78776786468 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -5,9 +5,9 @@ with lib; let cfg = config.services.tarsnap; - configFile = cfg: '' - cachedir ${config.services.tarsnap.cachedir} - keyfile ${config.services.tarsnap.keyfile} + configFile = name: cfg: '' + cachedir ${config.services.tarsnap.cachedir}/${name} + keyfile ${cfg.keyfile} ${optionalString cfg.nodump "nodump"} ${optionalString cfg.printStats "print-stats"} ${optionalString cfg.printStats "humanize-numbers"} @@ -41,6 +41,20 @@ in account. Create the keyfile with tarsnap-keygen. + Note that each individual archive (specified below) may also have its + own individual keyfile specified. Tarsnap does not allow multiple + concurrent backups with the same cache directory and key (starting a + new backup will cause another one to fail). If you have multiple + archives specified, you should either spread out your backups to be + far apart, or specify a separate key for each archive. By default + every archive defaults to using + "/root/tarsnap.key". + + It's recommended for backups that you generate a key for every archive + using tarsnap-keygen(1), and then generate a + write-only tarsnap key using tarsnap-keymgmt(1), + and keep your master key(s) for a particular machine off-site. + The keyfile name should be given as a string and not a path, to avoid the key being copied into the Nix store. ''; @@ -57,6 +71,12 @@ in will refuse to run until you manually rebuild the cache with tarsnap --fsck. + Note that each individual archive (specified below) has its own cache + directory specified under cachedir; this is because + tarsnap locks the cache during backups, meaning multiple services + archives cannot be backed up concurrently or overlap with a shared + cache. + Set to null to disable caching. ''; }; @@ -65,6 +85,28 @@ in type = types.attrsOf (types.submodule ( { options = { + keyfile = mkOption { + type = types.str; + default = config.services.tarsnap.keyfile; + description = '' + Set a specific keyfile for this archive. This defaults to + "/root/tarsnap.key" if left unspecified. + + Use this option if you want to run multiple backups + concurrently - each archive must have a unique key. You can + generate a write-only key derived from your master key (which + is recommended) using tarsnap-keymgmt(1). + + Note: every archive must have an individual master key. You + must generate multiple keys with + tarsnap-keygen(1), and then generate write + only keys from those. + + The keyfile name should be given as a string and not a path, to + avoid the key being copied into the Nix store. + ''; + }; + nodump = mkOption { type = types.bool; default = true; @@ -258,6 +300,7 @@ in mkdir -p -m 0700 ${cfg.cachedir} chown root:root ${cfg.cachedir} chmod 0700 ${cfg.cachedir} + mkdir -p -m 0700 ${cfg.cachedir}/$1 DIRS=`cat /etc/tarsnap/$1.dirs` exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS ''; @@ -280,7 +323,7 @@ in environment.etc = (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf" - { text = configFile cfg; + { text = configFile name cfg; }) cfg.archives) // (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs" { text = concatStringsSep " " cfg.directories; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index d571aa3e199..d6ae4b45cee 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -80,6 +80,7 @@ in { packages = mkOption { default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]; + defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = '' Packages to add to PATH for the jenkins process. diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix index 702d452279f..7b1fe6269fe 100644 --- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix +++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix @@ -74,7 +74,7 @@ in { ]; }; } - ]; + ] ''; description = '' Job descriptions for Jenkins Job Builder in Nix format. diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 2b1d07c355e..ae0589b399e 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -38,6 +38,7 @@ in { package = mkOption { type = types.package; default = pkgs.couchdb; + defaultText = "pkgs.couchdb"; example = literalExample "pkgs.couchdb"; description = '' CouchDB package to use. diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index c874b218a5e..b9f66612d4e 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -49,6 +49,7 @@ in package = mkOption { default = pkgs.firebirdSuper; + defaultText = "pkgs.firebirdSuper"; type = types.package; /* Example: package = pkgs.firebirdSuper.override { icu = diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index ccfabc9de0b..629d02209a9 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -44,6 +44,7 @@ in { package = mkOption { type = types.package; default = pkgs.hbase; + defaultText = "pkgs.hbase"; example = literalExample "pkgs.hbase"; description = '' HBase package to use. diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 8d63f14c67b..e2268bd556e 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -120,6 +120,7 @@ in package = mkOption { default = pkgs.influxdb; + defaultText = "pkgs.influxdb"; description = "Which influxdb derivation to use"; type = types.package; }; diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 14ffdad9217..ef9bc46e4a0 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -41,6 +41,7 @@ in package = mkOption { default = pkgs.mongodb; + defaultText = "pkgs.mongodb"; type = types.package; description = " Which MongoDB derivation to use. diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 1413839ce22..41b96068590 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -49,6 +49,7 @@ in { package = mkOption { description = "Neo4j package to use."; default = pkgs.neo4j; + defaultText = "pkgs.neo4j"; type = types.package; }; diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 29bdb201752..6fd901a0055 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -25,22 +25,7 @@ in description = " Whether to enable the ldap server. "; - example = literalExample '' - openldap.enable = true; - openldap.extraConfig = ''' - include ''${pkgs.openldap}/etc/openldap/schema/core.schema - include ''${pkgs.openldap}/etc/openldap/schema/cosine.schema - include ''${pkgs.openldap}/etc/openldap/schema/inetorgperson.schema - include ''${pkgs.openldap}/etc/openldap/schema/nis.schema - - database bdb - suffix dc=example,dc=org - rootdn cn=admin,dc=example,dc=org - # NOTE: change after first start - rootpw secret - directory /var/db/openldap - '''; - ''; + example = true; }; user = mkOption { @@ -67,6 +52,19 @@ in description = " sldapd.conf configuration "; + example = '' + include ''${pkgs.openldap}/etc/openldap/schema/core.schema + include ''${pkgs.openldap}/etc/openldap/schema/cosine.schema + include ''${pkgs.openldap}/etc/openldap/schema/inetorgperson.schema + include ''${pkgs.openldap}/etc/openldap/schema/nis.schema + + database bdb + suffix dc=example,dc=org + rootdn cn=admin,dc=example,dc=org + # NOTE: change after first start + rootpw secret + directory /var/db/openldap + ''; }; }; diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index 0e73d4aca0e..489cdcffe65 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -26,6 +26,7 @@ in { package = mkOption { type = types.package; default = pkgs.opentsdb; + defaultText = "pkgs.opentsdb"; example = literalExample "pkgs.opentsdb"; description = '' OpenTSDB package to use. diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index f2612d0b43b..6323d2c8ce4 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -46,6 +46,7 @@ in package = mkOption { type = types.package; default = pkgs.redis; + defaultText = "pkgs.redis"; description = "Which Redis derivation to use."; }; diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index e3421899d36..48b2b6be09e 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -20,7 +20,7 @@ let } ''; - events = [powerEvent lidEvent acEvent]; + events = [powerEvent lidEvent acEvent muteEvent volumeDownEvent volumeUpEvent cdPlayEvent cdNextEvent cdPrevEvent]; # Called when the power button is pressed. powerEvent = @@ -55,6 +55,61 @@ let ''; }; + muteEvent = { + name = "mute"; + event = "button/mute.*"; + action = '' + #! ${pkgs.bash}/bin/sh + ${config.services.acpid.muteCommands} + ''; + }; + + volumeDownEvent = { + name = "volume-down"; + event = "button/volumedown.*"; + action = '' + #! ${pkgs.bash}/bin/sh + ${config.services.acpid.volumeDownEventCommands} + ''; + }; + + volumeUpEvent = { + name = "volume-up"; + event = "button/volumeup.*"; + action = '' + #! ${pkgs.bash}/bin/sh + ${config.services.acpid.volumeUpEventCommands} + ''; + }; + + cdPlayEvent = { + name = "cd-play"; + event = "cd/play.*"; + action = '' + #! ${pkgs.bash}/bin/sh + ${config.services.acpid.cdPlayEventCommands} + ''; + }; + + cdNextEvent = { + name = "cd-next"; + event = "cd/next.*"; + action = '' + #! ${pkgs.bash}/bin/sh + ${config.services.acpid.cdNextEventCommands} + ''; + }; + + cdPrevEvent = { + name = "cd-prev"; + event = "cd/prev.*"; + action = '' + #! ${pkgs.bash}/bin/sh + ${config.services.acpid.cdPrevEventCommands} + ''; + }; + + in { @@ -89,6 +144,42 @@ in description = "Shell commands to execute on an ac_adapter.* event."; }; + muteCommands = mkOption { + type = types.lines; + default = ""; + description = "Shell commands to execute on an button/mute.* event."; + }; + + volumeDownEventCommands = mkOption { + type = types.lines; + default = ""; + description = "Shell commands to execute on an button/volumedown.* event."; + }; + + volumeUpEventCommands = mkOption { + type = types.lines; + default = ""; + description = "Shell commands to execute on an button/volumeup.* event."; + }; + + cdPlayEventCommands = mkOption { + type = types.lines; + default = ""; + description = "Shell commands to execute on an cd/play.* event."; + }; + + cdNextEventCommands = mkOption { + type = types.lines; + default = ""; + description = "Shell commands to execute on an cd/next.* event."; + }; + + cdPrevEventCommands = mkOption { + type = types.lines; + default = ""; + description = "Shell commands to execute on an cd/prev.* event."; + }; + }; }; diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix index 2be33976606..066ccaa4d7c 100644 --- a/nixos/modules/services/hardware/freefall.nix +++ b/nixos/modules/services/hardware/freefall.nix @@ -21,6 +21,7 @@ in { package = mkOption { type = types.package; default = pkgs.freefall; + defaultText = "pkgs.freefall"; description = '' freefall derivation to use. ''; diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix index 0b6a101efa0..739d76fbf1f 100644 --- a/nixos/modules/services/hardware/upower.nix +++ b/nixos/modules/services/hardware/upower.nix @@ -27,6 +27,7 @@ in package = mkOption { type = types.package; default = pkgs.upower; + defaultText = "pkgs.upower"; example = lib.literalExample "pkgs.upower"; description = '' Which upower package to use. diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 0186452de95..fdd9f0f3e5c 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -13,6 +13,7 @@ in options = { services.logrotate = { enable = mkOption { + type = lib.types.bool; default = false; description = '' Enable the logrotate cron job diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 3a798c6f372..e019e6c3f23 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -33,6 +33,7 @@ in package = mkOption { type = types.package; default = pkgs.logstash; + defaultText = "pkgs.logstash"; example = literalExample "pkgs.logstash"; description = "Logstash package to use."; }; @@ -84,7 +85,7 @@ in type = types.lines; default = ''stdin { type => "example" }''; description = "Logstash input configuration."; - example = literalExample '' + example = '' # Read from journal pipe { command => "''${pkgs.systemd}/bin/journalctl -f -o json" diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index 2bf6d1ff790..21be286a6e9 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -39,6 +39,7 @@ in { package = mkOption { type = types.package; default = pkgs.syslogng; + defaultText = "pkgs.syslogng"; description = '' The package providing syslog-ng binaries. ''; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 7ca4faae5d4..36bdcaca47a 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -90,6 +90,7 @@ in package = mkOption { type = types.package; default = pkgs.dovecot22; + defaultText = "pkgs.dovecot22"; description = "Dovecot package to use."; }; @@ -131,7 +132,7 @@ in modules = mkOption { type = types.listOf types.package; default = []; - example = [ pkgs.dovecot_pigeonhole ]; + example = literalExample "[ pkgs.dovecot_pigeonhole ]"; description = '' Symlinks the contents of lib/dovecot of every given package into /var/lib/dovecot/modules. This will make the given modules available diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index ab6ad390600..6c5d7e92702 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -300,7 +300,7 @@ in }; extraConfig = mkOption { - type = types.str; + type = types.lines; default = ""; description = " Extra lines to be added verbatim to the main.cf configuration file. diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix new file mode 100644 index 00000000000..a6e2a9fc780 --- /dev/null +++ b/nixos/modules/services/mail/rmilter.nix @@ -0,0 +1,189 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + rspamdCfg = config.services.rspamd; + cfg = config.services.rmilter; + + rmilterConf = '' +pidfile = /run/rmilter/rmilter.pid; +bind_socket = ${cfg.bindSocket}; +tempdir = /tmp; + + '' + (with cfg.rspamd; if enable then '' +spamd { + servers = ${concatStringsSep ", " servers}; + connect_timeout = 1s; + results_timeout = 20s; + error_time = 10; + dead_time = 300; + maxerrors = 10; + reject_message = "${rejectMessage}"; + ${optionalString (length whitelist != 0) "whitelist = ${concatStringsSep ", " whitelist};"} + + # rspamd_metric - metric for using with rspamd + # Default: "default" + rspamd_metric = "default"; + ${extraConfig} +}; + '' else "") + cfg.extraConfig; + + rmilterConfigFile = pkgs.writeText "rmilter.conf" rmilterConf; + +in + +{ + + ###### interface + + options = { + + services.rmilter = { + + enable = mkOption { + default = cfg.rspamd.enable; + description = "Whether to run the rmilter daemon."; + }; + + debug = mkOption { + default = false; + description = "Whether to run the rmilter daemon in debug mode."; + }; + + user = mkOption { + type = types.string; + default = "rmilter"; + description = '' + User to use when no root privileges are required. + ''; + }; + + group = mkOption { + type = types.string; + default = "rmilter"; + description = '' + Group to use when no root privileges are required. + ''; + }; + + bindSocket = mkOption { + type = types.string; + default = "unix:/run/rmilter/rmilter.sock"; + description = "Socket to listed for MTA requests"; + example = '' + "unix:/run/rmilter/rmilter.sock" or + "inet:11990@127.0.0.1" + ''; + }; + + rspamd = { + enable = mkOption { + default = rspamdCfg.enable; + description = "Whether to use rspamd to filter mails"; + }; + + servers = mkOption { + type = types.listOf types.str; + default = ["r:0.0.0.0:11333"]; + description = '' + Spamd socket definitions. + Is server name is prefixed with r: it is rspamd server. + ''; + }; + + whitelist = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "list of ips or nets that should be not checked with spamd"; + }; + + rejectMessage = mkOption { + type = types.str; + default = "Spam message rejected; If this is not spam contact abuse"; + description = "reject message for spam"; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Custom snippet to append to end of `spamd' section"; + }; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Custom snippet to append to rmilter config"; + }; + + postfix = { + enable = mkOption { + type = types.bool; + default = false; + description = "Add rmilter to postfix main.conf"; + }; + + configFragment = mkOption { + type = types.str; + description = "Addon to postfix configuration"; + default = '' +smtpd_milters = ${cfg.bindSocket} +# or for TCP socket +# # smtpd_milters = inet:localhost:9900 +milter_protocol = 6 +milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} +# skip mail without checks if milter will die +milter_default_action = accept + ''; + }; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = cfg.user; + description = "rspamd daemon"; + uid = config.ids.uids.rmilter; + group = cfg.group; + }; + + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.rmilter; + }; + + systemd.services.rmilter = { + description = "Rmilter Service"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + Restart = "always"; + }; + + preStart = '' + ${pkgs.coreutils}/bin/mkdir -p /run/rmilter + ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /run/rmilter + ''; + + }; + + services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment; + + }; + +} diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix new file mode 100644 index 00000000000..a083f829324 --- /dev/null +++ b/nixos/modules/services/mail/rspamd.nix @@ -0,0 +1,90 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.rspamd; + +in + +{ + + ###### interface + + options = { + + services.rspamd = { + + enable = mkOption { + default = false; + description = "Whether to run the rspamd daemon."; + }; + + debug = mkOption { + default = false; + description = "Whether to run the rspamd daemon in debug mode."; + }; + + user = mkOption { + type = types.string; + default = "rspamd"; + description = '' + User to use when no root privileges are required. + ''; + }; + + group = mkOption { + type = types.string; + default = "rspamd"; + description = '' + Group to use when no root privileges are required. + ''; + }; + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + # Allow users to run 'rspamc' and 'rspamadm'. + environment.systemPackages = [ pkgs.rspamd ]; + + users.extraUsers = singleton { + name = cfg.user; + description = "rspamd daemon"; + uid = config.ids.uids.rspamd; + group = cfg.group; + }; + + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.spamd; + }; + + systemd.services.rspamd = { + description = "Rspamd Service"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -f"; + RuntimeDirectory = "/var/lib/rspamd"; + PermissionsStartOnly = true; + Restart = "always"; + }; + + preStart = '' + ${pkgs.coreutils}/bin/mkdir -p /var/{lib,log}/rspamd + ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd + ''; + + }; + + }; + +} diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index f6198e03bae..88ce8b5a23f 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -118,9 +118,8 @@ in { package = mkOption { description = "The kafka package to use"; - default = pkgs.apacheKafka; - + defaultText = "pkgs.apacheKafka"; type = types.package; }; diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index b4dae79cf8a..3a95e922820 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -27,8 +27,9 @@ in }; autoMaster = mkOption { + type = types.str; example = literalExample '' - autoMaster = let + let mapConf = pkgs.writeText "auto" ''' kernel -ro,soft,intr ftp.kernel.org:/pub/linux boot -fstype=ext2 :/dev/hda1 diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index 8f25df809cd..868dc87f723 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -41,6 +41,7 @@ in package = mkOption { default = pkgs.cgminer; + defaultText = "pkgs.cgminer"; description = "Which cgminer derivation to use."; type = types.package; }; diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix index 50532a8a16f..c0fbf06e6c4 100644 --- a/nixos/modules/services/misc/confd.nix +++ b/nixos/modules/services/misc/confd.nix @@ -64,6 +64,7 @@ in { package = mkOption { description = "Confd package to use."; default = pkgs.confd; + defaultText = "pkgs.confd"; type = types.package; }; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 469a2a7ce3b..218802e0cf0 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -110,6 +110,7 @@ in // optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; } // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; } // optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; } + // optionalAttrs (config.services.ejabberd.enable) { ejabberdUser = config.services.ejabberd.user; } // optionalAttrs (cfg.publishInfrastructure.enableAuthentication) ( optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = readFile config.services.mysql.rootPassword; }) ) diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index e1839b936f0..b3354e33096 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -77,11 +77,11 @@ in { default = {}; example = literalExample '' { - "CORS": "*", - "NAME": "default-name", - "MAX_RESULT_BUFFER": "1024", - "MAX_CLUSTER_SIZE": "9", - "MAX_RETRY_ATTEMPTS": "3" + "CORS" = "*"; + "NAME" = "default-name"; + "MAX_RESULT_BUFFER" = "1024"; + "MAX_CLUSTER_SIZE" = "9"; + "MAX_RETRY_ATTEMPTS" = "3"; } ''; }; diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix index 08a8581711f..d6ad9dcaebc 100644 --- a/nixos/modules/services/misc/felix.nix +++ b/nixos/modules/services/misc/felix.nix @@ -23,7 +23,9 @@ in }; bundles = mkOption { + type = types.listOf types.package; default = [ pkgs.felix_remoteshell ]; + defaultText = "[ pkgs.felix_remoteshell ]"; description = "List of bundles that should be activated on startup"; }; diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index befd8c628f1..ab4d385ba16 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -35,6 +35,7 @@ let }; haskellPackages = mkOption { + type = types.attrsOf types.package; default = pkgs.haskellPackages; defaultText = "pkgs.haskellPackages"; example = literalExample "pkgs.haskell.packages.ghc784"; diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 13c41466eab..1927922909e 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -22,6 +22,7 @@ in }; haskellPackages = mkOption { + type = types.attrsOf types.package; default = pkgs.haskellPackages; defaultText = "pkgs.haskellPackages"; example = literalExample "pkgs.haskell.packages.ghc784"; diff --git a/nixos/modules/services/misc/matrix-synapse-log_config.yaml b/nixos/modules/services/misc/matrix-synapse-log_config.yaml new file mode 100644 index 00000000000..d85bdd1208f --- /dev/null +++ b/nixos/modules/services/misc/matrix-synapse-log_config.yaml @@ -0,0 +1,25 @@ +version: 1 + +# In systemd's journal, loglevel is implicitly stored, so let's omit it +# from the message text. +formatters: + journal_fmt: + format: '%(name)s: [%(request)s] %(message)s' + +filters: + context: + (): synapse.util.logcontext.LoggingContextFilter + request: "" + +handlers: + journal: + class: systemd.journal.JournalHandler + formatter: journal_fmt + filters: [context] + SYSLOG_IDENTIFIER: synapse + +root: + level: INFO + handlers: [journal] + +disable_existing_loggers: False diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix new file mode 100644 index 00000000000..27c5a38e6b8 --- /dev/null +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -0,0 +1,279 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.matrix-synapse; + logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; + configFile = pkgs.writeText "homeserver.yaml" '' +tls_certificate_path: "${cfg.tls_certificate_path}" +tls_private_key_path: "${cfg.tls_private_key_path}" +tls_dh_params_path: "${cfg.tls_dh_params_path}" +no_tls: ${if cfg.no_tls then "true" else "false"} +bind_port: ${toString cfg.bind_port} +unsecure_port: ${toString cfg.unsecure_port} +bind_host: "${cfg.bind_host}" +server_name: "${cfg.server_name}" +pid_file: "/var/run/matrix-synapse.pid" +web_client: ${if cfg.web_client then "true" else "false"} +database: { + name: "${cfg.database_type}", + args: { + ${concatStringsSep ",\n " ( + mapAttrsToList (n: v: "\"${n}\": ${v}") cfg.database_args + )} + } +} +log_file: "/var/log/matrix-synapse/homeserver.log" +log_config: "${logConfigFile}" +media_store_path: "/var/lib/matrix-synapse/media" +recaptcha_private_key: "${cfg.recaptcha_private_key}" +recaptcha_public_key: "${cfg.recaptcha_public_key}" +enable_registration_captcha: ${if cfg.enable_registration_captcha then "true" else "false"} +turn_uris: ${if (length cfg.turn_uris) == 0 then "[]" else ("\n" + (concatStringsSep "\n" (map (s: "- " + s) cfg.turn_uris)))} +turn_shared_secret: "${cfg.turn_shared_secret}" +enable_registration: ${if cfg.enable_registration then "true" else "false"} +${optionalString (cfg.registration_shared_secret != "") '' +registration_shared_secret: "${cfg.registration_shared_secret}" +''} +enable_metrics: ${if cfg.enable_metrics then "true" else "false"} +report_stats: ${if cfg.report_stats then "true" else "false"} +signing_key_path: "/var/lib/matrix-synapse/homeserver.signing.key" +perspectives: + servers: { + ${concatStringsSep "},\n" (mapAttrsToList (n: v: '' + "${n}": { + "verify_keys": { + ${concatStringsSep "},\n" (mapAttrsToList (n: v: '' + "${n}": { + "key": "${v}" + }'') v)} + } + '') cfg.servers)} + } + } +${cfg.extraConfig} +''; +in { + options = { + services.matrix-synapse = { + enable = mkEnableOption "matrix.org synapse"; + package = mkOption { + type = types.package; + default = pkgs.matrix-synapse; + description = '' + Overridable attribute of the matrix synapse server package to use. + ''; + }; + no_tls = mkOption { + type = types.bool; + default = false; + description = '' + Don't bind to the https port + ''; + }; + tls_certificate_path = mkOption { + type = types.path; + default = "/var/lib/matrix-synapse/homeserver.tls.crt"; + description = '' + PEM encoded X509 certificate for TLS + ''; + }; + tls_private_key_path = mkOption { + type = types.path; + default = "/var/lib/matrix-synapse/homeserver.tls.key"; + description = '' + PEM encoded private key for TLS + ''; + }; + tls_dh_params_path = mkOption { + type = types.path; + default = "/var/lib/matrix-synapse/homeserver.tls.dh"; + description = '' + PEM dh parameters for ephemeral keys + ''; + }; + bind_port = mkOption { + type = types.int; + default = 8448; + description = '' + The port to listen for HTTPS requests on. + For when matrix traffic is sent directly to synapse. + ''; + }; + unsecure_port = mkOption { + type = types.int; + default = 8008; + description = '' + The port to listen for HTTP requests on. + For when matrix traffic passes through loadbalancer that unwraps TLS. + ''; + }; + bind_host = mkOption { + type = types.str; + default = ""; + description = '' + Local interface to listen on. + The empty string will cause synapse to listen on all interfaces. + ''; + }; + server_name = mkOption { + type = types.str; + description = '' + The domain name of the server, with optional explicit port. + This is used by remote servers to connect to this server, + e.g. matrix.org, localhost:8080, etc. + This is also the last part of your UserID. + ''; + }; + web_client = mkOption { + type = types.bool; + default = false; + description = '' + Whether to serve a web client from the HTTP/HTTPS root resource. + ''; + }; + database_type = mkOption { + type = types.enum [ "sqlite3" "psycopg2" ]; + default = "sqlite3"; + description = '' + The database engine name. Can be sqlite or psycopg2. + ''; + }; + database_args = mkOption { + type = types.attrs; + default = { + database = "/var/lib/matrix-synapse/homeserver.db"; + }; + description = '' + Arguments to pass to the engine. + ''; + }; + recaptcha_private_key = mkOption { + type = types.str; + default = ""; + description = '' + This Home Server's ReCAPTCHA private key. + ''; + }; + recaptcha_public_key = mkOption { + type = types.str; + default = ""; + description = '' + This Home Server's ReCAPTCHA public key. + ''; + }; + enable_registration_captcha = mkOption { + type = types.bool; + default = false; + description = '' + Enables ReCaptcha checks when registering, preventing signup + unless a captcha is answered. Requires a valid ReCaptcha + public/private key. + ''; + }; + turn_uris = mkOption { + type = types.listOf types.str; + default = []; + description = '' + The public URIs of the TURN server to give to clients + ''; + }; + turn_shared_secret = mkOption { + type = types.str; + default = ""; + description = '' + The shared secret used to compute passwords for the TURN server + ''; + }; + enable_registration = mkOption { + type = types.bool; + default = false; + description = '' + Enable registration for new users. + ''; + }; + registration_shared_secret = mkOption { + type = types.str; + default = ""; + description = '' + If set, allows registration by anyone who also has the shared + secret, even if registration is otherwise disabled. + ''; + }; + enable_metrics = mkOption { + type = types.bool; + default = false; + description = '' + Enable collection and rendering of performance metrics + ''; + }; + report_stats = mkOption { + type = types.bool; + default = false; + description = '' + ''; + }; + servers = mkOption { + type = types.attrs; + default = { + "matrix.org" = { + "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; + }; + }; + description = '' + The trusted servers to download signing keys from. + ''; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra config options for matrix-synapse. + ''; + }; + logConfig = mkOption { + type = types.lines; + default = readFile ./matrix-synapse-log_config.yaml; + description = '' + A yaml python logging config file + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers = [ + { name = "matrix-synapse"; + group = "matrix-synapse"; + home = "/var/lib/matrix-synapse"; + createHome = true; + shell = "${pkgs.bash}/bin/bash"; + uid = config.ids.uids.matrix-synapse; + } ]; + + users.extraGroups = [ + { name = "matrix-synapse"; + gid = config.ids.gids.matrix-synapse; + } ]; + + systemd.services.matrix-synapse = { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -p /var/lib/matrix-synapse + chmod 700 /var/lib/matrix-synapse + chown -R matrix-synapse:matrix-synapse /var/lib/matrix-synapse + ${cfg.package}/bin/homeserver --config-path ${configFile} --generate-keys + ''; + serviceConfig = { + Type = "simple"; + User = "matrix-synapse"; + Group = "matrix-synapse"; + WorkingDirectory = "/var/lib/matrix-synapse"; + PermissionsStartOnly = true; + ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile}"; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix index 3fb5f684b76..972d8b572d3 100644 --- a/nixos/modules/services/misc/mbpfan.nix +++ b/nixos/modules/services/misc/mbpfan.nix @@ -17,7 +17,9 @@ in { }; package = mkOption { + type = types.package; default = pkgs.mbpfan; + defaultText = "pkgs.mbpfan"; description = '' The package used for the mbpfan daemon. ''; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4aed91c3497..da03eb17e30 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -66,6 +66,7 @@ in package = mkOption { type = types.package; default = pkgs.nix; + defaultText = "pkgs.nix"; description = '' This option specifies the Nix package instance to use throughout the system. ''; diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index b9a58c0c5d5..fb62351365e 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -75,7 +75,7 @@ in preStart = '' test -d "${cfg.dataDir}" || { echo "Creating initial Plex data directory in \"${cfg.dataDir}\"." - mkdir -p "${cfg.dataDir}" + mkdir -p "${cfg.dataDir}/Plex Media Server" chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}" } diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index d940c1bc900..c6b67e8498c 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -208,6 +208,7 @@ in description = "Which rippled package to use."; type = types.package; default = pkgs.rippled; + defaultText = "pkgs.rippled"; }; ports = mkOption { @@ -238,7 +239,7 @@ in nodeDb = mkOption { description = "Rippled main database options."; type = types.nullOr types.optionSet; - options = [dbOptions]; + options = dbOptions; default = { type = "rocksdb"; extraOpts = '' @@ -254,14 +255,14 @@ in tempDb = mkOption { description = "Rippled temporary database options."; type = types.nullOr types.optionSet; - options = [dbOptions]; + options = dbOptions; default = null; }; importDb = mkOption { description = "Settings for performing a one-time import."; type = types.nullOr types.optionSet; - options = [dbOptions]; + options = dbOptions; default = null; }; diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 214a19d9483..46273fc1218 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -33,6 +33,7 @@ in { package = mkOption { type = types.package; default = pkgs.bosun; + defaultText = "pkgs.bosun"; example = literalExample "pkgs.bosun"; description = '' bosun binary to use. diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 6053990e8d3..0b49038dd27 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -93,6 +93,7 @@ in { package = mkOption { description = "Package to use."; default = pkgs.grafana; + defaultText = "pkgs.grafana"; type = types.package; }; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 731e5fae9e9..976fd253a7c 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -108,7 +108,7 @@ in { finders = mkOption { description = "List of finder plugins to load."; default = []; - example = [ pkgs.python27Packages.graphite_influxdb ]; + example = literalExample "[ pkgs.python27Packages.graphite_influxdb ]"; type = types.listOf types.package; }; @@ -136,6 +136,7 @@ in { package = mkOption { description = "Package to use for graphite api."; default = pkgs.python27Packages.graphite_api; + defaultText = "pkgs.python27Packages.graphite_api"; type = types.package; }; @@ -146,7 +147,7 @@ in { directories: - ${dataDir}/whisper ''; - example = literalExample '' + example = '' allowed_origins: - dashboard.example.com cheat_times: true @@ -350,7 +351,7 @@ in { critical: 200 name: Test ''; - example = literalExample '' + example = '' pushbullet_key: pushbullet_api_key alerts: - target: stats.seatgeek.app.deal_quality.venue_info_cache.hit diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix index 74b8c9ccd3e..deee64aa41e 100644 --- a/nixos/modules/services/monitoring/heapster.nix +++ b/nixos/modules/services/monitoring/heapster.nix @@ -33,6 +33,7 @@ in { package = mkOption { description = "Package to use by heapster"; default = pkgs.heapster; + defaultText = "pkgs.heapster"; type = types.package; }; }; diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 31afa859e25..aaa041ad4cd 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -122,21 +122,6 @@ in HTML output is in /var/www/munin/, configure your favourite webserver to serve static files. ''; - example = literalExample '' - services = { - munin-node.enable = true; - munin-cron = { - enable = true; - hosts = ''' - [''${config.networking.hostName}] - address localhost - '''; - extraGlobalConfig = ''' - contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com - '''; - }; - }; - ''; }; extraGlobalConfig = mkOption { @@ -147,6 +132,9 @@ in Useful to setup notifications, see ''; + example = '' + contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com + ''; }; hosts = mkOption { diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index c1f7ba0eca7..f2f7710de9e 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -94,7 +94,9 @@ in }; plugins = mkOption { + type = types.listOf types.package; default = [pkgs.nagiosPluginsOfficial pkgs.ssmtp]; + defaultText = "[pkgs.nagiosPluginsOfficial pkgs.ssmtp]"; description = " Packages to be added to the Nagios PATH. Typically used to add plugins, but can be anything. @@ -102,14 +104,18 @@ in }; mainConfigFile = mkOption { + type = types.package; default = nagiosCfgFile; + defaultText = "nagiosCfgFile"; description = " Derivation for the main configuration file of Nagios. "; }; cgiConfigFile = mkOption { + type = types.package; default = nagiosCGICfgFile; + defaultText = "nagiosCGICfgFile"; description = " Derivation for the configuration file of Nagios CGI scripts that can be used in web servers for running the Nagios web interface. diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 8b97daf8881..1e397435e60 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -43,6 +43,7 @@ in { package = mkOption { type = types.package; default = pkgs.scollector; + defaultText = "pkgs.scollector"; example = literalExample "pkgs.scollector"; description = '' scollector binary to use. @@ -77,7 +78,7 @@ in { collectors = mkOption { type = with types; attrsOf (listOf path); default = {}; - example = literalExample "{ 0 = [ \"\${postgresStats}/bin/collect-stats\" ]; }"; + example = literalExample "{ \"0\" = [ \"\${postgresStats}/bin/collect-stats\" ]; }"; description = '' An attribute set mapping the frequency of collection to a list of binaries that should be executed at that frequency. You can use "0" diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 72e9b6144d4..576e5c9e87a 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -85,7 +85,8 @@ in package = mkOption { type = types.package; default = pkgs.samba; - example = pkgs.samba4; + defaultText = "pkgs.samba"; + example = literalExample "pkgs.samba4"; description = '' Defines which package should be used for the samba server. ''; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index dc11524ffeb..b9e0eecf417 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -120,7 +120,9 @@ in }; configFile = mkOption { + type = types.path; default = confFile; + defaultText = "confFile"; description = " Overridable config file to use for named. By default, that generated by nixos. diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 7337eb873c7..58dad56014b 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -118,6 +118,7 @@ in package = mkOption { description = "Package to use for consul-alerts."; default = pkgs.consul-alerts; + defaultText = "pkgs.consul-alerts"; type = types.package; }; diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index a61f0250ef8..e11fe072be6 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -421,8 +421,9 @@ in }; networking.firewall.extraPackages = mkOption { + type = types.listOf types.package; default = [ ]; - example = [ pkgs.ipset ]; + example = literalExample "[ pkgs.ipset ]"; description = '' Additional packages to be included in the environment of the system diff --git a/nixos/modules/services/networking/lambdabot.nix b/nixos/modules/services/networking/lambdabot.nix index 4ef7c7c9ab6..5a61a9f9678 100644 --- a/nixos/modules/services/networking/lambdabot.nix +++ b/nixos/modules/services/networking/lambdabot.nix @@ -27,6 +27,7 @@ in package = mkOption { type = types.package; default = pkgs.lambdabot; + defaultText = "pkgs.lambdabot"; description = "Used lambdabot package"; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 8ab4cfcc114..01c05fb4a24 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -110,7 +110,7 @@ in { # Ugly hack for using the correct gnome3 packageSet basePackages = mkOption { - type = types.attrsOf types.path; + type = types.attrsOf types.package; default = { inherit networkmanager modemmanager wpa_supplicant networkmanager_openvpn networkmanager_vpnc networkmanager_openconnect diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix index 49e5f355980..6a5290ffdee 100644 --- a/nixos/modules/services/networking/ngircd.nix +++ b/nixos/modules/services/networking/ngircd.nix @@ -34,6 +34,7 @@ in { type = types.package; default = pkgs.ngircd; + defaultText = "pkgs.ngircd"; }; }; }; diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix index f5eb452fec6..39ebaa45a79 100644 --- a/nixos/modules/services/networking/skydns.nix +++ b/nixos/modules/services/networking/skydns.nix @@ -56,6 +56,7 @@ in { package = mkOption { default = pkgs.skydns; + defaultText = "pkgs.skydns"; type = types.package; description = "Skydns package to use."; }; diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index 502a0468787..16c4ee7e33b 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -115,7 +115,7 @@ in path = mkOption { type = types.path; - example = "/etc/wpa_supplicant.conf"; + example = literalExample "/etc/wpa_supplicant.conf"; description = '' External wpa_supplicant.conf configuration file. The configuration options defined declaratively within networking.supplicant have diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 56c384731c6..f5d5e1d2556 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -43,6 +43,7 @@ in package = mkOption { type = types.package; default = pkgs.syncthing; + defaultText = "pkgs.syncthing"; example = literalExample "pkgs.syncthing"; description = '' Syncthing package to use. diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 828bbe130e6..34f4f6b37b6 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -87,7 +87,9 @@ in }; package = mkOption { + type = types.package; default = pkgs.tinc_pre; + defaultText = "pkgs.tinc_pre"; description = '' The package to use for the tinc daemon's binary. ''; diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 447149552f4..e7301e9ef5f 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -120,7 +120,9 @@ in }; userlistFile = mkOption { + type = types.path; default = pkgs.writeText "userlist" (concatMapStrings (x: "${x}\n") cfg.userlist); + defaultText = "pkgs.writeText \"userlist\" (concatMapStrings (x: \"\${x}\n\") cfg.userlist)"; description = '' Newline separated list of names to be allowed/denied if is true. Meaning see . diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index b3f0a5251d7..ea0cf1dcd78 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -40,6 +40,7 @@ in { package = mkOption { description = "Elasticsearch package to use."; default = pkgs.elasticsearch; + defaultText = "pkgs.elasticsearch"; type = types.package; }; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index f9071ef66e7..4263ed22a8d 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -127,6 +127,7 @@ in { package = mkOption { description = "Kibana package to use"; default = pkgs.kibana; + defaultText = "pkgs.kibana"; type = types.package; }; diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix index 7886d1e2e8e..33d74e89723 100644 --- a/nixos/modules/services/search/solr.nix +++ b/nixos/modules/services/search/solr.nix @@ -45,6 +45,7 @@ in { javaPackage = mkOption { type = types.package; default = pkgs.jre; + defaultText = "pkgs.jre"; description = '' Which Java derivation to use for running solr. ''; @@ -53,6 +54,7 @@ in { solrPackage = mkOption { type = types.package; default = pkgs.solr; + defaultText = "pkgs.solr"; description = '' Which solr derivation to use for running solr. ''; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 7350a6a68c7..739181d861b 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -429,6 +429,7 @@ in package = mkOption { type = types.package; default = pkgs.apacheHttpd; + defaultText = "pkgs.apacheHttpd"; description = '' Overridable attribute of the Apache HTTP Server package to use. ''; @@ -437,7 +438,8 @@ in configFile = mkOption { type = types.path; default = confFile; - example = literalExample ''pkgs.writeText "httpd.conf" "# my custom config file ...";''; + defaultText = "confFile"; + example = literalExample ''pkgs.writeText "httpd.conf" "# my custom config file ..."''; description = '' Override the configuration file used by Apache. By default, NixOS generates one automatically. diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 25816446e99..27a33f33ff9 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -34,6 +34,7 @@ in package = mkOption { default = pkgs.nginx; + defaultText = "pkgs.nginx"; type = types.package; description = " Nginx package to use. diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix index 82398948bfa..bdd41ed702b 100644 --- a/nixos/modules/services/web-servers/phpfpm.nix +++ b/nixos/modules/services/web-servers/phpfpm.nix @@ -36,7 +36,9 @@ in { }; phpPackage = mkOption { + type = types.package; default = pkgs.php; + defaultText = "pkgs.php"; description = '' The PHP package to use for running the FPM service. ''; diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 6abd6dfb306..c3be20b41e2 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -24,6 +24,7 @@ in package = mkOption { type = types.package; default = pkgs.tomcat7; + defaultText = "pkgs.tomcat7"; example = lib.literalExample "pkgs.tomcat8"; description = '' Which tomcat package to use. @@ -72,7 +73,9 @@ in }; webapps = mkOption { + type = types.listOf types.package; default = [ tomcat ]; + defaultText = "[ tomcat ]"; description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; @@ -87,7 +90,9 @@ in }; jdk = mkOption { + type = types.package; default = pkgs.jdk; + defaultText = "pkgs.jdk"; description = "Which JDK to use."; }; diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix index eed16a64f2a..6dab467b35e 100644 --- a/nixos/modules/services/web-servers/winstone.nix +++ b/nixos/modules/services/web-servers/winstone.nix @@ -31,6 +31,7 @@ let javaPackage = mkOption { type = types.package; default = pkgs.jre; + defaultText = "pkgs.jre"; description = '' Which Java derivation to use for running Winstone. ''; diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index bbe4d10f83d..ef3cffd582e 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -75,25 +75,26 @@ in services.zope2.instances = mkOption { default = {}; type = types.loaOf types.optionSet; - example = { - plone01 = { - http_address = "127.0.0.1:8080"; - extra = - '' - - mount-point / - cache-size 30000 - - blob-dir /var/lib/zope2/plone01/blobstorage - - path /var/lib/zope2/plone01/filestorage/Data.fs - - - - ''; - - }; - }; + example = literalExample '' + { + plone01 = { + http_address = "127.0.0.1:8080"; + extra = + ''' + + mount-point / + cache-size 30000 + + blob-dir /var/lib/zope2/plone01/blobstorage + + path /var/lib/zope2/plone01/filestorage/Data.fs + + + + '''; + }; + } + ''; description = "zope2 instances to be created automaticaly by the system."; options = [ zope2Opts ]; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index c1e14e45d75..be2411b3c7f 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -62,6 +62,7 @@ in { }; environment.gnome3.packageSet = mkOption { + type = types.nullOr types.package; default = null; example = literalExample "pkgs.gnome3_16"; description = "Which GNOME 3 package set to use."; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 21b6243ba18..29cca248cde 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -66,6 +66,7 @@ in kdeWorkspacePackage = mkOption { internal = true; default = pkgs.kde4.kde_workspace; + defaultText = "pkgs.kde4.kde_workspace"; type = types.package; description = "Custom kde-workspace, used for NixOS rebranding."; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index ebcceabc785..f5b6c20c5a0 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -67,8 +67,9 @@ in theme = { package = mkOption { - type = types.path; + type = types.package; default = pkgs.gnome3.gnome_themes_standard; + defaultText = "pkgs.gnome3.gnome_themes_standard"; description = '' The package path that contains the theme given in the name option. ''; @@ -87,8 +88,9 @@ in iconTheme = { package = mkOption { - type = types.path; + type = types.package; default = pkgs.gnome3.defaultIconTheme; + defaultText = "pkgs.gnome3.defaultIconTheme"; description = '' The package path that contains the icon theme given in the name option. ''; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index ded694d90d5..9460395f86d 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -69,7 +69,7 @@ in greeter = { package = mkOption { - type = types.path; + type = types.package; description = '' The LightDM greeter to login via. The package should be a directory containing a .desktop file matching the name in the 'name' option. @@ -86,6 +86,7 @@ in }; background = mkOption { + type = types.path; description = '' The background image or color to use. ''; diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index e3db0230d3b..ce44c9f54a3 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -61,6 +61,10 @@ in url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz"; sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8"; }; + defaultText = ''pkgs.fetchurl { + url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz"; + sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8"; + }''; example = literalExample '' pkgs.fetchurl { url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz"; diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 6614be261e5..4318a17a4fa 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -76,6 +76,7 @@ in { package = mkOption { type = types.package; default = pkgs.redshift; + defaultText = "pkgs.redshift"; description = '' redshift derivation to use. ''; diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index a036e085b0b..4d5dbd60415 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -9,19 +9,6 @@ with lib; -let - - # Wrap Xvfb to set some flags/variables. - xvfbWrapper = pkgs.writeScriptBin "Xvfb" - '' - #! ${pkgs.stdenv.shell} - export XKB_BINDIR=${pkgs.xorg.xkbcomp}/bin - export XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri - exec ${pkgs.xorg.xorgserver}/bin/Xvfb "$@" -xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb - ''; - -in - { config = { @@ -54,7 +41,7 @@ in { description = "Terminal Server"; path = - [ xvfbWrapper pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth + [ pkgs.xorgserver pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash ]; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 1c242c88863..d66580b7b9b 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -205,7 +205,7 @@ in system.replaceRuntimeDependencies = mkOption { default = []; - example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { ... }; }) ]"; + example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]"; type = types.listOf (types.submodule ( { options, ... }: { options.original = mkOption { diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index bef18fc8771..6bc046d0261 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -63,7 +63,7 @@ in }; boot.extraModulePackages = mkOption { - type = types.listOf types.path; + type = types.listOf types.package; default = []; example = literalExample "[ pkgs.linuxPackages.nvidia_x11 ]"; description = "A list of additional packages supplying kernel modules."; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index c2bf5764804..d9f6f51f13a 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -251,6 +251,7 @@ in }; extraFiles = mkOption { + type = types.attrsOf types.path; default = {}; example = literalExample '' { "memtest.bin" = "''${pkgs.memtest86plus}/memtest.bin"; } diff --git a/nixos/modules/system/boot/loader/grub/ipxe.nix b/nixos/modules/system/boot/loader/grub/ipxe.nix index 9b5097a4cfd..249c2761934 100644 --- a/nixos/modules/system/boot/loader/grub/ipxe.nix +++ b/nixos/modules/system/boot/loader/grub/ipxe.nix @@ -39,7 +39,7 @@ in dhcp chain http://boot.ipxe.org/demo/boot.php '''; - }; + } ''; }; }; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 76370320563..59bff5472e8 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -229,7 +229,7 @@ in boot.initrd.luks.devices = mkOption { default = [ ]; - example = [ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ]; + example = literalExample ''[ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ]''; description = '' The list of devices that should be decrypted using LUKS before trying to mount the root partition. This works for both LVM-over-LUKS and LUKS-over-LVM setups. diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 0fc8491cdf8..211e0423216 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -374,6 +374,7 @@ in systemd.package = mkOption { default = pkgs.systemd; + defaultText = "pkgs.systemd"; type = types.package; description = "The systemd package."; }; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index e36e9f85f1e..e1574fa68ad 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -5,13 +5,13 @@ with lib; let makeColor = n: value: "COLOR_${toString n}=${value}"; + colors = concatImapStringsSep "\n" makeColor config.i18n.consoleColors; - vconsoleConf = pkgs.writeText "vconsole.conf" - '' - KEYMAP=${config.i18n.consoleKeyMap} - FONT=${config.i18n.consoleFont} - '' + concatImapStringsSep "\n" makeColor config.i18n.consoleColors; - + vconsoleConf = pkgs.writeText "vconsole.conf" '' + KEYMAP=${config.i18n.consoleKeyMap} + FONT=${config.i18n.consoleFont} + ${colors} + ''; in { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index ee21d735f95..e72c0f8956e 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -355,6 +355,7 @@ in }; networking.nameservers = mkOption { + type = types.listOf types.str; default = []; example = ["130.161.158.4" "130.161.33.17"]; description = '' @@ -390,6 +391,7 @@ in }; networking.localCommands = mkOption { + type = types.str; default = ""; example = "text=anything; echo You can put $text here."; description = '' diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 3668d17ac89..67fbb8263b0 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -122,18 +122,14 @@ in chmod 755 /var/lib/libvirt chmod 755 /var/lib/libvirt/dnsmasq - # Libvirt unfortunately writes mutable state (such as - # runtime changes to VM, network or filter configurations) - # to /etc. So we can't use environment.etc to make the - # default network and filter definitions available, since - # libvirt will then modify the originals in the Nix store. - # So here we copy them instead. Ugly. - for i in $(cd ${pkgs.libvirt}/etc && echo \ + # Copy default libvirt network config .xml files to /var/lib + # Files modified by the user will not be overwritten + for i in $(cd ${pkgs.libvirt}/var/lib && echo \ libvirt/qemu/networks/*.xml libvirt/qemu/networks/autostart/*.xml \ libvirt/nwfilter/*.xml ); do - mkdir -p /etc/$(dirname $i) -m 755 - cp -fpd ${pkgs.libvirt}/etc/$i /etc/$i + mkdir -p /var/lib/$(dirname $i) -m 755 + cp -npd ${pkgs.libvirt}/var/lib/$i /var/lib/$i done # libvirtd puts the full path of the emulator binary in the machine diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index a0231315236..4218a3840fc 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -31,6 +31,7 @@ in { package = mkOption { type = types.package; default = pkgs.openvswitch; + defaultText = "pkgs.openvswitch"; description = '' Open vSwitch package to use. ''; diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index d42f7471c83..b8a632c6e14 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -10,6 +10,13 @@ let }); }; + # Only allow the demo data to be used (only if it's unfreeRedistributable). + unfreePredicate = pkg: with pkgs.lib; let + allowDrvPredicates = [ "quake3-demo" "quake3-pointrelease" ]; + allowLicenses = [ pkgs.lib.licenses.unfreeRedistributable ]; + in any (flip hasPrefix pkg.name) allowDrvPredicates && + elem (pkg.meta.license or null) allowLicenses; + in rec { @@ -28,6 +35,7 @@ rec { hardware.opengl.driSupport = true; environment.systemPackages = [ pkgs.quake3demo ]; nixpkgs.config.packageOverrides = overrides; + nixpkgs.config.allowUnfreePredicate = unfreePredicate; }; nodes = @@ -37,10 +45,11 @@ rec { { systemd.services."quake3-server" = { wantedBy = [ "multi-user.target" ]; script = - "${pkgs.quake3demo}/bin/quake3-server '+set g_gametype 0' " + - "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log"; + "${pkgs.quake3demo}/bin/quake3-server +set g_gametype 0 " + + "+map q3dm7 +addbot grunt +addbot daemia 2> /tmp/log"; }; nixpkgs.config.packageOverrides = overrides; + nixpkgs.config.allowUnfreePredicate = unfreePredicate; networking.firewall.allowedUDPPorts = [ 27960 ]; }; @@ -56,8 +65,8 @@ rec { $client1->waitForX; $client2->waitForX; - $client1->execute("quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &"); - $client2->execute("quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &"); + $client1->execute("quake3 +set r_fullscreen 0 +set name Foo +connect server &"); + $client2->execute("quake3 +set r_fullscreen 0 +set name Bar +connect server &"); $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log"); $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log"); diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 8b15fea8b86..627d68525b9 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, - libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, + libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ }: @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; sha256 = "15c5ff7ac1c0b19b08f4bdcb0f4988743da2f9ed3fab41d6f07600e67cb9ddb6"; }; + patches = [(fetchpatch { + name = "new-ffmpeg.patch"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk" + + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692"; + sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf"; + })]; preConfigure = /* we prefer system-wide libs */ '' mv lib-src lib-src-rm diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 81c2ee59bc5..cdfbf2f2b4c 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl_1_0_1, freetype +{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl_1_0_1, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf -, libgcrypt, chromium, udev, fontconfig -, dbus, expat, ffmpeg_0_10 }: +, libgcrypt, udev, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }: assert stdenv.system == "x86_64-linux"; let - version = "0.9.17.1.g9b85d43.7"; + version = "1.0.19.106.gb8a7150f"; deps = [ alsaLib atk cairo cups + curl dbus expat ffmpeg_0_10 @@ -26,19 +26,20 @@ let libpng nss pango - qt4 stdenv.cc.cc udev xorg.libX11 xorg.libXcomposite + xorg.libXcursor xorg.libXdamage xorg.libXext xorg.libXfixes xorg.libXi xorg.libXrandr xorg.libXrender - xorg.libXrender xorg.libXScrnSaver + xorg.libXtst + zlib ]; in @@ -48,8 +49,8 @@ stdenv.mkDerivation { src = fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb"; - sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki"; + url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; + sha256 = "be6b99329bb2fccdc9d77bc949dd463576fdb40db7f56195b4284bd348c470be"; }; buildInputs = [ dpkg makeWrapper ]; @@ -61,8 +62,8 @@ stdenv.mkDerivation { libdir=$out/lib/spotify mkdir -p $libdir dpkg-deb -x $src $out - mv $out/opt/spotify/* $out/ - rm -rf $out/usr $out/opt + mv $out/usr/* $out/ + rm -rf $out/usr # Work around Spotify referring to a specific minor version of # OpenSSL. @@ -72,33 +73,22 @@ stdenv.mkDerivation { ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so - mkdir -p $out/bin - - rpath="$out/spotify-client/Data:$libdir:$out/spotify-client:${stdenv.cc.cc}/lib64" - - ln -s $out/spotify-client/spotify $out/bin/spotify + rpath="$out/share/spotify:$libdir" patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $rpath $out/spotify-client/spotify + --set-rpath $rpath $out/share/spotify/spotify - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $rpath $out/spotify-client/Data/SpotifyHelper - - preload=$out/libexec/spotify/libpreload.so librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" - mkdir -p $out/libexec/spotify - gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC - - wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "$librarypath" - wrapProgram $out/spotify-client/Data/SpotifyHelper --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "$librarypath" + wrapProgram $out/share/spotify/spotify \ + --prefix LD_LIBRARY_PATH : "$librarypath" \ + --prefix PATH : "${gnome.zenity}/bin" # Desktop file mkdir -p "$out/share/applications/" - cp "$out/spotify-client/spotify.desktop" "$out/share/applications/" - sed -i "s|Icon=.*|Icon=$out/spotify-client/Icons/spotify-linux-512.png|" "$out/share/applications/spotify.desktop" - ''; # */ + cp "$out/share/spotify/spotify.desktop" "$out/share/applications/" + sed -i "s|Icon=.*|Icon=$out/share/spotify/Icons/spotify-linux-512.png|" "$out/share/applications/spotify.desktop" + ''; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/applications/audio/spotify/preload.c b/pkgs/applications/audio/spotify/preload.c deleted file mode 100644 index 42d482c21e4..00000000000 --- a/pkgs/applications/audio/spotify/preload.c +++ /dev/null @@ -1,66 +0,0 @@ -/* Spotify looks for its theme data in /usr/share/spotify/theme. This - LD_PRELOAD library intercepts open() and stat() calls to redirect - them to the corresponding location in $out. */ - -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include - -char themeDir [] = "/usr/share/spotify/theme"; -char realThemeDir [] = OUT "/share/spotify/theme"; - -const char * rewrite(const char * path, char * buf) -{ - if (strncmp(path, themeDir, sizeof(themeDir) - 1) != 0) return path; - if (snprintf(buf, PATH_MAX, "%s%s", realThemeDir, path + sizeof(themeDir) - 1) >= PATH_MAX) - abort(); - return buf; -} - -int open(const char *path, int flags, ...) -{ - char buf[PATH_MAX]; - int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open"); - mode_t mode = 0; - if (flags & O_CREAT) { - va_list ap; - va_start(ap, flags); - mode = va_arg(ap, mode_t); - va_end(ap); - } - return _open(rewrite(path, buf), flags, mode); -} - -int open64(const char *path, int flags, ...) -{ - char buf[PATH_MAX]; - int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64"); - mode_t mode = 0; - if (flags & O_CREAT) { - va_list ap; - va_start(ap, flags); - mode = va_arg(ap, mode_t); - va_end(ap); - } - return _open64(rewrite(path, buf), flags, mode); -} - -int __xstat64(int ver, const char *path, struct stat64 *st) -{ - char buf[PATH_MAX]; - int (*___xstat64) (int ver, const char *, struct stat64 *) = dlsym(RTLD_NEXT, "__xstat64"); - return ___xstat64(ver, rewrite(path, buf), st); -} - -int access(const char *path, int mode) -{ - char buf[PATH_MAX]; - int (*_access) (const char *path, int mode) = dlsym(RTLD_NEXT, "access"); - return _access(rewrite(path, buf), mode); -} diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix new file mode 100644 index 00000000000..96689fa75ad --- /dev/null +++ b/pkgs/applications/editors/idea/common.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip +, coreutils, gnugrep, which, git, python, unzip, androidsdk }: + +{ name, product, version, build, src, meta, jdk } @ attrs: + +with stdenv.lib; + +let loName = toLower product; + hiName = toUpper product; + execName = concatStringsSep "-" (init (splitString "-" name)); +in + +with stdenv; lib.makeOverridable mkDerivation rec { + inherit name build src meta; + desktopItem = makeDesktopItem { + name = execName; + exec = execName; + comment = lib.replaceChars ["\n"] [" "] meta.longDescription; + desktopName = product; + genericName = meta.description; + categories = "Application;Development;"; + icon = execName; + }; + + buildInputs = [ makeWrapper patchelf p7zip unzip ]; + + patchPhase = '' + get_file_size() { + local fname="$1" + echo $(ls -l $fname | cut -d ' ' -f5) + } + + munge_size_hack() { + local fname="$1" + local size="$2" + strip $fname + truncate --size=$size $fname + } + + interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) + if [ "${stdenv.system}" == "x86_64-linux" ]; then + target_size=$(get_file_size bin/fsnotifier64) + patchelf --set-interpreter "$interpreter" bin/fsnotifier64 + munge_size_hack bin/fsnotifier64 $target_size + else + target_size=$(get_file_size bin/fsnotifier) + patchelf --set-interpreter "$interpreter" bin/fsnotifier + munge_size_hack bin/fsnotifier $target_size + fi + ''; + + installPhase = '' + mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} + cp -a . $out/$name + ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png + mv bin/fsnotifier* $out/libexec/${name}/. + + jdk=${jdk.home} + item=${desktopItem} + + makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ + --prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ + --set JDK_HOME "$jdk" \ + --set ${hiName}_JDK "$jdk" \ + --set ANDROID_JAVA_HOME "$jdk" \ + --set JAVA_HOME "$jdk" + + ln -s "$item/share/applications" $out/share + ''; + +} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 58e9ab347df..932f31d8650 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -1,82 +1,19 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, oraclejdk8 -, coreutils, gnugrep, which, git, python, unzip, androidsdk +{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf +, coreutils, gnugrep, which, git, python, unzip, p7zip +, androidsdk, jdk, oraclejdk8 }: assert stdenv.isLinux; let - # After IDEA 15 we can no longer use OpenJDK. - # https://youtrack.jetbrains.com/issue/IDEA-147272 - jdk = oraclejdk8; - - mkIdeaProduct = with stdenv.lib; - { name, product, version, build, src, meta }: - - let loName = toLower product; - hiName = toUpper product; - execName = concatStringsSep "-" (init (splitString "-" name)); - in - - with stdenv; lib.makeOverridable mkDerivation rec { - inherit name build src meta; - desktopItem = makeDesktopItem { - name = execName; - exec = execName; - comment = lib.replaceChars ["\n"] [" "] meta.longDescription; - desktopName = product; - genericName = meta.description; - categories = "Application;Development;"; - icon = execName; - }; - - buildInputs = [ makeWrapper patchelf p7zip unzip ]; - - patchPhase = '' - get_file_size() { - local fname="$1" - echo $(ls -l $fname | cut -d ' ' -f5) - } - - munge_size_hack() { - local fname="$1" - local size="$2" - strip $fname - truncate --size=$size $fname - } - - interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) - if [ "${stdenv.system}" == "x86_64-linux" ]; then - target_size=$(get_file_size bin/fsnotifier64) - patchelf --set-interpreter "$interpreter" bin/fsnotifier64 - munge_size_hack bin/fsnotifier64 $target_size - else - target_size=$(get_file_size bin/fsnotifier) - patchelf --set-interpreter "$interpreter" bin/fsnotifier - munge_size_hack bin/fsnotifier $target_size - fi - ''; - - installPhase = '' - mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} - cp -a . $out/$name - ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png - mv bin/fsnotifier* $out/libexec/${name}/. - - jdk=${jdk.home} - item=${desktopItem} - - makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ - --prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ - --set JDK_HOME "$jdk" \ - --set ${hiName}_JDK "$jdk" \ - --set ANDROID_JAVA_HOME "$jdk" \ - --set JAVA_HOME "$jdk" - - ln -s "$item/share/applications" $out/share - ''; - - }; + bnumber = with stdenv.lib; build: last (splitString "-" build); + mkIdeaProduct' = callPackage ./common.nix { }; + mkIdeaProduct = attrs: mkIdeaProduct' ({ + # After IDEA 15 we can no longer use OpenJDK. + # https://youtrack.jetbrains.com/issue/IDEA-147272 + jdk = if (bnumber attrs.build) < "143" then jdk else oraclejdk8; + } // attrs); buildAndroidStudio = { name, version, build, src, license, description }: let drv = (mkIdeaProduct rec { @@ -239,6 +176,18 @@ in }; }; + idea14-community = buildIdea rec { + name = "idea-community-${version}"; + version = "14.1.6"; + build = "IC-141.3056.4"; + description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; + license = stdenv.lib.licenses.asl20; + src = fetchurl { + url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; + sha256 = "157969b37sbafby1r1gva2xm3a3y0dgj7pisgxmk8k1d5rgncvil"; + }; + }; + idea-community = buildIdea rec { name = "idea-community-${version}"; version = "15.0.2"; diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 3fe8c06ca63..a2b7fd77337 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool , libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }: -let version = "3.19.3"; in +let version = "3.19.4"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "0il7ikd5hj9mgzrivm01g572g9101w8la58h3hjyakwcfw3jp976"; + sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83"; url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; diff --git a/pkgs/applications/misc/3dfsb/default.nix b/pkgs/applications/misc/3dfsb/default.nix deleted file mode 100644 index fe173b21b57..00000000000 --- a/pkgs/applications/misc/3dfsb/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, makeWrapper, glibc, fetchgit, pkgconfig, SDL, SDL_image, SDL_stretch, - mesa, mesa_glu, freeglut, gst_all_1, gtk2, file, imagemagick }: - -stdenv.mkDerivation { - name = "3dfsb-1.0"; - - meta = with stdenv.lib; { - description = "3D File System Browser - cleaned up and improved fork of the old tdfsb which runs on GNU/Linux and should also run on BeOS/Haiku and FreeBSD"; - homepage = "https://github.com/tomvanbraeckel/3dfsb"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ eduarrrd ]; - }; - - src = fetchgit { - url = "git://github.com/tomvanbraeckel/3dfsb.git"; - rev = "a69a9dfad42acbe2816328d11b58b65f4186c4c5"; - sha256 = "191ndg4vfanjfx4qh186sszyy4pphx3l41rchins9mg8y5rm5ffp"; - }; - - buildInputs = with gst_all_1; [ makeWrapper glibc pkgconfig SDL SDL_image SDL_stretch mesa_glu freeglut gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gtk2 file imagemagick ]; - - buildPhase = "sh ./compile.sh"; - dontStrip = true; - - installPhase = "mkdir -p $out/bin/ && cp 3dfsb $out/bin/"; - - preFixup = '' - wrapProgram $out/bin/3dfsb \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - ''; -} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d4786017a47..28e97a93067 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.48.0"; + version = "2.49.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0bjzw806czqxkhq9qqkhff8bhfc428pijkidb1h6gr47jqdp4hpg"; + sha256 = "0jc476pg07c0nwccprhwgjdlvvb2fdzza9xrjqzc0c42c5v7qzxa"; }; inherit python; diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index c337cd329c9..7ca5f962403 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "terminator-${version}"; - version = "0.97"; + version = "0.98"; src = fetchurl { url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz"; - sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci"; + sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a"; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index c1f2cbbce4d..2fb33fda610 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -34,7 +34,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ chaoflow aszlig ]; + maintainers = with maintainers; [ chaoflow ]; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index bf870e144e5..c0c5e485e59 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -64,20 +64,17 @@ let in stdenv.mkDerivation { name = "chromium${suffix}-${chromium.browser.version}"; - buildInputs = [ makeWrapper ] ++ chromium.plugins.enabledPlugins; + buildInputs = [ makeWrapper ]; buildCommand = let browserBinary = "${chromium.browser}/libexec/chromium/chromium"; - mkEnvVar = key: val: "--set '${key}' '${val}'"; - envVars = chromium.plugins.settings.envVars or {}; - flags = chromium.plugins.settings.flags or []; + getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; in with stdenv.lib; '' mkdir -p "$out/bin" "$out/share/applications" ln -s "${chromium.browser}/share" "$out/share" - makeWrapper "${browserBinary}" "$out/bin/chromium" \ - ${concatStrings (mapAttrsToList mkEnvVar envVars)} \ - --add-flags "${concatStringsSep " " flags}" + eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ + ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ln -s "$out/bin/chromium" "$out/bin/chromium-browser" ln -s "${chromium.browser}/share/icons" "$out/share/icons" diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 0b0e5bd0838..dda97690561 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -8,6 +8,34 @@ with stdenv.lib; let + # Generate a shell fragment that emits flags appended to the + # final makeWrapper call for wrapping the browser's main binary. + # + # Note that this is shell-escaped so that only the variable specified + # by the "output" attribute is substituted. + mkPluginInfo = { output ? "out", allowedVars ? [ output ] + , flags ? [], envVars ? {} + }: let + shSearch = ["'"] ++ map (var: "\$${var}") allowedVars; + shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars; + # We need to triple-escape "val": + # * First because makeWrapper doesn't do any quoting of its arguments by + # itself. + # * Second because it's passed to the makeWrapper call separated by IFS but + # not by the _real_ arguments, for example the Widevine plugin flags + # contain spaces, so they would end up as separate arguments. + # * Third in order to be correctly quoted for the "echo" call below. + shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; + mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'"; + mkFlag = flag: ["--add-flags" (shEsc flag)]; + mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)]; + envList = mapAttrsToList mkEnvVar envVars; + quoted = map mkSh (flatten ((map mkFlag flags) ++ envList)); + in '' + mkdir -p "''$${output}/nix-support" + echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" + ''; + plugins = stdenv.mkDerivation { name = "chromium-binary-plugins"; @@ -61,40 +89,29 @@ let install -vD PepperFlash/libpepflashplayer.so \ "$flash/lib/libpepflashplayer.so" - mkdir -p "$flash/nix-support" - cat > "$flash/nix-support/chromium-plugin.nix" < "$widevine/nix-support/chromium-plugin.nix" < farstream != null && gst_plugins_bad != null @@ -61,7 +62,8 @@ stdenv.mkDerivation rec { ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils - ++ optional enableNotifications pythonPackages.notify; + ++ optional enableNotifications pythonPackages.notify + ++ extraPythonPackages pythonPackages; postInstall = '' install -m 644 -t "$out/share/gajim/icons/hicolor" \ diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 5a4e2cbbc05..92c306c4082 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, cmake, gmp, mpfr, luajit, boost, python -, gperftools, ninja }: +, gperftools, ninja, makeWrapper }: stdenv.mkDerivation rec { name = "lean-${version}"; - version = "20150821"; + version = "20160117"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; - rev = "453bd2341dac51e50d9bff07d5ff6c9c3fb3ba0b"; - sha256 = "1hmga5my123sra873iyqc7drj4skny4hnhsasaxjkmmdhmj1zpka"; + rev = "b2554dcb8f45899ccce84f226cd67b6460442930"; + sha256 = "1gr024bly92kdjky5qvcm96gn86ijakziiyrsz91h643n1iyxhms"; }; - buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ]; + buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja makeWrapper ]; enableParallelBuilding = true; preConfigure = '' @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + postInstall = '' + wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin + ''; + meta = { description = "Automatic and interactive theorem prover"; homepage = "http://leanprover.github.io"; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index edbf8a843a5..e7a19565949 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -3,6 +3,7 @@ , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas , curl, Cocoa, Foundation, cf-private, libobjc, tzdata , withRecommendedPackages ? true +, enableStrictBarrier ? false }: stdenv.mkDerivation rec { @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { --with-system-pcre --with-system-xz --with-ICU + ${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"} --enable-R-shlib AR=$(type -p ar) AWK=$(type -p gawk) diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix deleted file mode 100644 index 964390d3b59..00000000000 --- a/pkgs/applications/window-managers/bar/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, perl, libxcb }: - -let - version = "1.1"; -in - stdenv.mkDerivation rec { - name = "bar-${version}"; - - src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz"; - sha256 = "171ciw676cvj80zzbqfbg9nwix36zph0683zmqf279q9b9bmayan"; - }; - - buildInputs = [ libxcb perl ]; - - prePatch = ''sed -i "s@/usr@$out@" Makefile''; - - meta = { - description = "A lightweight xcb based bar"; - homepage = https://github.com/LemonBoy/bar; - maintainers = [ stdenv.lib.maintainers.meisternu ]; - license = "Custom"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix new file mode 100644 index 00000000000..042abf09dad --- /dev/null +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, perl, libxcb }: + +let + version = "1.2pre"; +in + stdenv.mkDerivation rec { + name = "lemonbar-${version}"; + + src = fetchFromGitHub { + owner = "LemonBoy"; + repo = "bar"; + rev = "61985278f2af1e4e85d63a696ffedc5616b06bc0"; + sha256 = "0a8djlayimjdg5fj50lpifsv6gkb577bca68wmk9wg9y9n27pgay"; + }; + + buildInputs = [ libxcb perl ]; + + prePatch = ''sed -i "s@/usr@$out@" Makefile''; + + meta = with stdenv.lib; { + description = "A lightweight xcb based bar"; + homepage = https://github.com/LemonBoy/bar; + maintainers = [ maintainers.meisternu ]; + license = "Custom"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/bar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix similarity index 100% rename from pkgs/applications/window-managers/bar/xft.nix rename to pkgs/applications/window-managers/lemonbar/xft.nix diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 08961a1b49c..89021caa583 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -39,7 +39,7 @@ mkdir -p $out for PREP in $prepend; do cat $PREP >> $out/initrd done -(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor >> $out/initrd) +(cd root && find * -print0 | cpio -o -H newc -R 0:0 --null | perl $cpioClean | $compressor >> $out/initrd) if [ -n "$makeUInitrd" ]; then mv $out/initrd $out/initrd.gz diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index dc6de05bb69..55e3236847d 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -32,6 +32,9 @@ _separateDebugInfo() { mkdir -p "$dst/${id:0:2}" objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" --compress-debug-sections strip --strip-debug "$i" + + # Also a create a symlink .debug. + ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" done } diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index b7237a1f69c..134ef48ad06 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -104,7 +104,7 @@ rec { if message != null then message else '' Unfortunately, we may not download file ${name_} automatically. - Please, go to ${url}, download it yourself, and add it to the Nix store + Please, go to ${url} to download it yourself, and add it to the Nix store using either nix-store --add-fixed ${hashAlgo} ${name_} or diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 011d7555716..0b793d53fe6 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -let version = "2.018"; in +let version = "2.019"; in stdenv.mkDerivation { name = "hack-font-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { version_ = with stdenv.lib; concatStringsSep "_" (splitString "." version); in fetchurl { - sha256 = "0k1k6pi9znrdc8a4kv0gkdnyzi2w932m2zi27dvb1ignn7lzmfkx"; + sha256 = "0fhrl7y5z3d5fkiycbsi621f8nzfnpz8khxpd6hkc1hrg7nzmrk4"; url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip"; }; diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 3c8d2735a41..63b4ad1ea04 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -19,6 +19,15 @@ stdenv.mkDerivation { mkdir -p $out/share/fonts/truetype cp -v */*.ttf $out/share/fonts/truetype + + mkdir -p $out/share/fonts/bdf + cp -v */BDF/*.bdf $out/share/fonts/bdf + + mkdir -p $out/share/fonts/pcf + cp -v */PCF/*.pcf.gz $out/share/fonts/pcf + + mkdir -p $out/share/fonts/psf + cp -v */PSF/*.psf.gz $out/share/fonts/psf ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 9a1fc56dd88..7f337c01953 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils -, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour +, hscolour }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ]; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; + buildInputs = [ ghc perl hscolour ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 8daba7b1d9c..f16b6981dea 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -13,6 +13,7 @@ , zlib , compiler-rt_src , debugVersion ? false +, enableSharedLibraries ? !stdenv.isDarwin }: let @@ -43,10 +44,11 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_REQUIRES_RTTI=1" - ] ++ stdenv.lib.optionals (!isDarwin) [ + ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" + ++ stdenv.lib.optional (!isDarwin) "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ] ++ stdenv.lib.optionals ( isDarwin) [ + ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" ]; diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix index 6da31fbbf5b..2ccf9d1ed71 100644 --- a/pkgs/development/compilers/llvm/3.6/llvm.nix +++ b/pkgs/development/compilers/llvm/3.6/llvm.nix @@ -13,6 +13,7 @@ , zlib , compiler-rt_src , debugVersion ? false +, enableSharedLibraries ? !stdenv.isDarwin }: let @@ -43,10 +44,11 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optionals (!isDarwin) [ + ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" + ++ stdenv.lib.optional (!isDarwin) "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ] ++ stdenv.lib.optionals ( isDarwin) [ + ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" ]; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix new file mode 100644 index 00000000000..3586e4c32e5 --- /dev/null +++ b/pkgs/development/compilers/terra/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lua, fetchFromGitHub, fetchurl, which, llvm, clang, ncurses }: + +let luajitArchive = "LuaJIT-2.0.4.tar.gz"; + luajitSrc = fetchurl { + url = "http://luajit.org/download/${luajitArchive}"; + sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; + }; +in stdenv.mkDerivation rec { + name = "terra-git-${version}"; + version = "2016-01-06"; + + src = fetchFromGitHub { + owner = "zdevito"; + repo = "terra"; + rev = "914cb98b8adcd50b2ec8205ef5d6914d3547e281"; + sha256 = "1q0dm9gkx2lh2d2sfgly6j5nw32qigmlj3phdvjp26bz99cvxq46"; + }; + + patchPhase = '' + substituteInPlace Makefile --replace \ + '-lcurses' '-lncurses' + ''; + + configurePhase = '' + mkdir -p build + cp ${luajitSrc} build/${luajitArchive} + ''; + + installPhase = '' + mkdir -p $out + cp -r "release/"* $out + ''; + + buildInputs = [ which lua llvm clang ncurses ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "A low-level counterpart to Lua"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/erlang-modules/build-erlang.nix b/pkgs/development/erlang-modules/build-erlang.nix deleted file mode 100644 index e662166741a..00000000000 --- a/pkgs/development/erlang-modules/build-erlang.nix +++ /dev/null @@ -1,68 +0,0 @@ -# This file is not used not tested at this time, build-hex.nix is the currently -# main vehicle of bringing Erlang packages in. - -{ stdenv, erlang, rebar, openssl, libyaml }: - -{ name, version -, buildInputs ? [], erlangDeps ? [] -, postPatch ? "" -, meta ? {} -, ... }@attrs: - -with stdenv.lib; - -stdenv.mkDerivation (attrs // { - name = "${name}-${version}"; - - buildInputs = buildInputs ++ [ erlang rebar openssl libyaml ]; - - postPatch = '' - rm -f rebar - if [ -e "src/${name}.app.src" ]; then - sed -i -e 's/{ *vsn *,[^}]*}/{vsn, "${version}"}/' "src/${name}.app.src" - fi - ${postPatch} - ''; - - configurePhase = let - getDeps = drv: [drv] ++ (map getDeps drv.erlangDeps); - recursiveDeps = uniqList { - inputList = flatten (map getDeps erlangDeps); - }; - in '' - runHook preConfigure - ${concatMapStrings (dep: '' - header "linking erlang dependency ${dep}" - mkdir deps - ln -s "${dep}" "deps/${dep.packageName}" - stopNest - '') recursiveDeps} - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - rebar compile - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - for reldir in src ebin priv include; do - [ -e "$reldir" ] || continue - mkdir "$out" - cp -rt "$out" "$reldir" - success=1 - done - runHook postInstall - ''; - - meta = { - inherit (erlang.meta) platforms; - } // meta; - - passthru = { - packageName = name; - inherit erlangDeps; - }; -}) diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index 7ba8fab9bd2..ff6e47e5a80 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -1,109 +1,19 @@ -{ stdenv, erlang, rebar3, openssl, libyaml, fetchHex, fetchFromGitHub, - rebar3-pc, buildEnv }: +{ stdenv, buildRebar3, fetchHex }: { name, version, sha256 , hexPkg ? name -, buildInputs ? [], erlangDeps ? [], pluginDeps ? [] -, postPatch ? "" -, compilePorts ? false -, meta ? {} , ... }@attrs: with stdenv.lib; let - plugins = pluginDeps ++ (if compilePorts then [rebar3-pc] else []); - getDeps = drv: [drv] ++ (map getDeps drv.erlangDeps); - recursiveDeps = unique (flatten (map getDeps erlangDeps)); - recursivePluginsDeps = unique (flatten (map getDeps plugins)); - - erlEnv = drv: buildEnv { - name = "erlang-env-${drv.name}"; - paths = [ drv ] ++ recursiveDeps; - ignoreCollisions = false; - meta = drv.meta; - }; - - shell = drv: let - drvEnv = erlEnv drv; - in stdenv.mkDerivation { - name = "interactive-shell-${drv.name}"; - nativeBuildInputs = [ erlang drvEnv ]; - shellHook = '' - export ERL_LIBS="${drvEnv}"; - ''; - }; - pkg = self: stdenv.mkDerivation (attrs // { - name = "${name}-${version}"; - - buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; + pkg = self: buildRebar3 (attrs // { src = fetchHex { pkg = hexPkg; inherit version; inherit sha256; }; - - postPatch = '' - rm -f rebar rebar3 - if [ -e "src/${name}.app.src" ]; then - sed -i -e 's/{ *vsn *,[^}]*}/{vsn, "${version}"}/' "src/${name}.app.src" - fi - - ${if compilePorts then '' - echo "{plugins, [pc]}." >> rebar.config - '' else ''''} - - ${rebar3.setupRegistry} - - ${postPatch} - ''; - - configurePhase = '' - runHook preConfigure - ${concatMapStrings (dep: '' - header "linking erlang dependency ${dep}" - ln -s "${dep}/${dep.name}" "_build/default/lib/${dep.name}" - stopNest - '') recursiveDeps} - ${concatMapStrings (dep: '' - header "linking rebar3 plugins ${dep}" - ln -s "${dep}/${dep.name}" "_build/default/plugins/${dep.name}" - stopNest - '') recursivePluginsDeps} - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - HOME=. rebar3 compile - ${if compilePorts then '' - HOME=. rebar3 pc compile - '' else ''''} - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p "$out/${name}" - for reldir in src ebin priv include; do - fd="_build/default/lib/${name}/$reldir" - [ -d "$fd" ] || continue - cp -Hrt "$out/${name}" "$fd" - success=1 - done - runHook postInstall - ''; - - meta = { - inherit (erlang.meta) platforms; - } // meta; - - passthru = { - packageName = name; - env = shell self; - inherit erlangDeps; - }; }); in fix pkg diff --git a/pkgs/development/erlang-modules/build-rebar3.nix b/pkgs/development/erlang-modules/build-rebar3.nix new file mode 100644 index 00000000000..8033d6c838e --- /dev/null +++ b/pkgs/development/erlang-modules/build-rebar3.nix @@ -0,0 +1,88 @@ +{ stdenv, writeText, erlang, rebar3, openssl, libyaml, fetchHex, fetchFromGitHub, + pc, buildEnv }: + +{ name, version +, src +, setupHook ? null +, buildInputs ? [], erlangDeps ? [], buildPlugins ? [] +, postPatch ? "" +, compilePorts ? false +, installPhase ? null +, meta ? {} +, ... }@attrs: + +with stdenv.lib; + +let + ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []); + + shell = drv: stdenv.mkDerivation { + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; + + pkg = self: stdenv.mkDerivation (attrs // { + + name = "${name}-${version}"; + inherit version; + + buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; + propagatedBuildInputs = unique (erlangDeps ++ ownPlugins); + + # The following are used by rebar3-nix-bootstrap + inherit compilePorts; + buildPlugins = ownPlugins; + + inherit src; + + setupHook = if setupHook == null + then writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + '' + else setupHook; + + postPatch = '' + rm -f rebar rebar3 + ''; + + configurePhase = '' + runHook preConfigure + rebar3-nix-bootstrap + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + HOME=. rebar3 compile + ${if compilePorts then '' + HOME=. rebar3 pc compile + '' else ''''} + runHook postBuild + ''; + + installPhase = if installPhase == null + then '' + runHook preInstall + mkdir -p "$out/lib/erlang/lib/${name}-${version}" + for reldir in src ebin priv include; do + fd="_build/default/lib/${name}/$reldir" + [ -d "$fd" ] || continue + cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$fd" + success=1 + done + runHook postInstall + '' + else installPhase; + + meta = { + inherit (erlang.meta) platforms; + } // meta; + + passthru = { + packageName = name; + env = shell self; + inherit erlangDeps; + }; + }); +in + fix pkg diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix index 84590e12a1c..f3adf18df0c 100644 --- a/pkgs/development/erlang-modules/default.nix +++ b/pkgs/development/erlang-modules/default.nix @@ -1,18 +1,14 @@ -{ pkgs }: #? import {} }: +{ stdenv, pkgs }: #? import {} }: let - callPackage = pkgs.lib.callPackageWith (pkgs // self); - self = rec { - buildErlang = callPackage ./build-erlang.nix {}; + hex = import ./hex-packages.nix { stdenv = stdenv; callPackage = self.callPackage; }; + callPackage = pkgs.lib.callPackageWith (pkgs // self // hex); + + buildRebar3 = callPackage ./build-rebar3.nix {}; buildHex = callPackage ./build-hex.nix {}; - rebar3-pc = callPackage ./hex/rebar3-pc.nix {}; - esqlite = callPackage ./hex/esqlite.nix {}; - goldrush = callPackage ./hex/goldrush.nix {}; - ibrowse = callPackage ./hex/ibrowse.nix {}; - jiffy = callPackage ./hex/jiffy.nix {}; - lager = callPackage ./hex/lager.nix {}; - meck = callPackage ./hex/meck.nix {}; + ## Non hex packages + webdriver = callPackage ./webdriver {}; }; -in self +in self // self.hex diff --git a/pkgs/development/erlang-modules/hex-packages.nix b/pkgs/development/erlang-modules/hex-packages.nix new file mode 100644 index 00000000000..9a165503b79 --- /dev/null +++ b/pkgs/development/erlang-modules/hex-packages.nix @@ -0,0 +1,3807 @@ +/* hex-packages.nix is an auto-generated file -- DO NOT EDIT! +* +* Unbuildable Packages: +* +* active_0_9_0 +* conferl_0_0_1 +* db_0_9_0 +* ekstat_0_2_2 +* erltrace_0_1_4 +* escalus_2_6_4 +* fqc_0_1_5 +* - libsnarlmatch_0_1_5 +* - rankmatcher_0_1_2 +* fqc_0_1_7 +* hash_ring_ex_1_1_2 +* gpb_3_18_10 +* gpb_3_18_8 +* - rebar_protobuffs_0_1_0 +* jose_1_4_2 +* jsxn_0_2_1 +* kvs_2_1_0 +* lager_2_1_1 +* - dqe_0_1_22 +* - ensq_0_1_6 +* - eplugin_0_1_4 +* - fifo_utils_0_1_18 +* - lager_watchdog_0_1_10 +* - mdns_client_0_1_7 +* - mdns_client_lib_0_1_33 +* lasp_0_0_3 +* libleofs_0_1_2 +* ezmq_0_2_0 +* mad_0_9_0 +* hackney_1_4_8 +* mmath_0_1_15 +* - ddb_client_0_1_17 +* - folsom_ddb_0_1_20 +* - dproto_0_1_12 +* - mstore_0_1_9 +* mmath_0_1_16 +* n2o_2_3_0 +* nodefinder_1_4_0 +* - cloudi_core_1_4_0_rc_4 +* - cloudi_service_db_cassandra_1_3_3 +* - cloudi_service_db_elasticsearch_1_3_3 +* - cloudi_service_db_riak_1_3_3 +* nodefinder_1_5_1 +* - cloudi_core_1_5_1 +* - cloudi_service_api_requests_1_5_1 +* - cloudi_service_db_1_5_1 +* - cloudi_service_db_cassandra_cql_1_5_1 +* - cloudi_service_db_couchdb_1_5_1 +* - cloudi_service_db_http_elli_1_5_1 +* - cloudi_service_db_memcached_1_5_1 +* - cloudi_service_db_mysql_1_5_1 +* - cloudi_service_db_pgsql_1_5_1 +* - cloudi_service_db_tokyotyrant_1_5_0 +* - cloudi_service_filesystem_1_5_1 +* - cloudi_service_http_client_1_5_1 +* - cloudi_service_http_cowboy_1_5_1 +* - cloudi_service_http_rest_1_5_1 +* - cloudi_service_map_reduce_1_5_1 +* - cloudi_service_monitoring_1_5_1 +* - cloudi_service_queue_1_5_1 +* - cloudi_service_quorum_1_5_1 +* - cloudi_service_router_1_5_1 +* - cloudi_service_tcp_1_5_1 +* - cloudi_service_timers_1_5_1 +* - cloudi_service_udp_1_5_1 +* - cloudi_service_validate_1_5_1 +* - cloudi_service_zeromq_1_5_1 +* - service_1_5_1 +* fast_yaml_1_0_1 +* parse_trans_2_9_0 +* pooler_1_4_0 +* protobuffs_0_8_2 +* - rebar3_protobuffs_0_2_0 +* - riak_pb_2_1_0 +* - riakc_2_1_1 +* locker_1_0_8 +* cowboy_1_0_4 +* - cet_0_2_0 +* amqp_client_3_5_6 +* rebar3_abnfc_plugin_0_1_0 +* rebar3_eqc_0_0_8 +* rebar3_exunit_0_1_1 +* rebar3_proper_0_5_0 +* rebar3_yang_plugin_0_2_1 +* hackney_1_1_0 +* - erlastic_search_1_1_1 +* hackney_1_3_1 +* - craterl_0_2_3 +* hackney_1_3_2 +* - epubnub_0_1_0 +* cpg_1_4_0 +* cpg_1_5_1 +* uuid_erl_1_4_0 +* uuid_erl_1_5_1 +* ucol_nif_1_1_5 +* katipo_0_2_4 +* xref_runner_0_2_4 +*/ +{ stdenv, callPackage }: + +let + self = rec { + + aws_http_0_2_4 = callPackage + ( + { buildHex, barrel_jiffy_0_14_4, lhttpc_1_3_0 }: + buildHex { + name = "aws_http"; + version = "0.2.4"; + sha256 = + "96065da0d348a8e47e01531cfa720615e15a21c1bd4e5c82decf56026cde128f"; + + erlangDeps = [ barrel_jiffy_0_14_4 lhttpc_1_3_0 ]; + + meta = { + description = "Amazon AWS HTTP helpers"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/anha0825/erl_aws_http"; + }; + } + ) {}; + + aws_http = aws_http_0_2_4; + + backoff_1_1_3 = callPackage + ( + { buildHex }: + buildHex { + name = "backoff"; + version = "1.1.3"; + sha256 = + "30cead738d20e4c8d36cd37857dd5e23aeba57cb868bf64766d47d371422bdff"; + + meta = { + description = "Exponential backoffs library"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/ferd/backoff"; + }; + } + ) {}; + + backoff = backoff_1_1_3; + + barrel_ibrowse_4_2_0 = callPackage + ( + { buildHex }: + buildHex { + name = "barrel_ibrowse"; + version = "4.2.0"; + sha256 = + "58bd9e45932c10fd3d0ceb5c4e47952c3243ea300b388192761ac20be197b2ca"; + + meta = { + description = "Erlang HTTP client application"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/barrel-db/ibrowse"; + }; + } + ) {}; + + barrel_ibrowse = barrel_ibrowse_4_2_0; + + barrel_jiffy_0_14_4 = callPackage + ( + { buildHex }: + buildHex { + name = "barrel_jiffy"; + version = "0.14.4"; + sha256 = + "3b730d6a18e988b8411f449bbb5df3637eb7bea864302924581b2391dd6b6e71"; + compilePort = true; + + meta = { + description = "JSON Decoder/Encoder."; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/barrel-db/jiffy"; + }; + } + ) {}; + + barrel_jiffy_0_14_5 = callPackage + ( + { buildHex }: + buildHex { + name = "barrel_jiffy"; + version = "0.14.5"; + sha256 = + "8a874c6dbcf439a7d7b300b4463f47e088fd54e2b715ef7261e21807ee421f47"; + compilePort = true; + + meta = { + description = "JSON Decoder/Encoder."; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/barrel-db/jiffy"; + }; + } + ) {}; + + barrel_jiffy = barrel_jiffy_0_14_5; + + barrel_oauth_1_6_0 = callPackage + ( + { buildHex }: + buildHex { + name = "barrel_oauth"; + version = "1.6.0"; + sha256 = + "b2a800b771d45f32a9a55d416054b3bdfab3a925b62e8000f2c08b719390d4dd"; + + meta = { + description = "An Erlang OAuth 1.0 implementation"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/barrel-db/erlang-oauth"; + }; + } + ) {}; + + barrel_oauth = barrel_oauth_1_6_0; + + base16_1_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "base16"; + version = "1.0.0"; + sha256 = + "02afd0827e61a7b07093873e063575ca3a2b07520567c7f8cec7c5d42f052d76"; + + meta = { + description = "Base16 encoding and decoding"; + license = with stdenv.lib.licenses; [ bsd3 free ]; + homepage = "https://github.com/goj/base16"; + }; + } + ) {}; + + base16 = base16_1_0_0; + + base64url_0_0_1 = callPackage + ( + { buildHex }: + buildHex { + name = "base64url"; + version = "0.0.1"; + sha256 = + "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9"; + + meta = { + description = "URL safe base64-compatible codec"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/dvv/base64url"; + }; + } + ) {}; + + base64url = base64url_0_0_1; + + bbmustache_1_0_4 = callPackage + ( + { buildHex }: + buildHex { + name = "bbmustache"; + version = "1.0.4"; + sha256 = + "03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12"; + + meta = { + description = + "Binary pattern match Based Mustache template engine for Erlang/OTP"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/soranoba/bbmustache"; + }; + } + ) {}; + + bbmustache_1_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "bbmustache"; + version = "1.1.0"; + sha256 = + "aa22469836bb8a9928ad741bdd2038d49116228bfbe0c2d6c792e1bdd4b256d9"; + + meta = { + description = + "Binary pattern match Based Mustache template engine for Erlang/OTP"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/soranoba/bbmustache"; + }; + } + ) {}; + + bbmustache = bbmustache_1_1_0; + + bear_0_8_3 = callPackage + ( + { buildHex }: + buildHex { + name = "bear"; + version = "0.8.3"; + sha256 = + "0a04ce4702e00e0a43c0fcdd63e38c9c7d64dceb32b27ffed261709e7c3861ad"; + + meta = { + description = "Statistics functions for Erlang"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/puzza007/bear"; + }; + } + ) {}; + + bear = bear_0_8_3; + + bstr_0_3_0 = callPackage + ( + { buildHex }: + buildHex { + name = "bstr"; + version = "0.3.0"; + sha256 = + "0fb4e05619663d48dabcd21023915741277ba392f2a5710dde7ab6034760284d"; + + meta = { + description = "Erlang library that uses binaries as strings"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/jcomellas/bstr"; + }; + } + ) {}; + + bstr = bstr_0_3_0; + + cache_tab_1_0_1 = callPackage + ( + { buildHex, p1_utils_1_0_1 }: + buildHex { + name = "cache_tab"; + version = "1.0.1"; + sha256 = + "717a91101e03535ab65e4a9ce028ae3f0ddfb4ce0fd4144bf8816082c6dc2933"; + + erlangDeps = [ p1_utils_1_0_1 ]; + + meta = { + description = "In-memory cache Erlang / Elixir library"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/processone/cache_tab"; + }; + } + ) {}; + + cache_tab = cache_tab_1_0_1; + + certifi_0_1_1 = callPackage + ( + { buildHex }: + buildHex { + name = "certifi"; + version = "0.1.1"; + sha256 = + "e6d1dda48fad1b1c5b454c8402e2ac375ae12bf85a9910decaf791f330a7de29"; + + meta = { + description = "An OTP library"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/certifi/erlang-certifi"; + }; + } + ) {}; + + certifi_0_3_0 = callPackage + ( + { buildHex }: + buildHex { + name = "certifi"; + version = "0.3.0"; + sha256 = + "42ae85fe91c038a634a5fb8d0c77f4fc581914c508f087c7138e9366a1517f6a"; + + meta = { + description = "An OTP library"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/certifi/erlang-certifi"; + }; + } + ) {}; + + certifi = certifi_0_3_0; + + cf_0_1_2 = callPackage + ( + { buildHex }: + buildHex { + name = "cf"; + version = "0.1.2"; + sha256 = + "c86f56bca74dd3616057b28574d920973fe665ecb064aa458dc6a2447f3f4924"; + + meta = { + description = "Terminal colour helper"; + license = stdenv.lib.licenses.mit; + }; + } + ) {}; + + cf_0_2_1 = callPackage + ( + { buildHex }: + buildHex { + name = "cf"; + version = "0.2.1"; + sha256 = + "baee9aa7ec2dfa3cb4486b67211177caa293f876780f0b313b45718edef6a0a5"; + + meta = { + description = "Terminal colour helper"; + license = stdenv.lib.licenses.mit; + }; + } + ) {}; + + cf = cf_0_2_1; + + cmark_0_6_2 = callPackage + ( + { buildHex }: + buildHex { + name = "cmark"; + version = "0.6.2"; + sha256 = + "c17bbc354864cc8dfd352c772eb1655a5c67718c76d76df0aaf6179a833c76ef"; + compilePort = true; + + meta = { + longDescription = ''Elixir NIF for cmark (C), a parser library + following the CommonMark spec, a compatible + implementation of Markdown.''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/asaaki/cmark.ex"; + }; + } + ) {}; + + cmark = cmark_0_6_2; + + comeonin_2_0_1 = callPackage + ( + { buildHex }: + buildHex { + name = "comeonin"; + version = "2.0.1"; + sha256 = + "7f7468625058ab1b817c00efa473d8117b0113a73a429f25cf663d5e2416572f"; + compilePort = true; + + meta = { + description = + "Password hashing (bcrypt, pbkdf2_sha512) library for Elixir."; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/elixircnx/comeonin"; + }; + } + ) {}; + + comeonin = comeonin_2_0_1; + + couchbeam_1_2_1 = callPackage + ( + { buildHex, hackney_1_4_4, jsx_2_8_0 }: + buildHex { + name = "couchbeam"; + version = "1.2.1"; + sha256 = + "ed19f0412aa0539ecf622ac8ade1ca0e316f424e3334ad015a3fb8db19e91194"; + + erlangDeps = [ hackney_1_4_4 jsx_2_8_0 ]; + + meta = { + description = "Erlang CouchDB client"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + couchbeam = couchbeam_1_2_1; + + cowlib_1_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "cowlib"; + version = "1.0.0"; + sha256 = + "4dacd60356177ec8cf93dbff399de17435b613f3318202614d3d5acbccee1474"; + + meta = { + description = "Support library for manipulating Web protocols."; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/ninenines/cowlib"; + }; + } + ) {}; + + cowlib_1_0_2 = callPackage + ( + { buildHex }: + buildHex { + name = "cowlib"; + version = "1.0.2"; + sha256 = + "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2"; + + meta = { + description = "Support library for manipulating Web protocols."; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/ninenines/cowlib"; + }; + } + ) {}; + + cowlib_1_3_0 = callPackage + ( + { buildHex }: + buildHex { + name = "cowlib"; + version = "1.3.0"; + sha256 = + "2b1ac020ec92e7a59cb7322779870c2d3adc7c904ecb3b9fa406f04dc9816b73"; + + meta = { + description = "Support library for manipulating Web protocols."; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/ninenines/cowlib"; + }; + } + ) {}; + + cowlib = cowlib_1_3_0; + + crc_0_3_0 = callPackage + ( + { buildHex }: + buildHex { + name = "crc"; + version = "0.3.0"; + sha256 = + "23d7cb6a18cca461f46f5a0f341c74fd0a680cdae62460687f1a24f0a7faabd4"; + + meta = { + description = + "A library used to calculate CRC checksums for binary data"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/TattdCodeMonkey/crc"; + }; + } + ) {}; + + crc = crc_0_3_0; + + crypto_rsassa_pss_1_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "crypto_rsassa_pss"; + version = "1.0.0"; + sha256 = + "d8f48874dbef940a8954126249499714e702d8ae0a8f23230a6c2f4a92833313"; + + meta = { + description = + "RSASSA-PSS Public Key Cryptographic Signature Algorithm for Erlang"; + license = stdenv.lib.licenses.free; + homepage = + "https://github.com/potatosalad/erlang-crypto_rsassa_pss"; + }; + } + ) {}; + + crypto_rsassa_pss = crypto_rsassa_pss_1_0_0; + + cth_readable_1_2_0 = callPackage + ( + { buildHex, cf_0_2_1 }: + buildHex { + name = "cth_readable"; + version = "1.2.0"; + sha256 = + "41dee2a37e0f266c590b3ea9542ca664e84ebc781a3949115eba658afc08026d"; + + erlangDeps = [ cf_0_2_1 ]; + + meta = { + description = "Common Test hooks for more readable logs"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/ferd/cth_readable"; + }; + } + ) {}; + + cth_readable = cth_readable_1_2_0; + + cucumberl_0_0_6 = callPackage + ( + { buildHex }: + buildHex { + name = "cucumberl"; + version = "0.0.6"; + sha256 = + "3b9ea813997fd8c1e3d2b004e89288496dc21d2e5027f432e5900569d2c61cf3"; + + meta = { + description = "A pure-erlang implementation of Cucumber."; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/ericbmerritt/cucumberl"; + }; + } + ) {}; + + cucumberl = cucumberl_0_0_6; + + denrei_0_2_3 = callPackage + ( + { buildHex }: + buildHex { + name = "denrei"; + version = "0.2.3"; + sha256 = + "bc0e8cf7e085dda6027df83ef5d63c41b93988bcd7f3db7c68e4dad3cd599744"; + + meta = { + description = "Denrei - a lightweight Erlang messaging system."; + license = stdenv.lib.licenses.mit; + }; + } + ) {}; + + denrei = denrei_0_2_3; + + detergent_0_3_0 = callPackage + ( + { buildHex }: + buildHex { + name = "detergent"; + version = "0.3.0"; + sha256 = + "510cfb5d35b4b344762f074b73c8696b4bdde654ea046b3365cf92760ae33362"; + + meta = { + description = "An emulsifying Erlang SOAP library"; + license = with stdenv.lib.licenses; [ unlicense bsd3 ]; + homepage = "https://github.com/devinus/detergent"; + }; + } + ) {}; + + detergent = detergent_0_3_0; + + dflow_0_1_5 = callPackage + ( + { buildHex }: + buildHex { + name = "dflow"; + version = "0.1.5"; + sha256 = + "f08e73f22d4c620ef5f358a0b40f8fe3b91219ca3922fbdbe7e42f1cb58f737e"; + + meta = { + description = "Pipelined flow processing engine"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/dalmatinerdb/dflow"; + }; + } + ) {}; + + dflow = dflow_0_1_5; + + discount_0_7_0 = callPackage + ( + { buildHex }: + buildHex { + name = "discount"; + version = "0.7.0"; + sha256 = + "a37b7890620f93aa2fae06eee364cd906991588bc8897e659f51634179519c97"; + + meta = { + description = "Elixir NIF for discount, a Markdown parser"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/asaaki/discount.ex"; + }; + } + ) {}; + + discount = discount_0_7_0; + + dynamic_compile_1_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "dynamic_compile"; + version = "1.0.0"; + sha256 = + "eb73d8e9a6334914f79c15ee8214acad9659c42222d49beda3e8b6f6789a980a"; + + meta = { + description = + "compile and load erlang modules from string input"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/okeuday/dynamic_compile"; + }; + } + ) {}; + + dynamic_compile = dynamic_compile_1_0_0; + + econfig_0_7_1 = callPackage + ( + { buildHex }: + buildHex { + name = "econfig"; + version = "0.7.1"; + sha256 = + "b11d68e3d288b5cb4bd34e668e03176c4ea42790c09f1f449cdbd46a649ea7f3"; + + meta = { + description = "simple Erlang config handler using INI files"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/benoitc/econfig"; + }; + } + ) {}; + + econfig = econfig_0_7_1; + + edown_0_7_0 = callPackage + ( + { buildHex }: + buildHex { + name = "edown"; + version = "0.7.0"; + sha256 = + "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a"; + + meta = { + description = "Markdown generated from Edoc."; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/uwiger/edown"; + }; + } + ) {}; + + edown = edown_0_7_0; + + elixir_ale_0_4_1 = callPackage + ( + { buildHex }: + buildHex { + name = "elixir_ale"; + version = "0.4.1"; + sha256 = + "2ee5c6989a8005a0ab8f1aea0b4f89b5feae75be78a70bade6627c3624c59c46"; + + meta = { + description = + "Elixir access to hardware I/O interfaces such as GPIO, I2C, and SPI."; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/fhunleth/elixir_ale"; + }; + } + ) {}; + + elixir_ale = elixir_ale_0_4_1; + + elli_1_0_4 = callPackage + ( + { buildHex }: + buildHex { + name = "elli"; + version = "1.0.4"; + sha256 = + "87641b9c069b1372dac4e1bdda795076ea3142af78aac0d63896a38079e89e8e"; + + meta = { + description = + "Fast and robust web server for building high-throughput, low-latency apps"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + elli = elli_1_0_4; + + enotify_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "enotify"; + version = "0.1.0"; + sha256 = + "8e48da763ce15bfd75cc857ddfe5011b03189d597f47bcdd8acc6fbbe8e6b6f4"; + compilePort = true; + + meta = { + description = "Filesystem listener"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/tsloughter/enotify"; + }; + } + ) {}; + + enotify = enotify_0_1_0; + + eper_0_94_0 = callPackage + ( + { buildHex }: + buildHex { + name = "eper"; + version = "0.94.0"; + sha256 = + "8d853792fa61a7fd068fe9c113a8a44bc839e11ad70cb8d5d2884566e3bede39"; + + meta = { + longDescription = ''Erlang Performance and Debugging Tools sherk + - a profiler, similar to Linux oprofile or MacOs + shark gperf - a graphical performance monitor; + shows CPU, memory and network usage dtop - + similar to unix top redbug- similar to the OTP + dbg application, but safer, better etc.''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/massemanet/eper"; + }; + } + ) {}; + + eper = eper_0_94_0; + + epgsql_3_1_1 = callPackage + ( + { buildHex }: + buildHex { + name = "epgsql"; + version = "3.1.1"; + sha256 = + "4b3f478ad090aed7200b2a8c9f2d5ef45c3aaa167be896b5237bba4b40f461d8"; + + meta = { + description = "PostgreSQL Client"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/epgsql/epgsql"; + }; + } + ) {}; + + epgsql = epgsql_3_1_1; + + episcina_1_1_0 = callPackage + ( + { buildHex, gproc_0_3_1 }: + buildHex { + name = "episcina"; + version = "1.1.0"; + sha256 = + "16238717bfbc8cb226342f6b098bb1fafb48c7547265a10ad3e6e83899abc46f"; + + erlangDeps = [ gproc_0_3_1 ]; + + meta = { + description = "Erlang Connection Pool"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + episcina = episcina_1_1_0; + + eql_0_1_2 = callPackage + ( + { buildHex }: + buildHex { + name = "eql"; + version = "0.1.2"; + sha256 = + "3b1a85c491d44262802058c0de97a2c90678d5d45851b88a076b1a45a8d6d4b3"; + + meta = { + description = "Erlang with SQL"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/artemeff/eql"; + }; + } + ) {}; + + eql = eql_0_1_2; + + eredis_1_0_8 = callPackage + ( + { buildHex }: + buildHex { + name = "eredis"; + version = "1.0.8"; + sha256 = + "f303533e72129b264a2d8217c4ddc977c7527ff4b8a6a55f92f62b7fcc099334"; + + meta = { + description = "Erlang Redis client"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/wooga/eredis"; + }; + } + ) {}; + + eredis = eredis_1_0_8; + + erlang_lua_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "erlang_lua"; + version = "0.1.0"; + sha256 = + "4376a57f86e43ae1d687dca8b6c7c7f692b95d30091a9550636328358026e6eb"; + compilePort = true; + + meta = { + longDescription = ''Erlang-lua hex package, using Erlang's Port + and C Node to run Lua VM as an external Node''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/rtraschke/erlang-lua"; + }; + } + ) {}; + + erlang_lua = erlang_lua_0_1_0; + + erlang_term_1_4_0 = callPackage + ( + { buildHex }: + buildHex { + name = "erlang_term"; + version = "1.4.0"; + sha256 = + "1a4d491dbd13b7a714815af10fc658948a5a440de23755a32b741ca07d8ba592"; + + meta = { + description = "Provide the in-memory size of Erlang terms"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/erlang_term"; + }; + } + ) {}; + + erlang_term_1_5_1 = callPackage + ( + { buildHex }: + buildHex { + name = "erlang_term"; + version = "1.5.1"; + sha256 = + "88bae81a80306e82fd3fc43e2d8228049e666f3cfe4627687832cd7edb878e06"; + + meta = { + description = "Provide the in-memory size of Erlang terms"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/erlang_term"; + }; + } + ) {}; + + erlang_term = erlang_term_1_5_1; + + erlang_version_0_2_0 = callPackage + ( + { buildHex }: + buildHex { + name = "erlang_version"; + version = "0.2.0"; + sha256 = + "74daddba65a247ec57913e5de8f243af42bbbc3d6a0c411a1252da81c09ae661"; + + meta = { + description = "Retrieve Erlang/OTP version like `18.1'"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/sapporo-beam/erlang_version"; + }; + } + ) {}; + + erlang_version = erlang_version_0_2_0; + + erlaudio_0_2_3 = callPackage + ( + { buildHex }: + buildHex { + name = "erlaudio"; + version = "0.2.3"; + sha256 = + "cb9efb0ce80faae003ab39f8cc2d3fccbb4bd1c8f5f525aea392f28662517032"; + compilePort = true; + + meta = { + description = "Erlang audio bindings to portaudio"; + license = stdenv.lib.licenses.apsl20; + homepage = "https://github.com/asonge/erlaudio"; + }; + } + ) {}; + + erlaudio = erlaudio_0_2_3; + + erlcloud_0_11_0 = callPackage + ( + { buildHex, jsx_2_6_2, lhttpc_1_3_0, meck_0_8_3 }: + buildHex { + name = "erlcloud"; + version = "0.11.0"; + sha256 = + "ca9876dab57ed8fb5fb75ab6ce11e59a346387d357d7a038a2e18d1d31a30716"; + + erlangDeps = [ jsx_2_6_2 lhttpc_1_3_0 meck_0_8_3 ]; + + meta = { + description = "Cloud Computing library for erlang"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/gleber/erlcloud"; + }; + } + ) {}; + + erlcloud_0_12_0 = callPackage + ( + { buildHex, jsx_2_7_2, lhttpc_1_3_0, meck_0_8_3 }: + buildHex { + name = "erlcloud"; + version = "0.12.0"; + sha256 = + "2ff2631a4e405a645cedf2713ec66728023e93ac80ed47035554a7d6205d412d"; + + erlangDeps = [ jsx_2_7_2 lhttpc_1_3_0 meck_0_8_3 ]; + + meta = { + description = "Cloud Computing library for erlang"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/gleber/erlcloud"; + }; + } + ) {}; + + erlcloud = erlcloud_0_12_0; + + erldn_1_0_2 = callPackage + ( + { buildHex }: + buildHex { + name = "erldn"; + version = "1.0.2"; + sha256 = + "51a721f1aac9c5fcc6abb0fa156a97ac8e033ee7cbee1624345ec6e47dfe0aa0"; + + meta = { + description = "An edn parser for the Erlang platform. +"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/marianoguerra/erldn"; + }; + } + ) {}; + + erldn = erldn_1_0_2; + + erlexec_1_0_1 = callPackage + ( + { buildHex }: + buildHex { + name = "erlexec"; + version = "1.0.1"; + sha256 = + "eb1e11f16288db4ea35af08503eabf1250d5540c1e8bd35ba04312f5f703e14f"; + compilePort = true; + + meta = { + description = "OS Process Manager"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/saleyn/erlexec"; + }; + } + ) {}; + + erlexec = erlexec_1_0_1; + + erlsh_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "erlsh"; + version = "0.1.0"; + sha256 = + "94ef1492dd59fef211f01ffd40c47b6e51c0f59e2a3d0739366e4890961332d9"; + compilePort = true; + + meta = { + longDescription = ''Family of functions and ports involving + interacting with the system shell, paths and + external programs.''; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + erlsh = erlsh_0_1_0; + + erlsom_1_2_1 = callPackage + ( + { buildHex }: + buildHex { + name = "erlsom"; + version = "1.2.1"; + sha256 = + "e8f4d1d83583df7d1db8346aa30b82a6599b93fcc4b2d9165007e02ed40e7cae"; + + meta = { + description = "erlsom XSD parser"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + erlsom = erlsom_1_2_1; + + erlware_commons_0_18_0 = callPackage + ( + { buildHex, cf_0_2_1 }: + buildHex { + name = "erlware_commons"; + version = "0.18.0"; + sha256 = + "e71dda7cd5dcf34c9d07255d49c67e1d229dd230c101fdb996820bcdb5b03c49"; + + erlangDeps = [ cf_0_2_1 ]; + + meta = { + description = "Additional standard library for Erlang"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/erlware/erlware_commons"; + }; + } + ) {}; + + erlware_commons = erlware_commons_0_18_0; + + erlzk_0_6_1 = callPackage + ( + { buildHex }: + buildHex { + name = "erlzk"; + version = "0.6.1"; + sha256 = + "6bba045ad0b7beb566825b463ada2464929655ce01e291022c1efed81a674759"; + + meta = { + description = "A Pure Erlang ZooKeeper Client (no C dependency)"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/huaban/erlzk"; + }; + } + ) {}; + + erlzk = erlzk_0_6_1; + + esel_0_1_2 = callPackage + ( + { buildHex }: + buildHex { + name = "esel"; + version = "0.1.2"; + sha256 = + "874d1775c86d27d9e88486a37351ffc09f826ef062c8ea211e65d08e103f946c"; + + meta = { + description = "An wrapper around openssl"; + license = stdenv.lib.licenses.mit; + }; + } + ) {}; + + esel = esel_0_1_2; + + esqlite_0_2_1 = callPackage + ( + { buildHex }: + buildHex { + name = "esqlite"; + version = "0.2.1"; + sha256 = + "79f2d1d05e6e29e50228af794dac8900ce47dd60bc11fbf1279f924f83752689"; + compilePort = true; + + meta = { + description = "A Sqlite3 NIF"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/mmzeeman/esqlite"; + }; + } + ) {}; + + esqlite = esqlite_0_2_1; + + eunit_formatters_0_3_1 = callPackage + ( + { buildHex }: + buildHex { + name = "eunit_formatters"; + version = "0.3.1"; + sha256 = + "64a40741429b7aff149c605d5a6135a48046af394a7282074e6003b3b56ae931"; + + meta = { + description = "Better output for eunit suites"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/seancribbs/eunit_formatters"; + }; + } + ) {}; + + eunit_formatters = eunit_formatters_0_3_1; + + ex_bitcask_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "ex_bitcask"; + version = "0.1.0"; + sha256 = + "dc771229aae3c07c31a5523303f0c4dbe3c700d5025a09dfcca9cc357222c463"; + compilePort = true; + + meta = { + longDescription = ''Elixir wrapper of Basho's Bitcask Key/Value + store. Bitcask as a Log-Structured Hash Table + for Fast Key/Value Data. ''; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/JonGretar/ExBitcask"; + }; + } + ) {}; + + ex_bitcask = ex_bitcask_0_1_0; + + exec_1_0_1 = callPackage + ( + { buildHex }: + buildHex { + name = "exec"; + version = "1.0.1"; + sha256 = + "87c7ef2dea2bb503bb0eec8cb34776172999aecc6e12d90f7629796a7a3ccb1f"; + compilePort = true; + + meta = { + description = "OS Process Manager"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/saleyn/erlexec"; + }; + } + ) {}; + + exec = exec_1_0_1; + + exmerl_0_1_1 = callPackage + ( + { buildHex }: + buildHex { + name = "exmerl"; + version = "0.1.1"; + sha256 = + "4bb5d6c1863c5e381b460416c9b517a211db9abd9abf0f32c99b07e128b842aa"; + + meta = { + description = + "An Elixir wrapper for parsing XML through the xmerl_* suite of modules +"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/pwoolcoc/exmerl"; + }; + } + ) {}; + + exmerl = exmerl_0_1_1; + + fast_xml_1_1_2 = callPackage + ( + { buildHex, p1_utils_1_0_1 }: + buildHex { + name = "fast_xml"; + version = "1.1.2"; + sha256 = + "becac16805254bc8399558f0eb5d3ed733a1e3c0c511d9c7e95244f43626f9bf"; + compilePort = true; + erlangDeps = [ p1_utils_1_0_1 ]; + + meta = { + description = "Fast Expat based Erlang XML parsing library"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/processone/fast_xml"; + }; + } + ) {}; + + fast_xml = fast_xml_1_1_2; + + feeder_2_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "feeder"; + version = "2.0.0"; + sha256 = + "9780c5f032d3480cf7d9fd71d3f0c5f73211e0d3a8d9cdabcb1327b3a4ff758e"; + + meta = { + description = "Stream parse RSS and Atom formatted XML feeds. +"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/michaelnisi/feeder"; + }; + } + ) {}; + + feeder = feeder_2_0_0; + + fn_1_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "fn"; + version = "1.0.0"; + sha256 = + "1433b353c8739bb28ac0d6826c9f6a05033f158e8c8195faf01a863668b3bbc7"; + + meta = { + description = "More functional Erlang"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/artemeff/fn"; + }; + } + ) {}; + + fn = fn_1_0_0; + + folsom_0_8_3 = callPackage + ( + { buildHex, bear_0_8_3 }: + buildHex { + name = "folsom"; + version = "0.8.3"; + sha256 = + "afaa1ea4cd2a10a32242ac5d76fa7b17e98d202883859136b791d9a383b26820"; + + erlangDeps = [ bear_0_8_3 ]; + + meta = { + description = "Erlang based metrics system"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + folsom = folsom_0_8_3; + + folsomite_1_2_8 = callPackage + ( + { buildHex, folsom_0_8_3 }: + buildHex { + name = "folsomite"; + version = "1.2.8"; + sha256 = + "9ce64603cdffb8ad55e950142146b3fe05533020906a81aa9c2f524635d813dc"; + + erlangDeps = [ folsom_0_8_3 ]; + + meta = { + description = "Blow up your Graphite server with Folsom metrics"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + folsomite = folsomite_1_2_8; + + fs_0_9_2 = callPackage + ( + { buildHex }: + buildHex { + name = "fs"; + version = "0.9.2"; + sha256 = + "9a00246e8af58cdf465ae7c48fd6fd7ba2e43300413dfcc25447ecd3bf76f0c1"; + compilePort = true; + + meta = { + description = "Erlang FileSystem Listener"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/synrc/fs"; + }; + } + ) {}; + + fs = fs_0_9_2; + + fuse_2_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "fuse"; + version = "2.0.0"; + sha256 = + "e2c55c0629ce418974165a65b342e54527333303d7e9c1f0493679144c9698cb"; + + meta = { + description = "A Circuit breaker implementation for Erlang"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + fuse = fuse_2_0_0; + + gen_listener_tcp_0_3_2 = callPackage + ( + { buildHex }: + buildHex { + name = "gen_listener_tcp"; + version = "0.3.2"; + sha256 = + "b3c3fbc525ba2b32d947b06811d38470d5b0abe2ca81b623192a71539ed22336"; + + meta = { + description = "Generic TCP Server"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/travelping/gen_listener_tcp"; + }; + } + ) {}; + + gen_listener_tcp = gen_listener_tcp_0_3_2; + + gen_smtp_0_9_0 = callPackage + ( + { buildHex }: + buildHex { + name = "gen_smtp"; + version = "0.9.0"; + sha256 = + "5a05f23a7cbe0c6242d290b445c6bbc0c287e3d0e09d3fcdc6bcd2c8973b6688"; + + meta = { + longDescription = ''A generic Erlang SMTP server framework that + can be extended via callback modules in the OTP + style. ''; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/Vagabond/gen_smtp"; + }; + } + ) {}; + + gen_smtp = gen_smtp_0_9_0; + + getopt_0_8_2 = callPackage + ( + { buildHex }: + buildHex { + name = "getopt"; + version = "0.8.2"; + sha256 = + "736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7"; + + meta = { + description = "Command-line options parser for Erlang"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/jcomellas/getopt"; + }; + } + ) {}; + + getopt = getopt_0_8_2; + + goldrush_0_1_7 = callPackage + ( + { buildHex }: + buildHex { + name = "goldrush"; + version = "0.1.7"; + sha256 = + "a94a74cd363ce5f4970ed8242c551ec62b71939db1bbfd2e030142cab25a4ffe"; + + meta = { + description = + "Small, Fast event processing and monitoring for Erlang/OTP applications. +"; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/DeadZen/goldrush"; + }; + } + ) {}; + + goldrush = goldrush_0_1_7; + + gproc_0_3_1 = callPackage + ( + { buildHex }: + buildHex { + name = "gproc"; + version = "0.3.1"; + sha256 = + "3c449925a5cbf57cc40d13c6c282bc1080b5ed3bad97e1acdbe969fd63a65fce"; + + meta = { + longDescription = ''Gproc is a process dictionary for Erlang, + which provides a number of useful features + beyond what the built-in dictionary has: * Use + any term as a process alias * Register a process + under several aliases * Non-unique properties + can be registered simultaneously by many + processes * QLC and match specification + interface for efficient queries on the + dictionary * Await registration, let's you wait + until a process registers itself * Atomically + give away registered names and properties to + another process * Counters, and aggregated + counters, which automatically maintain the total + of all counters with a given name * Global + registry, with all the above functions applied + to a network of nodes''; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/uwiger/gproc"; + }; + } + ) {}; + + gproc_0_5_0 = callPackage + ( + { buildHex }: + buildHex { + name = "gproc"; + version = "0.5.0"; + sha256 = + "5bc0fa4e999a6665b92ce57a7f12d7e9d1c26bfc39b0f657994be05cd3818b18"; + + meta = { + longDescription = ''Gproc is a process dictionary for Erlang, + which provides a number of useful features + beyond what the built-in dictionary has: * Use + any term as a process alias * Register a process + under several aliases * Non-unique properties + can be registered simultaneously by many + processes * QLC and match specification + interface for efficient queries on the + dictionary * Await registration, let's you wait + until a process registers itself * Atomically + give away registered names and properties to + another process * Counters, and aggregated + counters, which automatically maintain the total + of all counters with a given name * Global + registry, with all the above functions applied + to a network of nodes''; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/uwiger/gproc"; + }; + } + ) {}; + + gproc = gproc_0_5_0; + + gurka_0_1_7 = callPackage + ( + { buildHex }: + buildHex { + name = "gurka"; + version = "0.1.7"; + sha256 = + "b46c96446f46a53411a3b45d126ec19e724178818206ca1d2dd16abff28df6b5"; + + meta = { + description = "Erlang implementation of Cucumber"; + license = stdenv.lib.licenses.mit; + }; + } + ) {}; + + gurka = gurka_0_1_7; + + hackney_1_4_4 = callPackage + ( + { + buildHex, + certifi_0_1_1, + idna_1_0_2, + mimerl_1_0_0, + ssl_verify_hostname_1_0_5 + }: + buildHex { + name = "hackney"; + version = "1.4.4"; + sha256 = + "c8ab2436556d6bce7e85a85adec67f6abeb8c7508668a3e29750be3c4bf4e3a8"; + + erlangDeps = [ + certifi_0_1_1 + idna_1_0_2 + mimerl_1_0_0 + ssl_verify_hostname_1_0_5 + ]; + + meta = { + description = "simple HTTP client"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/benoitc/hackney"; + }; + } + ) {}; + + hamcrest_0_1_1 = callPackage + ( + { buildHex }: + buildHex { + name = "hamcrest"; + version = "0.1.1"; + sha256 = + "5207b83e8d3168b9cbbeb3b4c4d83817a38a05f55478510e9c4db83ef83fa0ca"; + + meta = { + description = "Erlang port of Hamcrest"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/hyperthunk/hamcrest-erlang"; + }; + } + ) {}; + + hamcrest = hamcrest_0_1_1; + + hlc_2_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "hlc"; + version = "2.0.0"; + sha256 = + "460ac04654e920e068d1fd17aec1f78b1879cc42ac7f3def7497f0d1cc5056ad"; + + meta = { + description = "hybrid logical clock"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/barrel-db/hlc"; + }; + } + ) {}; + + hlc = hlc_2_0_0; + + hooks_1_1_1 = callPackage + ( + { buildHex }: + buildHex { + name = "hooks"; + version = "1.1.1"; + sha256 = + "6834ad3a2a624a5ffd49e9cb146ff49ded423b67f31905b122d24128c72c5c85"; + + meta = { + description = "generic plugin & hook system"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/barrel-db/hooks"; + }; + } + ) {}; + + hooks = hooks_1_1_1; + + http_signature_1_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "http_signature"; + version = "1.1.0"; + sha256 = + "3e6036d9c29289ed0e35dd6f41821dec9061ce20aad3c4d35dcbae8c84eb3baa"; + + meta = { + description = + "Erlang and Elixir implementations of Joyent's HTTP Signature Scheme."; + license = stdenv.lib.licenses.free; + homepage = + "https://github.com/potatosalad/erlang-http_signature"; + }; + } + ) {}; + + http_signature = http_signature_1_1_0; + + ibrowse_4_2_2 = callPackage + ( + { buildHex }: + buildHex { + name = "ibrowse"; + version = "4.2.2"; + sha256 = + "b800cb7442bcc852c6832821e9d0a7098ff626e1415bddaeff4596640b31c0ae"; + + meta = { + description = "Erlang HTTP client application"; + license = with stdenv.lib.licenses; [ free bsd3 ]; + homepage = "https://github.com/cmullaparthi/ibrowse"; + }; + } + ) {}; + + ibrowse = ibrowse_4_2_2; + + idna_1_0_2 = callPackage + ( + { buildHex }: + buildHex { + name = "idna"; + version = "1.0.2"; + sha256 = + "a5d645e307aa4f67efe31682f720b7eaf431ab148b3d6fb66cbaf6314499610f"; + + meta = { + description = "A pure Erlang IDNA implementation"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/benoitc/erlang-idna"; + }; + } + ) {}; + + idna_1_0_3 = callPackage + ( + { buildHex }: + buildHex { + name = "idna"; + version = "1.0.3"; + sha256 = + "357d489a51112db4f216034406834f9172b3c0ff5a12f83fb28b25ca271541d1"; + + meta = { + description = "A pure Erlang IDNA implementation"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/benoitc/erlang-idna"; + }; + } + ) {}; + + idna = idna_1_0_3; + + inaka_aleppo_0_9_5 = callPackage + ( + { buildHex }: + buildHex { + name = "inaka_aleppo"; + version = "0.9.5"; + sha256 = + "58e65aa708a0aae828ad8072f521edca8ce19fc3373223180a348a27a3722eb4"; + + meta = { + description = "Aleppo: ALternative Erlang Pre-ProcessOr"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/inaka/aleppo"; + }; + } + ) {}; + + inaka_aleppo = inaka_aleppo_0_9_5; + + inaka_mixer_0_1_5 = callPackage + ( + { buildHex }: + buildHex { + name = "inaka_mixer"; + version = "0.1.5"; + sha256 = + "37af35b1c17a94a0cb643cba23cba2ca68d6fe51c3ad8337629d4c3c017cc912"; + + meta = { + description = "Mix in public functions from external modules"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/inaka/mixer"; + }; + } + ) {}; + + inaka_mixer = inaka_mixer_0_1_5; + + jc_1_0_4 = callPackage + ( + { buildHex }: + buildHex { + name = "jc"; + version = "1.0.4"; + sha256 = + "8bcfe202084109fc80fcf521e630466fc53cbb909aff4283bed43252664023df"; + + meta = { + description = "A simple, distributed, in-memory caching system"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/jr0senblum/jc"; + }; + } + ) {}; + + jc = jc_1_0_4; + + jsone_1_2_0 = callPackage + ( + { buildHex }: + buildHex { + name = "jsone"; + version = "1.2.0"; + sha256 = + "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08"; + + meta = { + description = "Erlang JSON Library"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/sile/jsone"; + }; + } + ) {}; + + jsone = jsone_1_2_0; + + jsx_1_4_5 = callPackage + ( + { buildHex }: + buildHex { + name = "jsx"; + version = "1.4.5"; + sha256 = + "ff5115611c5dd789cebe3addc07d18b86340f701c52ad063caba6fe8da3a489b"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } + ) {}; + + jsx_2_2_0 = callPackage + ( + { buildHex }: + buildHex { + name = "jsx"; + version = "2.2.0"; + sha256 = + "d0bbc1ef47fd2fed84e28faed66918cf9eceed03b7ded48a23076e716fdbc84f"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } + ) {}; + + jsx_2_6_2 = callPackage + ( + { buildHex }: + buildHex { + name = "jsx"; + version = "2.6.2"; + sha256 = + "6bfccb6461cc3c7d5cc63f3e69ffeb2f1f8de50eca5980065311c056a69a907f"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } + ) {}; + + jsx_2_7_1 = callPackage + ( + { buildHex }: + buildHex { + name = "jsx"; + version = "2.7.1"; + sha256 = + "52d0e8bda0c8624bc59c3119236eb49bb66289702ea3d59ad76fd2a56cdf9089"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } + ) {}; + + jsx_2_7_2 = callPackage + ( + { buildHex }: + buildHex { + name = "jsx"; + version = "2.7.2"; + sha256 = + "36ca4772c09d69efc9e069aec7327cbd57d53d56c9a2777d8fb3bf3c1eab6df3"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } + ) {}; + + jsx_2_8_0 = callPackage + ( + { buildHex }: + buildHex { + name = "jsx"; + version = "2.8.0"; + sha256 = + "a8ba15d5bac2c48b2be1224a0542ad794538d79e2cc16841a4e24ca75f0f8378"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } + ) {}; + + jsx = jsx_2_8_0; + + jsxd_0_1_10 = callPackage + ( + { buildHex }: + buildHex { + name = "jsxd"; + version = "0.1.10"; + sha256 = + "f71a8238f08a1dee130e8959ff5343524891fa6531392667a5b911cead5f5082"; + + meta = { + description = + "jsx data structire traversing and modification library."; + license = stdenv.lib.licenses.cddl; + homepage = "https://github.com/Licenser/jsxd"; + }; + } + ) {}; + + jsxd = jsxd_0_1_10; + + jwalk_1_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "jwalk"; + version = "1.1.0"; + sha256 = + "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1"; + + meta = { + longDescription = ''Helper module for working with Erlang + proplist, map, EEP-18 and mochijson-style + representations of JSON''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/jr0senblum/jwalk"; + }; + } + ) {}; + + jwalk = jwalk_1_1_0; + + jwt_0_1_1 = callPackage + ( + { buildHex, base64url_0_0_1, jsx_2_8_0 }: + buildHex { + name = "jwt"; + version = "0.1.1"; + sha256 = + "abcff4a2a42af2b7b7bdf55eeb2b73ce2e3bef760750004e74bc5835d64d2188"; + + erlangDeps = [ base64url_0_0_1 jsx_2_8_0 ]; + + meta = { + description = "Erlang JWT library"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/artemeff/jwt"; + }; + } + ) {}; + + jwt = jwt_0_1_1; + + key2value_1_4_0 = callPackage + ( + { buildHex }: + buildHex { + name = "key2value"; + version = "1.4.0"; + sha256 = + "ad63453fcf54ab853581b78c6d2df56be41ea691ba4bc05920264c19f35a0ded"; + + meta = { + description = "Erlang 2-way Map"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/key2value"; + }; + } + ) {}; + + key2value_1_5_1 = callPackage + ( + { buildHex }: + buildHex { + name = "key2value"; + version = "1.5.1"; + sha256 = + "2a40464b9f8ef62e8828d869ac8d2bf9135b4956d29ba4eb044e8522b2d35ffa"; + + meta = { + description = "Erlang 2-way Map"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/key2value"; + }; + } + ) {}; + + key2value = key2value_1_5_1; + + keys1value_1_5_1 = callPackage + ( + { buildHex }: + buildHex { + name = "keys1value"; + version = "1.5.1"; + sha256 = + "2385132be0903c170fe21e54a0c3e746a604777b66ee458bb6e5f25650d3354f"; + + meta = { + description = "Erlang Set Associative Map For Key Lists"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/keys1value"; + }; + } + ) {}; + + keys1value = keys1value_1_5_1; + + lager_3_0_1 = callPackage + ( + { buildHex, goldrush_0_1_7 }: + buildHex { + name = "lager"; + version = "3.0.1"; + sha256 = + "d32c9233105b72dc5c1f6a8fe9a33cc205ecccc359c4449950060cee5a329e35"; + + erlangDeps = [ goldrush_0_1_7 ]; + + meta = { + description = "Erlang logging framework"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/basho/lager"; + }; + } + ) {}; + + lager_3_0_2 = callPackage + ( + { buildHex, goldrush_0_1_7 }: + buildHex { + name = "lager"; + version = "3.0.2"; + sha256 = + "527f3b233e01b6cb68780c14ef675ed08ec02247dc029cacecbb56c78dfca100"; + + erlangDeps = [ goldrush_0_1_7 ]; + + meta = { + description = "Erlang logging framework"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/basho/lager"; + }; + } + ) {}; + + lager = lager_3_0_2; + + + lhttpc_1_3_0 = callPackage + ( + { buildHex }: + buildHex { + name = "lhttpc"; + version = "1.3.0"; + sha256 = + "ddd2bd4b85159bc987c954b14877168e6a3c3e516105702189776e97c50296a4"; + + meta = { + description = "Lightweight HTTP/1.1 client"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/talko/lhttpc"; + }; + } + ) {}; + + lhttpc = lhttpc_1_3_0; + + libsnarlmatch_0_1_7 = callPackage + ( + { buildHex }: + buildHex { + name = "libsnarlmatch"; + version = "0.1.7"; + sha256 = + "72e9bcf7968e75774393778146ac6596116f1c60136dd607ad249183684ee380"; + + meta = { + description = "permission matcher library"; + license = stdenv.lib.licenses.cddl; + homepage = "https://github.com/project-fifo/libsnarlmatch"; + }; + } + ) {}; + + libsnarlmatch = libsnarlmatch_0_1_7; + + lru_1_3_1 = callPackage + ( + { buildHex }: + buildHex { + name = "lru"; + version = "1.3.1"; + sha256 = + "cd6ac15c383d58cd2933df9cb918617b24b12b6e5fb24d94c4c8f200fd93f619"; + + meta = { + description = "implements a fixed-size LRU cache"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/barrel-db/erlang-lru"; + }; + } + ) {}; + + lru = lru_1_3_1; + + lz4_0_2_2 = callPackage + ( + { buildHex }: + buildHex { + name = "lz4"; + version = "0.2.2"; + sha256 = + "a59522221e7cdfe3792bf8b3bb21cfe7ac657790e5826201fa2c5d0bc7484a2d"; + compilePort = true; + + meta = { + description = "LZ4 bindings for Erlang"; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/szktty/erlang-lz4.git"; + }; + } + ) {}; + + lz4 = lz4_0_2_2; + + mcrypt_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "mcrypt"; + version = "0.1.0"; + sha256 = + "508a35ba255190f80309dcabf9c81c88b86b9ec13af180627ad51b8e5cf2a4cd"; + compilePort = true; + + meta = { + description = "NIF wrapper around libmcrypt."; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/system76/elixir-mcrypt"; + }; + } + ) {}; + + mcrypt = mcrypt_0_1_0; + + mdns_server_0_2_0 = callPackage + ( + { buildHex }: + buildHex { + name = "mdns_server"; + version = "0.2.0"; + sha256 = + "bc9465880e15e57033960ab6820258b87134bef69032210c67e53e3718e289d0"; + + meta = { + description = "mDNS service discovery server"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/Licenser/erlang-mdns-server"; + }; + } + ) {}; + + mdns_server = mdns_server_0_2_0; + + mdns_server_lib_0_2_3 = callPackage + ( + { buildHex, lager_3_0_2, mdns_server_0_2_0, ranch_1_1_0 }: + buildHex { + name = "mdns_server_lib"; + version = "0.2.3"; + sha256 = + "078775ccea5d768095716ca6bd82f657601203352495d9726f4cc080c8c07695"; + + erlangDeps = [ lager_3_0_2 mdns_server_0_2_0 ranch_1_1_0 ]; + + meta = { + description = + "server side for mdns client server implementation"; + license = stdenv.lib.licenses.cddl; + homepage = "https://github.com/Licenser/mdns_server_lib"; + }; + } + ) {}; + + mdns_server_lib = mdns_server_lib_0_2_3; + + meck_0_8_3 = callPackage + ( + { buildHex }: + buildHex { + name = "meck"; + version = "0.8.3"; + sha256 = + "53bd3873d0193d6b2b4a165cfc4b9ffc3934355c3ba19e88239ef6a027cc02b6"; + + meta = { + description = "A mocking framework for Erlang"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/eproxus/meck"; + }; + } + ) {}; + + meck_0_8_4 = callPackage + ( + { buildHex }: + buildHex { + name = "meck"; + version = "0.8.4"; + sha256 = + "2cdfbd0edd8f62b3d2061efc03c0e490282dd2ea6de44e15d2006e83f4f8eead"; + + meta = { + description = "A mocking framework for Erlang"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/eproxus/meck"; + }; + } + ) {}; + + meck = meck_0_8_4; + + metrics_0_2_1 = callPackage + ( + { buildHex }: + buildHex { + name = "metrics"; + version = "0.2.1"; + sha256 = + "1cccc3534fa5a7861a3dcc0414afba00a616937e82c95d6172a523a5d2e97c03"; + + meta = { + description = + "A generic interface to different metrics systems in Erlang."; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/benoitc/erlang-metrics"; + }; + } + ) {}; + + metrics = metrics_0_2_1; + + mimerl_1_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "mimerl"; + version = "1.0.0"; + sha256 = + "a30b01104a29bd3a363db8646e4ce0f7980f9ecd23a98707c46c3ced918c41b4"; + + meta = { + description = "Library to handle mimetypes"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/benoitc/mimerl"; + }; + } + ) {}; + + mimerl_1_0_2 = callPackage + ( + { buildHex }: + buildHex { + name = "mimerl"; + version = "1.0.2"; + sha256 = + "7a4c8e1115a2732a67d7624e28cf6c9f30c66711a9e92928e745c255887ba465"; + + meta = { + description = "Library to handle mimetypes"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/benoitc/mimerl"; + }; + } + ) {}; + + mimerl_1_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "mimerl"; + version = "1.1.0"; + sha256 = + "def0f1922a5dcdeeee6e4f41139b364e7f0f40239774b528a0986b12bcb42ddc"; + + meta = { + description = "Library to handle mimetypes"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/benoitc/mimerl"; + }; + } + ) {}; + + mimerl = mimerl_1_1_0; + + mochiweb_2_12_2 = callPackage + ( + { buildHex }: + buildHex { + name = "mochiweb"; + version = "2.12.2"; + sha256 = + "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a"; + + meta = { + description = + "MochiWeb is an Erlang library for building lightweight HTTP servers. +"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/mochi/mochiweb"; + }; + } + ) {}; + + mochiweb = mochiweb_2_12_2; + + mtx_1_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "mtx"; + version = "1.0.0"; + sha256 = + "3bdcb209fe3cdfc5a6b5b95f619ecd123b7ee1d9203ace2178c8ff73be5bb90f"; + + meta = { + description = "Metrics Client"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/synrc/mtx"; + }; + } + ) {}; + + mtx = mtx_1_0_0; + + nacl_0_3_0 = callPackage + ( + { buildHex }: + buildHex { + name = "nacl"; + version = "0.3.0"; + sha256 = + "83a626d0ddd17a9c9528aa57a79e0e19746a42def007bc48c4984f0905098a7b"; + compilePort = true; + + meta = { + description = "Erlang-NaCl hex package"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/tonyg/erlang-nacl"; + }; + } + ) {}; + + nacl = nacl_0_3_0; + + neotoma_1_7_3 = callPackage + ( + { buildHex }: + buildHex { + name = "neotoma"; + version = "1.7.3"; + sha256 = + "2da322b9b1567ffa0706a7f30f6bbbde70835ae44a1050615f4b4a3d436e0f28"; + + meta = { + description = "PEG/Packrat toolkit and parser-generator."; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/seancribbs/neotoma"; + }; + } + ) {}; + + neotoma = neotoma_1_7_3; + + observer_cli_1_0_3 = callPackage + ( + { buildHex, recon_2_2_1 }: + buildHex { + name = "observer_cli"; + version = "1.0.3"; + sha256 = + "18e5d9aa5412ec063cf9719bcfe73bf990c5fed5c9a3c8422c2b5d9529fc8b0d"; + + erlangDeps = [ recon_2_2_1 ]; + + meta = { + description = "Visualize Erlang Nodes On The Command Line"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/zhongwencool/observer_cli"; + }; + } + ) {}; + + observer_cli = observer_cli_1_0_3; + + p1_stringprep_1_0_0 = callPackage + ( + { buildHex, p1_utils_1_0_1 }: + buildHex { + name = "p1_stringprep"; + version = "1.0.0"; + sha256 = + "2a9ce90acb64089f0a34cc592690b398830a5b6fd3c8a84689af5d2feb85d876"; + compilePort = true; + erlangDeps = [ p1_utils_1_0_1 ]; + + meta = { + description = "Fast Stringprep Erlang / Elixir implementation"; + license = with stdenv.lib.licenses; [ asl20 free ]; + homepage = "https://github.com/processone/stringprep"; + }; + } + ) {}; + + p1_stringprep = p1_stringprep_1_0_0; + + p1_utils_1_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "p1_utils"; + version = "1.0.0"; + sha256 = + "b2c6316286b071f2f667fb1c59b44fe0c996917515fa93374a4a3264affc5105"; + + meta = { + description = "Erlang utility modules from ProcessOne"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/processone/p1_utils"; + }; + } + ) {}; + + p1_utils_1_0_1 = callPackage + ( + { buildHex }: + buildHex { + name = "p1_utils"; + version = "1.0.1"; + sha256 = + "8e19478439c3ef05229fbd4fb65ff2e4aee02458a9c2b86a103a7f1384b76fdb"; + + meta = { + description = "Erlang utility modules from ProcessOne"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/processone/p1_utils"; + }; + } + ) {}; + + p1_utils_1_0_2 = callPackage + ( + { buildHex }: + buildHex { + name = "p1_utils"; + version = "1.0.2"; + sha256 = + "c4b770fd925f2fc6c301a1e27f1bfb77aff3fff8d0951cc56c06bef9835af918"; + + meta = { + description = "Erlang utility modules from ProcessOne"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/processone/p1_utils"; + }; + } + ) {}; + + p1_utils_1_0_3 = callPackage + ( + { buildHex }: + buildHex { + name = "p1_utils"; + version = "1.0.3"; + sha256 = + "6bf7dc7108eee70e036ea745faf5f55b4354e267f14371ea13338f58ce402d5e"; + + meta = { + description = "Erlang utility modules from ProcessOne"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/processone/p1_utils"; + }; + } + ) {}; + + p1_utils = p1_utils_1_0_3; + + p1_xml_1_1_1 = callPackage + ( + { buildHex, p1_utils_1_0_0 }: + buildHex { + name = "p1_xml"; + version = "1.1.1"; + sha256 = + "ab68956163cc5ff8c749c503507a36c543841259e78c58a2bbe0ebe76a0b7ce3"; + compilePort = true; + erlangDeps = [ p1_utils_1_0_0 ]; + + meta = { + description = + "XML parsing library. Now obsolete. Use fast_xml instead"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/processone/xml"; + }; + } + ) {}; + + p1_xml = p1_xml_1_1_1; + + pc_1_2_0 = callPackage + ( + { buildHex }: + buildHex { + name = "pc"; + version = "1.2.0"; + sha256 = + "ef0f59d26a25af0a5247ef1a06d28d8300f8624647b02dc521ac79a7eceb8883"; + + meta = { + description = "a rebar3 port compiler for native code"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/blt/port_compiler"; + }; + } + ) {}; + + pc = pc_1_2_0; + + picosat_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "picosat"; + version = "0.1.0"; + sha256 = + "d9bfa31240906306a6dae6bdd6fb1cb452e9462a391efa63017b17b2877cab51"; + compilePort = true; + + meta = { + description = "Erlang bindings for PicoSAT"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/tsloughter/picosat"; + }; + } + ) {}; + + picosat = picosat_0_1_0; + + png_0_1_1 = callPackage + ( + { buildHex }: + buildHex { + name = "png"; + version = "0.1.1"; + sha256 = + "f8d4a17c118dcc16bb18d0fda6e26947001f9312bc6c061d2236b424fc3dd9ea"; + + meta = { + longDescription = ''A pure Erlang library for creating PNG + images. It can currently create 8 and 16 bit + RGB, RGB with alpha, indexed, grayscale and + grayscale with alpha images.''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/yuce/png"; + }; + } + ) {}; + + png = png_0_1_1; + + poolboy_1_5_1 = callPackage + ( + { buildHex }: + buildHex { + name = "poolboy"; + version = "1.5.1"; + sha256 = + "8f7168911120e13419e086e78d20e4d1a6776f1eee2411ac9f790af10813389f"; + + meta = { + description = "A hunky Erlang worker pool factory"; + license = with stdenv.lib.licenses; [ unlicense asl20 ]; + homepage = "https://github.com/devinus/poolboy"; + }; + } + ) {}; + + poolboy = poolboy_1_5_1; + + pooler_1_5_0 = callPackage + ( + { buildHex }: + buildHex { + name = "pooler"; + version = "1.5.0"; + sha256 = + "f493b4b947967fa4250dd1f96e86a5440ecab51da114d2c256cced58ad991908"; + + meta = { + description = "An OTP Process Pool Application"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/seth/pooler"; + }; + } + ) {}; + + pooler = pooler_1_5_0; + + pot_0_9_3 = callPackage + ( + { buildHex }: + buildHex { + name = "pot"; + version = "0.9.3"; + sha256 = + "752d2605c15605cd455cb3514b1ce329309eb61dfa88397dce49772dac9ad581"; + + meta = { + description = "One Time Passwords for Erlang"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + pot = pot_0_9_3; + + pqueue_1_5_1 = callPackage + ( + { buildHex }: + buildHex { + name = "pqueue"; + version = "1.5.1"; + sha256 = + "7ba01afe6b50ea4b239fa770f9e2c2db4871b3927ac44aea180d1fd52601b317"; + + meta = { + description = "Erlang Priority Queue Implementation"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/pqueue"; + }; + } + ) {}; + + pqueue = pqueue_1_5_1; + + proper_1_1_1_beta = callPackage + ( + { buildHex }: + buildHex { + name = "proper"; + version = "1.1.1-beta"; + sha256 = + "bde5c0fef0f8d804a7c06aab4f293d19f42149e5880b3412b75efa608e86d342"; + + meta = { + description = + "QuickCheck-inspired property-based testing tool for Erlang."; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/manopapad/proper"; + }; + } + ) {}; + + proper = proper_1_1_1_beta; + + providers_1_6_0 = callPackage + ( + { buildHex, getopt_0_8_2 }: + buildHex { + name = "providers"; + version = "1.6.0"; + sha256 = + "0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f"; + + erlangDeps = [ getopt_0_8_2 ]; + + meta = { + description = "Providers provider."; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/tsloughter/providers"; + }; + } + ) {}; + + providers = providers_1_6_0; + + quickrand_1_5_1 = callPackage + ( + { buildHex }: + buildHex { + name = "quickrand"; + version = "1.5.1"; + sha256 = + "0b3dcc6ddb23319c1f6a5ed143778864b8ad2f0ebd693a2d121cf5ae0c4db507"; + + meta = { + longDescription = ''Quick Random Number Generation: Provides a + simple interface to call efficient random number + generation functions based on the context. + Proper random number seeding is enforced.''; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/quickrand"; + }; + } + ) {}; + + quickrand = quickrand_1_5_1; + + quintana_0_2_0 = callPackage + ( + { buildHex, folsom_0_8_3 }: + buildHex { + name = "quintana"; + version = "0.2.0"; + sha256 = + "0646fe332ca3415ca6b0b273b4a5689ec902b9f9004ca62229ded00bd5f64cda"; + + erlangDeps = [ folsom_0_8_3 ]; + + meta = { + description = "Wrapper around some Folsom functions"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + quintana_0_2_1 = callPackage + ( + { buildHex, folsom_0_8_3 }: + buildHex { + name = "quintana"; + version = "0.2.1"; + sha256 = + "d4683eb33c71f6cab3b17b896b4fa9180f17a0a8b086440bfe0c5675182f0194"; + + erlangDeps = [ folsom_0_8_3 ]; + + meta = { + description = "Wrapper around some Folsom functions"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + quintana = quintana_0_2_1; + + rabbit_common_3_5_6 = callPackage + ( + { buildHex }: + buildHex { + name = "rabbit_common"; + version = "3.5.6"; + sha256 = + "9335ab3ebc4e8e140d7bc9b1b0e7ee99c0aa87d0a746b704184121ba35c04f1c"; + + meta = { + longDescription = ''Includes modules which are a runtime + dependency of the RabbitMQ/AMQP Erlang client + and are common to the RabbitMQ server.''; + license = stdenv.lib.licenses.mpl11; + homepage = "https://github.com/jbrisbin/rabbit_common"; + }; + } + ) {}; + + rabbit_common = rabbit_common_3_5_6; + + ranch_1_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "ranch"; + version = "1.1.0"; + sha256 = + "98ade939e63e6567da5dec5bc5bd93cbdc53d53f8b1aa998adec60dc4057f048"; + + meta = { + description = "Socket acceptor pool for TCP protocols."; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/ninenines/ranch"; + }; + } + ) {}; + + ranch_1_2_0 = callPackage + ( + { buildHex }: + buildHex { + name = "ranch"; + version = "1.2.0"; + sha256 = + "82bbb48cdad151000f7ad600d7a29afd972df409fde600bbc9b1ed4fdc08c399"; + + meta = { + description = "Socket acceptor pool for TCP protocols."; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/ninenines/ranch"; + }; + } + ) {}; + + ranch = ranch_1_2_0; + + ratx_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "ratx"; + version = "0.1.0"; + sha256 = + "fbf933ff32fdc127200880f5b567820bf03504ade1bd697ffbc0535dbafc23d6"; + + meta = { + description = + "Rate limiter and overload protection for erlang and elixir applications. +"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/liveforeverx/ratx"; + }; + } + ) {}; + + ratx = ratx_0_1_0; + + rebar3_asn1_compiler_1_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "rebar3_asn1_compiler"; + version = "1.0.0"; + sha256 = + "25ec1d5c97393195650ac8c7a06a267a886a1479950ee047c43b5228c07b30b9"; + + meta = { + description = "Compile ASN.1 modules with Rebar3"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/pyykkis/rebar3_asn1_compiler"; + }; + } + ) {}; + + rebar3_asn1_compiler = rebar3_asn1_compiler_1_0_0; + + rebar3_auto_0_3_0 = callPackage + ( + { buildHex, enotify_0_1_0 }: + buildHex { + name = "rebar3_auto"; + version = "0.3.0"; + sha256 = + "9fcca62411b0b7680426bd911002c0769690aef3838829583ffa4547fd5038b5"; + + erlangDeps = [ enotify_0_1_0 ]; + + meta = { + description = "Rebar3 plugin for auto compiling on changes"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/tsloughter/rebar3_auto"; + }; + } + ) {}; + + rebar3_auto = rebar3_auto_0_3_0; + + rebar3_diameter_compiler_0_3_1 = callPackage + ( + { buildHex }: + buildHex { + name = "rebar3_diameter_compiler"; + version = "0.3.1"; + sha256 = + "c5965e3810ccf9ef9ba9185a81fe569ef6e9f3a9e546e99c5e900736b0c39274"; + + meta = { + description = "Compile diameter .dia files"; + license = stdenv.lib.licenses.mit; + homepage = + "https://github.com/carlosedp/rebar3_diameter_compiler"; + }; + } + ) {}; + + rebar3_diameter_compiler = rebar3_diameter_compiler_0_3_1; + + rebar3_hex_1_12_0 = callPackage + ( + { buildHex }: + buildHex { + name = "rebar3_hex"; + version = "1.12.0"; + sha256 = + "45467e93ae8d776c6038fdaeaffbc55d8f2f097f300a54dab9b81c6d1cf21f73"; + + meta = { + description = "Hex.pm plugin for rebar3"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/tsloughter/rebar3_hex"; + }; + } + ) {}; + + rebar3_hex = rebar3_hex_1_12_0; + + rebar3_idl_compiler_0_3_0 = callPackage + ( + { buildHex }: + buildHex { + name = "rebar3_idl_compiler"; + version = "0.3.0"; + sha256 = + "31ba95205c40b990cb3c49abb397abc47b4d5f9c402db83f9daebbc44e69789d"; + + meta = { + description = "Rebar3 IDL Compiler"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/sebastiw/rebar3_idl_compiler"; + }; + } + ) {}; + + rebar3_idl_compiler = rebar3_idl_compiler_0_3_0; + + rebar3_live_0_1_3 = callPackage + ( + { buildHex, enotify_0_1_0 }: + buildHex { + name = "rebar3_live"; + version = "0.1.3"; + sha256 = + "d9ee2ff022fc73ac94f206c13ff8aa7591a536704f49c4cbacabf37d181a4391"; + + erlangDeps = [ enotify_0_1_0 ]; + + meta = { + description = "Rebar3 live plugin"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/pvmart/rebar3_live"; + }; + } + ) {}; + + rebar3_live = rebar3_live_0_1_3; + + rebar3_neotoma_plugin_0_2_0 = callPackage + ( + { buildHex, neotoma_1_7_3 }: + buildHex { + name = "rebar3_neotoma_plugin"; + version = "0.2.0"; + sha256 = + "c0ebbdb08c017cac90c7d3310a9bd4a5088a46abd4e2fef9e9a9805a657396b8"; + + erlangDeps = [ neotoma_1_7_3 ]; + + meta = { + description = "Neotoma rebar plugin"; + license = stdenv.lib.licenses.free; + homepage = + "https://github.com/zamotivator/rebar3_neotoma_plugin"; + }; + } + ) {}; + + rebar3_neotoma_plugin = rebar3_neotoma_plugin_0_2_0; + + rebar3_proper_plugin_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "rebar3_proper_plugin"; + version = "0.1.0"; + sha256 = + "7071555afb623e73a2c572de6d4379f9c197b44e68608944eb2835617faed10d"; + + meta = { + description = "A rebar plugin"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + rebar3_proper_plugin = rebar3_proper_plugin_0_1_0; + + rebar3_run_0_2_0 = callPackage + ( + { buildHex }: + buildHex { + name = "rebar3_run"; + version = "0.2.0"; + sha256 = + "321e0647893957d1bb05a88d940a8a3b9129097d63529e13f815c4857bf29497"; + compilePort = true; + + meta = { + description = "A rebar plugin"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/tsloughter/rebar3_run"; + }; + } + ) {}; + + rebar3_run = rebar3_run_0_2_0; + + rebar_alias_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "rebar_alias"; + version = "0.1.0"; + sha256 = + "59fb42b39964af3a29ebe94c11247f618dd4d5e4e1a69cfaffabbed03ccff70f"; + + meta = { + description = "A rebar plugin"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + rebar_alias = rebar_alias_0_1_0; + + rebar_erl_vsn_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "rebar_erl_vsn"; + version = "0.1.0"; + sha256 = + "7cf1e2e85a80785a4e4e1529a2c837dbd2d540214cf791214e56f931e5e9865d"; + + meta = { + description = "defines for erlang versions"; + license = stdenv.lib.licenses.mit; + }; + } + ) {}; + + rebar_erl_vsn = rebar_erl_vsn_0_1_0; + + recon_2_2_1 = callPackage + ( + { buildHex }: + buildHex { + name = "recon"; + version = "2.2.1"; + sha256 = + "6c548ad0f4916495a78977674a251847869f85b5125b7c2a44da3178955adfd1"; + + meta = { + longDescription = ''Recon wants to be a set of tools usable in + production to diagnose Erlang problems or + inspect production environment safely.''; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/ferd/recon"; + }; + } + ) {}; + + recon = recon_2_2_1; + + redo_2_0_1 = callPackage + ( + { buildHex }: + buildHex { + name = "redo"; + version = "2.0.1"; + sha256 = + "f7b2be8c825ec34413c54d8f302cc935ce4ecac8421ae3914c5dadd816dcb1e6"; + + meta = { + description = "Pipelined Redis Erlang Driver"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/heroku/redo"; + }; + } + ) {}; + + redo = redo_2_0_1; + + relflow_1_0_4 = callPackage + ( + { buildHex }: + buildHex { + name = "relflow"; + version = "1.0.4"; + sha256 = + "e6d9652ed7511aea18fa012d5abc19301acd8cbe81a44a159391086a5be12e1f"; + + meta = { + description = "Rebar3 release workflow plugin"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + relflow = relflow_1_0_4; + + reltool_util_1_4_0 = callPackage + ( + { buildHex }: + buildHex { + name = "reltool_util"; + version = "1.4.0"; + sha256 = + "a625874976fffe8ab56d4b5b7d5fd37620a2692462bbe24ae003ab13052ef0d3"; + + meta = { + description = "Erlang reltool utility functionality application"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/reltool_util"; + }; + } + ) {}; + + reltool_util_1_5_1 = callPackage + ( + { buildHex }: + buildHex { + name = "reltool_util"; + version = "1.5.1"; + sha256 = + "746e16871afdcf85d8a115389193c8d660d0df1d26d6ac700590e0ad252646b1"; + + meta = { + description = "Erlang reltool utility functionality application"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/reltool_util"; + }; + } + ) {}; + + reltool_util = reltool_util_1_5_1; + + relx_3_11_0 = callPackage + ( + { + buildHex, + bbmustache_1_0_4, + cf_0_2_1, + erlware_commons_0_18_0, + getopt_0_8_2, + providers_1_6_0 + }: + buildHex { + name = "relx"; + version = "3.11.0"; + sha256 = + "cf212af96003417ff710e0c9df46034ae14c880a74919df91563e4f149d5c798"; + + erlangDeps = [ + bbmustache_1_0_4 + cf_0_2_1 + erlware_commons_0_18_0 + getopt_0_8_2 + providers_1_6_0 + ]; + + meta = { + description = "Release assembler for Erlang/OTP Releases"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/erlware/relx"; + }; + } + ) {}; + + relx = relx_3_11_0; + + reup_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "reup"; + version = "0.1.0"; + sha256 = + "949a672190119f8b24160167e3685fdd5397474f98dc875ccfd31378ebd68506"; + + meta = { + description = + "dev watcher that auto compiles and reloads modules"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + reup = reup_0_1_0; + + savory_0_0_2 = callPackage + ( + { buildHex }: + buildHex { + name = "savory"; + version = "0.0.2"; + sha256 = + "a45ef32a6f45092e1328bc1eb47bda3c8f992afe863aaa73c455f31b0c8591b9"; + + meta = { + longDescription = ''An Elixir implementation of Freza's salt_nif + which interfaces with libsodium, a wrapper for + the cryptographic primitive libary NaCl. ''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/electricFeel/savory"; + }; + } + ) {}; + + savory = savory_0_0_2; + + sbroker_0_7_0 = callPackage + ( + { buildHex }: + buildHex { + name = "sbroker"; + version = "0.7.0"; + sha256 = + "5bc0bfd79896fd5b92072a71fa4a1e120f4110f2cf9562a0b9dd2fcfe9e5cfd2"; + + meta = { + description = + "Process broker for dispatching with backpressure and load shedding"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/fishcakez/sbroker"; + }; + } + ) {}; + + sbroker = sbroker_0_7_0; + + serial_0_1_2 = callPackage + ( + { buildHex }: + buildHex { + name = "serial"; + version = "0.1.2"; + sha256 = + "c0aed287f565b7ce1e1091a6a3dd08fd99bf0884c81b53ecf978c502ef652231"; + + meta = { + description = "Serial communication through Elixir ports"; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/bitgamma/elixir_serial"; + }; + } + ) {}; + + serial = serial_0_1_2; + + sfmt_0_10_1 = callPackage + ( + { buildHex }: + buildHex { + name = "sfmt"; + version = "0.10.1"; + sha256 = + "5f9d8206762306743986a3f35602bb40b35bcff68752a8ae12519c0b7c25fab2"; + compilePort = true; + + meta = { + description = + "SIMD-oriented Fast Mersenne Twister (SFMT) for Erlang. +"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/jj1bdx/sfmt-erlang/"; + }; + } + ) {}; + + sfmt = sfmt_0_10_1; + + sidejob_2_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "sidejob"; + version = "2.0.0"; + sha256 = + "19fea24060a1d0d37e78480fbd79d6b95e07f445aad725f7124a23194641c743"; + + meta = { + longDescription = ''sidejob is an Erlang library that implements + a parallel, capacity-limited request pool. In + sidejob, these pools are called resources. A + resource is managed by multiple gen_server like + processes which can be sent calls and casts + using sidejob:call or sidejob:cast respectively. + This library was originally written to support + process bounding in Riak using the + sidejob_supervisor behavior. In Riak, this is + used to limit the number of concurrent get/put + FSMs that can be active, failing client requests + with {error, overload} if the limit is ever hit. + The purpose being to provide a fail-safe + mechanism during extreme overload scenarios. ''; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/basho/sidejob"; + }; + } + ) {}; + + sidejob = sidejob_2_0_0; + + siphash_2_1_1 = callPackage + ( + { buildHex }: + buildHex { + name = "siphash"; + version = "2.1.1"; + sha256 = + "69f2a3b8acac101f7894ea80c15b29dbf7dfa55ea2800731cd5d04621cc22eee"; + compilePort = true; + + meta = { + description = "Elixir implementation of the SipHash hash family"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/zackehh/siphash-elixir"; + }; + } + ) {}; + + siphash = siphash_2_1_1; + + slp_0_0_2 = callPackage + ( + { buildHex }: + buildHex { + name = "slp"; + version = "0.0.2"; + sha256 = + "27e5f7330c7ce631f16e3ec5781b31cbb2247d2bcdeab1e979a66dcc4397bd77"; + + meta = { + longDescription = ''An Elixir application for using the Service + Location Protocol. SLP is a commonly used + service discovery protocol.''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/stuart/elixir_slp"; + }; + } + ) {}; + + slp = slp_0_0_2; + + smurf_0_1_3 = callPackage + ( + { buildHex }: + buildHex { + name = "smurf"; + version = "0.1.3"; + sha256 = + "5ed8e18ec8eea0647e7e938ce15cc76e59497d0a259cea15124520a48f0d6be6"; + + meta = { + description = "SMF interfacing library for erlang"; + license = stdenv.lib.licenses.cddl; + homepage = "https://github.com/project-fifo/smurf"; + }; + } + ) {}; + + smurf = smurf_0_1_3; + + snappy_1_1_1 = callPackage + ( + { buildHex }: + buildHex { + name = "snappy"; + version = "1.1.1"; + sha256 = + "7faed3ec6bcac363c2a6f09b4f000a12c8166b42b3bf70228d532f8afcfbcb6a"; + compilePort = true; + + meta = { + description = + "snappy compressor/decompressor Erlang NIF wrapper"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/barrel-db/snappy"; + }; + } + ) {}; + + snappy = snappy_1_1_1; + + ssl_verify_hostname_1_0_5 = callPackage + ( + { buildHex }: + buildHex { + name = "ssl_verify_hostname"; + version = "1.0.5"; + sha256 = + "f2cb11e6144e10ab39d1e14bf9fb2437b690979c70bf5428e9dc4bfaf1dfeabf"; + + meta = { + description = "Hostname verification library for Erlang"; + license = stdenv.lib.licenses.mit; + homepage = + "https://github.com/deadtrickster/ssl_verify_hostname.erl"; + }; + } + ) {}; + + ssl_verify_hostname_1_0_6 = callPackage + ( + { buildHex }: + buildHex { + name = "ssl_verify_hostname"; + version = "1.0.6"; + sha256 = + "72b2fc8a8e23d77eed4441137fefa491bbf4a6dc52e9c0045f3f8e92e66243b5"; + + meta = { + description = "Hostname verification library for Erlang"; + license = stdenv.lib.licenses.mit; + homepage = + "https://github.com/deadtrickster/ssl_verify_hostname.erl"; + }; + } + ) {}; + + ssl_verify_hostname = ssl_verify_hostname_1_0_6; + + strftimerl_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "strftimerl"; + version = "0.1.0"; + sha256 = + "8c372b282b31f3de24ed1281d4974087421fc44a27d0f31b285ad97a9e6bb616"; + + meta = { + description = "strftime formatting in erlang"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/gmr/strftimerl"; + }; + } + ) {}; + + strftimerl = strftimerl_0_1_0; + + supool_1_5_1 = callPackage + ( + { buildHex }: + buildHex { + name = "supool"; + version = "1.5.1"; + sha256 = + "c191d63ff19ae177bf4cfba02303ae4552d8b48ec4133e24053e037513dfae09"; + + meta = { + description = "Erlang Process Pool as a Supervisor"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/supool"; + }; + } + ) {}; + + supool = supool_1_5_1; + + syslog_1_0_2 = callPackage + ( + { buildHex }: + buildHex { + name = "syslog"; + version = "1.0.2"; + sha256 = + "ca158a84afe482f77cb4668383a6108f1e9190fcdf3035858f426b91b2021bf6"; + compilePort = true; + + meta = { + description = + "Erlang port driver for interacting with syslog via syslog"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/Vagabond/erlang-syslog"; + }; + } + ) {}; + + syslog = syslog_1_0_2; + + tea_crypto_1_0_0 = callPackage + ( + { buildHex }: + buildHex { + name = "tea_crypto"; + version = "1.0.0"; + sha256 = + "0e7e60d0afe79f0624faa8a358a3a00c912cfa548f3632383927abca4db29cc6"; + + meta = { + description = "A TEA implementation in Erlang. +"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/keichan34/tea_crypto"; + }; + } + ) {}; + + tea_crypto = tea_crypto_1_0_0; + + termcap_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "termcap"; + version = "0.1.0"; + sha256 = + "8c5167d68759bd1cd020eeaf5fd94153430fd19fa5a5fdeeb0b3129f0aba2a21"; + + meta = { + description = "Pure erlang termcap library"; + license = stdenv.lib.licenses.mit; + }; + } + ) {}; + + termcap = termcap_0_1_0; + + tinymt_0_2_0 = callPackage + ( + { buildHex }: + buildHex { + name = "tinymt"; + version = "0.2.0"; + sha256 = + "1ab2b2bd4e02ccf3f83ca6b2429c41110adaf2068c727d37a2e27a0207eccfe0"; + + meta = { + description = "Tiny Mersenne Twister (TinyMT) for Erlang +"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/jj1bdx/tinymt-erlang/"; + }; + } + ) {}; + + tinymt = tinymt_0_2_0; + + trie_1_5_0 = callPackage + ( + { buildHex }: + buildHex { + name = "trie"; + version = "1.5.0"; + sha256 = + "613981536e33f58d92e44bd31801376f71deee0e57c63372fe8ab5fbbc37f7dc"; + + meta = { + description = "Erlang Trie Implementation"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/trie"; + }; + } + ) {}; + + trie_1_5_1 = callPackage + ( + { buildHex }: + buildHex { + name = "trie"; + version = "1.5.1"; + sha256 = + "4b845dccfca8962b90584e98d270e2ff43e2e181bb046c4aae0e0f457679f98d"; + + meta = { + description = "Erlang Trie Implementation"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/trie"; + }; + } + ) {}; + + trie = trie_1_5_1; + + tsuru_1_0_2 = callPackage + ( + { buildHex }: + buildHex { + name = "tsuru"; + version = "1.0.2"; + sha256 = + "b586ad8d47799a086e4225494f5e3cf4e306ca255a173a4b48fe51d542cefb6b"; + + meta = { + description = + "A collection of useful tools for Erlang applications"; + license = stdenv.lib.licenses.mit; + }; + } + ) {}; + + tsuru = tsuru_1_0_2; + + ui_0_1_1 = callPackage + ( + { buildHex }: + buildHex { + name = "ui"; + version = "0.1.1"; + sha256 = + "492da59ca39055c0dfc794a2ebd564adb9ed635402c7b46659981f32aa9d94c1"; + + meta = { + description = "An OTP application"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + ui = ui_0_1_1; + + uri_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "uri"; + version = "0.1.0"; + sha256 = + "3833c3b5745fc0822df86c3a3591219048026fea8a535223b440d26029218996"; + + meta = { + description = "URI Parsing/Encoding Library"; + license = stdenv.lib.licenses.free; + }; + } + ) {}; + + uri = uri_0_1_0; + + varpool_1_5_1 = callPackage + ( + { buildHex }: + buildHex { + name = "varpool"; + version = "1.5.1"; + sha256 = + "ff6059bdcd0efad606e8c54ee623cfeaef59778c18e343dd772e84d99d188e26"; + + meta = { + description = "Erlang Process Pools as a Local Variable"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/varpool"; + }; + } + ) {}; + + varpool = varpool_1_5_1; + + weber_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "weber"; + version = "0.1.0"; + sha256 = + "742c45b3c99e207dd0aeccb818edd2ace4af10699c96fbcee0ce2f692dc5fe12"; + + meta = { + description = "weber - is Elixir MVC web framework."; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/elixir-web/weber"; + }; + } + ) {}; + + weber = weber_0_1_0; + + websocket_client_1_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "websocket_client"; + version = "1.1.0"; + sha256 = + "21c3d0df073634f2ca349af5b54a61755d637d6390c34d8d57c064f68ca92acd"; + + meta = { + description = "Erlang websocket client"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/sanmiguel/websocket_client"; + }; + } + ) {}; + + websocket_client = websocket_client_1_1_0; + + worker_pool_1_0_4 = callPackage + ( + { buildHex }: + buildHex { + name = "worker_pool"; + version = "1.0.4"; + sha256 = + "7854a3b94e9624728db3a0475d00e7d0728adf3bf2ee3802bbf8ca10356d6f64"; + + meta = { + description = "Erlang Worker Pool"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/inaka/worker_pool"; + }; + } + ) {}; + + worker_pool = worker_pool_1_0_4; + + wpa_supplicant_0_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "wpa_supplicant"; + version = "0.1.0"; + sha256 = + "8a73ca51203401755d42ba636918106540aa3723006dab344dc8a7ec8fa2f3d5"; + + meta = { + longDescription = ''Elixir interface to the wpa_supplicant + daemon. The wpa_supplicant provides application + support for scanning for access points, managing + Wi-Fi connections, and handling all of the + security and other parameters associated with + Wi-Fi. ''; + license = with stdenv.lib.licenses; [ asl20 free ]; + homepage = "https://github.com/fhunleth/wpa_supplicant.ex"; + }; + } + ) {}; + + wpa_supplicant = wpa_supplicant_0_1_0; + + zipper_0_1_4 = callPackage + ( + { buildHex }: + buildHex { + name = "zipper"; + version = "0.1.4"; + sha256 = + "0037f29a5c5a96a9db49e9131f1071a48fcbd5959b74f1d8b6d22945a7ac46b9"; + + meta = { + description = "Generic Zipper Implementation for Erlang"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/inaka/zipper"; + }; + } + ) {}; + + zipper = zipper_0_1_4; + + }; +in self diff --git a/pkgs/development/erlang-modules/hex/esqlite.nix b/pkgs/development/erlang-modules/hex/esqlite.nix deleted file mode 100644 index 1fc3a2e91dc..00000000000 --- a/pkgs/development/erlang-modules/hex/esqlite.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildHex, rebar3-pc }: - -buildHex { - name = "esqlite"; - version = "0.2.1"; - sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr"; - compilePorts = true; -} diff --git a/pkgs/development/erlang-modules/hex/goldrush.nix b/pkgs/development/erlang-modules/hex/goldrush.nix deleted file mode 100644 index ddff7f6cc56..00000000000 --- a/pkgs/development/erlang-modules/hex/goldrush.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ buildHex, fetchurl }: - -buildHex { - name = "goldrush"; - version = "0.1.7"; - sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9"; -} diff --git a/pkgs/development/erlang-modules/hex/ibrowse.nix b/pkgs/development/erlang-modules/hex/ibrowse.nix deleted file mode 100644 index 6ed189eb39d..00000000000 --- a/pkgs/development/erlang-modules/hex/ibrowse.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildHex }: - -buildHex { - name = "ibrowse"; - version = "4.2.2"; - sha256 = "1bn0645n95j5zypdsns1w4kgd3q9lz8fj898hg355j5w89scn05q"; -} - diff --git a/pkgs/development/erlang-modules/hex/jiffy.nix b/pkgs/development/erlang-modules/hex/jiffy.nix deleted file mode 100644 index b9f92c888a4..00000000000 --- a/pkgs/development/erlang-modules/hex/jiffy.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildHex }: - -buildHex { - name = "jiffy"; - version = "0.14.5"; - hexPkg = "barrel_jiffy"; - sha256 = "0iqz8bp0f672c5rfy5dpw9agv2708wzldd00ngbsffglpinlr1wa"; -} diff --git a/pkgs/development/erlang-modules/hex/lager.nix b/pkgs/development/erlang-modules/hex/lager.nix deleted file mode 100644 index acfefd5757c..00000000000 --- a/pkgs/development/erlang-modules/hex/lager.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildHex, goldrush }: - -buildHex { - name = "lager"; - version = "3.0.2"; - sha256 = "0051zj6wfmmvxjn9q0nw8wic13nhbrkyy50cg1lcpdh17qiknzsj"; - erlangDeps = [ goldrush ]; -} diff --git a/pkgs/development/erlang-modules/hex/meck.nix b/pkgs/development/erlang-modules/hex/meck.nix deleted file mode 100644 index 5af8a15a908..00000000000 --- a/pkgs/development/erlang-modules/hex/meck.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, buildHex }: - -buildHex { - name = "meck"; - version = "0.8.3"; - sha256 = "1dh2rhks1xly4f49x89vbhsk8fgwkx5zqp0n98mnng8rs1rkigak"; - - meta = { - description = "A mocking framework for Erlang"; - homepage = "https://github.com/eproxus/meck"; - license = stdenv.lib.licenses.apsl20; - }; -} diff --git a/pkgs/development/erlang-modules/hex/rebar3-pc.nix b/pkgs/development/erlang-modules/hex/rebar3-pc.nix deleted file mode 100644 index 5bc45d3e3ab..00000000000 --- a/pkgs/development/erlang-modules/hex/rebar3-pc.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ buildHex, goldrush }: - -buildHex { - name = "pc"; - version = "1.1.0"; - sha256 = "1br5xfl4b2z70b6a2ccxppn64jvkqgpmy4y9v81kxzb91z0ss9ma"; -} diff --git a/pkgs/development/erlang-modules/webdriver/default.nix b/pkgs/development/erlang-modules/webdriver/default.nix new file mode 100644 index 00000000000..bf84ac286ba --- /dev/null +++ b/pkgs/development/erlang-modules/webdriver/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchFromGitHub, writeText, erlang }: + +let + shell = drv: stdenv.mkDerivation { + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; + + pkg = self: stdenv.mkDerivation rec { + name = "webdriver"; + version = "0.0.0+build.18.7ceaf1f"; + + src = fetchFromGitHub { + owner = "Quviq"; + repo = "webdrv"; + rev = "7ceaf1f67d834e841ca0133b4bf899a9fa2db6bb"; + sha256 = "1pq6pmlr6xb4hv2fvmlrvzd8c70kdcidlgjv4p8n9pwvkif0cb87"; + }; + + setupHook = writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + ''; + + buildInputs = [ erlang ]; + + installFlags = "PREFIX=$(out)/lib/erlang/lib"; + + meta = { + description = "WebDriver implementation in Erlang"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/Quviq/webdrv"; + maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + }; + + passthru = { + env = shell self; + }; + +}; +in stdenv.lib.fix pkg diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f826b0a4b07..e562d910f8f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -180,11 +180,8 @@ self: super: { wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; - # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. - darcs = (overrideCabal super.darcs (drv: { - doCheck = false; # The test suite won't even start. - postPatch = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal"; - })); + # The test suite won't even start. + darcs = dontCheck super.darcs; # https://github.com/massysett/rainbox/issues/1 rainbox = dontCheck super.rainbox; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 35710c409c7..cc5034008bb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -3,6 +3,10 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_35; + # Disable GHC 8.0.x core libraries. array = null; base = null; @@ -30,25 +34,21 @@ self: super: { unix = null; xhtml = null; - Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: { - version = "1.23.0.0"; - src = pkgs.fetchFromGitHub { - owner = "haskell"; - repo = "cabal"; - rev = "18fcd9c1aaeddd9d10a25e44c0e986c9889f06a7"; - sha256 = "1bakw7h5qadjhqbkmwijg3588mjnpvdhrn8lqg8wq485cfcv6vn3"; - }; - jailbreak = false; - doHaddock = false; - postUnpack = "sourceRoot+=/Cabal"; - postPatch = '' - setupCompileFlags+=" -DMIN_VERSION_binary_0_8_0=1" - ''; - }); + # jailbreak-cabal can use the native Cabal library. jailbreak-cabal = super.jailbreak-cabal.override { - Cabal = self.Cabal_1_23_0_0; + Cabal = null; mkDerivation = drv: self.mkDerivation (drv // { preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal"; }); }; + + # Older versions of QuickCheck don't support our version of Template Haskell. + QuickCheck = self.QuickCheck_2_8_2; + + # Older versions don't support our version of transformers. + transformers-compat = self.transformers-compat_0_5_1_4; + + # https://github.com/hspec/HUnit/issues/7 + HUnit = dontCheck super.HUnit; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cbf95632479..89cc68e584f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3951,3 +3951,4 @@ dont-distribute-packages: zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] ztail: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] + fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index ec6426e460b..43a49c4da4e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -1450,6 +1450,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1688,7 +1689,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2238,6 +2241,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2751,6 +2755,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3198,6 +3203,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3406,6 +3412,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4154,6 +4161,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4203,6 +4211,7 @@ self: super: { "hflags" = dontDistribute super."hflags"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5464,6 +5473,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7298,6 +7309,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_2_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7570,6 +7582,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7931,6 +7944,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework" = doDistribute super."test-framework_0_8_0_3"; @@ -7977,6 +7991,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index aa7063e77cc..0b06311a980 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -1450,6 +1450,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1688,7 +1689,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2238,6 +2241,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2751,6 +2755,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3198,6 +3203,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3406,6 +3412,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4154,6 +4161,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4203,6 +4211,7 @@ self: super: { "hflags" = dontDistribute super."hflags"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5464,6 +5473,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7298,6 +7309,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_2_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7570,6 +7582,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7931,6 +7944,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework" = doDistribute super."test-framework_0_8_0_3"; @@ -7977,6 +7991,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 5c1933f4f10..1d59562cc85 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -1450,6 +1450,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1688,7 +1689,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2238,6 +2241,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2751,6 +2755,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3198,6 +3203,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3406,6 +3412,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4154,6 +4161,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4203,6 +4211,7 @@ self: super: { "hflags" = dontDistribute super."hflags"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5464,6 +5473,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7298,6 +7309,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_2_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7570,6 +7582,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7931,6 +7944,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework" = doDistribute super."test-framework_0_8_0_3"; @@ -7977,6 +7991,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 6d8dd5a5f8a..0cb0c6e68f1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -1450,6 +1450,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1688,7 +1689,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2238,6 +2241,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2751,6 +2755,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3198,6 +3203,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3406,6 +3412,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4154,6 +4161,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4203,6 +4211,7 @@ self: super: { "hflags" = dontDistribute super."hflags"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5464,6 +5473,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7298,6 +7309,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_2_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7570,6 +7582,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7931,6 +7944,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework" = doDistribute super."test-framework_0_8_0_3"; @@ -7977,6 +7991,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 7db699bfd0b..22c6d25ab42 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -1450,6 +1450,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1688,7 +1689,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2238,6 +2241,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2750,6 +2754,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3197,6 +3202,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3405,6 +3411,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4151,6 +4158,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4200,6 +4208,7 @@ self: super: { "hflags" = dontDistribute super."hflags"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5461,6 +5470,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7294,6 +7305,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_2_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7566,6 +7578,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7927,6 +7940,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework" = doDistribute super."test-framework_0_8_0_3"; @@ -7973,6 +7987,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 0f9edc36529..8c2d85f2499 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -1450,6 +1450,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1688,7 +1689,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2238,6 +2241,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2750,6 +2754,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3197,6 +3202,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3405,6 +3411,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4151,6 +4158,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4200,6 +4208,7 @@ self: super: { "hflags" = dontDistribute super."hflags"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5461,6 +5470,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7294,6 +7305,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_2_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7566,6 +7578,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7927,6 +7940,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework" = doDistribute super."test-framework_0_8_1_0"; @@ -7973,6 +7987,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 92e938ff735..71b640e0c70 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -1448,6 +1448,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1685,7 +1686,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2235,6 +2238,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2747,6 +2751,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3194,6 +3199,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3402,6 +3408,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4147,6 +4154,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4196,6 +4204,7 @@ self: super: { "hflags" = dontDistribute super."hflags"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5457,6 +5466,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7288,6 +7299,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_2_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7560,6 +7572,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7921,6 +7934,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework" = doDistribute super."test-framework_0_8_1_0"; @@ -7967,6 +7981,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index b4f602bb8e5..c1ac7b7a686 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -1448,6 +1448,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1685,7 +1686,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2235,6 +2238,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2747,6 +2751,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3194,6 +3199,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3402,6 +3408,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4147,6 +4154,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4196,6 +4204,7 @@ self: super: { "hflags" = dontDistribute super."hflags"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5457,6 +5466,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7288,6 +7299,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_2_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7560,6 +7572,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7921,6 +7934,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework" = doDistribute super."test-framework_0_8_1_0"; @@ -7967,6 +7981,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 7d5fee5db36..b6218ae4ab2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -1444,6 +1444,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1680,7 +1681,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2227,6 +2230,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2738,6 +2742,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3184,6 +3189,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3392,6 +3398,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4137,6 +4144,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4185,6 +4193,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5445,6 +5454,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7275,6 +7286,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_2_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7546,6 +7558,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7907,6 +7920,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework" = doDistribute super."test-framework_0_8_1_0"; @@ -7953,6 +7967,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 764a3ec8097..c86e0ee5569 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -1444,6 +1444,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1680,7 +1681,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2225,6 +2228,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2734,6 +2738,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3180,6 +3185,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3388,6 +3394,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4132,6 +4139,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4180,6 +4188,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5438,6 +5447,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7266,6 +7277,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_2_2"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7537,6 +7549,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7897,6 +7910,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7941,6 +7955,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index d73babe8172..b74623b09d7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -1443,6 +1443,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_3"; @@ -1679,7 +1680,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2222,6 +2225,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2730,6 +2734,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3173,6 +3178,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3380,6 +3386,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4121,6 +4128,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4169,6 +4177,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5420,6 +5429,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7243,6 +7254,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7513,6 +7525,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7871,6 +7884,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7915,6 +7929,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 41688f6ab93..79ab2e6f67f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -1443,6 +1443,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_3"; @@ -1679,7 +1680,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2222,6 +2225,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2730,6 +2734,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3172,6 +3177,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3379,6 +3385,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4120,6 +4127,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4168,6 +4176,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5416,6 +5425,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7239,6 +7250,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7509,6 +7521,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7867,6 +7880,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7911,6 +7925,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index a7ba1c33c1f..be460c8f810 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -1443,6 +1443,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_3"; @@ -1679,7 +1680,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2222,6 +2225,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2730,6 +2734,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3172,6 +3177,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3379,6 +3385,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4120,6 +4127,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4167,6 +4175,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5415,6 +5424,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7238,6 +7249,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7507,6 +7519,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7865,6 +7878,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7909,6 +7923,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 2f1f52358bf..610bba03009 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -1443,6 +1443,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_3"; @@ -1679,7 +1680,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2222,6 +2225,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2730,6 +2734,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3172,6 +3177,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3379,6 +3385,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4119,6 +4126,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4166,6 +4174,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5414,6 +5423,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7237,6 +7248,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7506,6 +7518,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7863,6 +7876,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7907,6 +7921,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 9bb8c9fa80f..2d8fb74ed50 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -1442,6 +1442,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_3"; @@ -1677,7 +1678,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2220,6 +2223,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2727,6 +2731,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3169,6 +3174,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3376,6 +3382,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4115,6 +4122,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4162,6 +4170,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5409,6 +5418,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7229,6 +7240,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7498,6 +7510,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7855,6 +7868,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7899,6 +7913,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index b31b68d5242..f4f7b038eef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -1441,6 +1441,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_5"; @@ -1676,7 +1677,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2217,6 +2220,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2723,6 +2727,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3164,6 +3169,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3371,6 +3377,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4110,6 +4117,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4157,6 +4165,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5404,6 +5413,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7220,6 +7231,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7489,6 +7501,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7844,6 +7857,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7888,6 +7902,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 607eb100884..c386c5791a7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -1444,6 +1444,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1680,7 +1681,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2224,6 +2227,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2732,6 +2736,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3178,6 +3183,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3386,6 +3392,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4129,6 +4136,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4177,6 +4185,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5435,6 +5444,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7260,6 +7271,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_3"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7531,6 +7543,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7891,6 +7904,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7935,6 +7949,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 9ba134d352b..883954c9575 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -1443,6 +1443,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1679,7 +1680,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2223,6 +2226,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2731,6 +2735,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3176,6 +3181,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3384,6 +3390,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4126,6 +4133,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4174,6 +4182,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5432,6 +5441,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7256,6 +7267,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7527,6 +7539,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7886,6 +7899,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7930,6 +7944,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 5778c35978e..8410cc12012 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -1443,6 +1443,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1679,7 +1680,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2222,6 +2225,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2730,6 +2734,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3175,6 +3180,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3383,6 +3389,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4125,6 +4132,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4173,6 +4181,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5431,6 +5440,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7255,6 +7266,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7526,6 +7538,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7885,6 +7898,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7929,6 +7943,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index c43310b578c..36c41b867d8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -1443,6 +1443,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1679,7 +1680,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2222,6 +2225,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2730,6 +2734,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3175,6 +3180,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3383,6 +3389,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4125,6 +4132,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4173,6 +4181,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5425,6 +5434,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7249,6 +7260,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7520,6 +7532,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7879,6 +7892,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7923,6 +7937,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index d811365170b..6348ae3020d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -1443,6 +1443,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_2"; @@ -1679,7 +1680,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2222,6 +2225,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2730,6 +2734,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3173,6 +3178,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3381,6 +3387,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4122,6 +4129,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4170,6 +4178,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5421,6 +5430,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7245,6 +7256,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7516,6 +7528,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7875,6 +7888,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7919,6 +7933,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index fdad5275921..d8a3baeb71f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -1443,6 +1443,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_3"; @@ -1679,7 +1680,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2222,6 +2225,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2730,6 +2734,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -3173,6 +3178,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3380,6 +3386,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4121,6 +4128,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4169,6 +4177,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5420,6 +5429,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "lrucache" = dontDistribute super."lrucache"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; @@ -7244,6 +7255,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-js" = dontDistribute super."shakespeare-js"; "shana" = dontDistribute super."shana"; @@ -7515,6 +7527,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7874,6 +7887,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7918,6 +7932,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 0cfc9b9c911..6fabd0b50d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -1431,6 +1431,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_5"; @@ -1666,7 +1667,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2204,6 +2207,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2707,6 +2711,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2954,6 +2959,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3146,6 +3152,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3351,6 +3358,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4086,6 +4094,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4132,6 +4141,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5363,6 +5373,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7162,6 +7174,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7428,6 +7441,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7780,6 +7794,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7824,6 +7839,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 155388b3edf..a960694c520 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -1431,6 +1431,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_5"; @@ -1666,7 +1667,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2203,6 +2206,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2706,6 +2710,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2953,6 +2958,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3145,6 +3151,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3350,6 +3357,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4084,6 +4092,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4130,6 +4139,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5361,6 +5371,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7160,6 +7172,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7426,6 +7439,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7778,6 +7792,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7822,6 +7837,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index c6cf2eb343e..a27fd4535ee 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -1426,6 +1426,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1657,7 +1658,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2190,6 +2193,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2691,6 +2695,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2936,6 +2941,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3126,6 +3132,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3331,6 +3338,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4062,6 +4070,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4108,6 +4117,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5329,6 +5339,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7116,6 +7128,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7381,6 +7394,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7725,6 +7739,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7769,6 +7784,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 2d94ce3e02f..2bc005894d8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -1425,6 +1425,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1656,7 +1657,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2189,6 +2192,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2690,6 +2694,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2935,6 +2940,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3125,6 +3131,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3330,6 +3337,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4059,6 +4067,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4105,6 +4114,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5325,6 +5335,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7109,6 +7121,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7374,6 +7387,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7716,6 +7730,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7760,6 +7775,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 181dc438619..e8bb7cb1583 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -1425,6 +1425,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1656,7 +1657,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2189,6 +2192,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2690,6 +2694,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2935,6 +2940,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3125,6 +3131,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3330,6 +3337,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4059,6 +4067,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4105,6 +4114,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5325,6 +5335,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7108,6 +7120,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7373,6 +7386,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7715,6 +7729,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7759,6 +7774,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 23e09e2751c..6391bc0180e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -1425,6 +1425,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1656,7 +1657,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2189,6 +2192,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2690,6 +2694,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2935,6 +2940,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3125,6 +3131,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3330,6 +3337,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4058,6 +4066,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4104,6 +4113,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5323,6 +5333,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7105,6 +7117,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7370,6 +7383,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7712,6 +7726,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7756,6 +7771,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index e12c4f8b74c..19f39ecba30 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -1424,6 +1424,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1655,7 +1656,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2188,6 +2191,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2689,6 +2693,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2934,6 +2939,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3123,6 +3129,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3328,6 +3335,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4056,6 +4064,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4102,6 +4111,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5320,6 +5330,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7101,6 +7113,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7365,6 +7378,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7707,6 +7721,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7751,6 +7766,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; @@ -8312,6 +8328,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index b19efb0c948..9efae29b78d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -1424,6 +1424,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1655,7 +1656,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2188,6 +2191,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2689,6 +2693,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2933,6 +2938,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3122,6 +3128,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3327,6 +3334,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4055,6 +4063,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4101,6 +4110,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5319,6 +5329,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7097,6 +7109,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7361,6 +7374,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7702,6 +7716,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7746,6 +7761,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; @@ -8307,6 +8323,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index b92094bd7a4..51e0764f82f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -1423,6 +1423,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1654,7 +1655,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2186,6 +2189,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2685,6 +2689,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2929,6 +2934,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3117,6 +3123,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3322,6 +3329,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -3847,6 +3855,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-extras" = doDistribute super."hashable-extras_0_2_1"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; @@ -4049,6 +4058,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4095,6 +4105,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5312,6 +5323,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7090,6 +7103,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7354,6 +7368,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7695,6 +7710,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7739,6 +7755,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; @@ -8300,6 +8317,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 5cc4dee0ed2..4ab2085f1bc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -1422,6 +1422,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1653,7 +1654,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2184,6 +2187,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2683,6 +2687,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2927,6 +2932,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -3113,6 +3119,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3317,6 +3324,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -3842,6 +3850,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-extras" = doDistribute super."hashable-extras_0_2_1"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; @@ -4044,6 +4053,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4090,6 +4100,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5307,6 +5318,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7084,6 +7097,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7348,6 +7362,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7689,6 +7704,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7733,6 +7749,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; @@ -8294,6 +8311,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index bfe463d6ea9..71ad819477a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -1422,6 +1422,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1653,7 +1654,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2183,6 +2186,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2682,6 +2686,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2925,6 +2930,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -3111,6 +3117,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3315,6 +3322,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -3840,6 +3848,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-extras" = doDistribute super."hashable-extras_0_2_1"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; @@ -4041,6 +4050,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4087,6 +4097,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5304,6 +5315,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7079,6 +7092,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7343,6 +7357,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7683,6 +7698,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7727,6 +7743,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; @@ -8288,6 +8305,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 186cf589487..80547ee44ab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -1422,6 +1422,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1653,7 +1654,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2183,6 +2186,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2682,6 +2686,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2925,6 +2930,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -3111,6 +3117,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3314,6 +3321,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -3839,6 +3847,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-extras" = doDistribute super."hashable-extras_0_2_1"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; @@ -4040,6 +4049,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4086,6 +4096,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5303,6 +5314,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7076,6 +7089,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7338,6 +7352,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7678,6 +7693,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7722,6 +7738,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; @@ -8283,6 +8300,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 43c807311a6..f465fc7d0e0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -1430,6 +1430,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1665,7 +1666,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2200,6 +2203,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2703,6 +2707,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2950,6 +2955,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3142,6 +3148,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3347,6 +3354,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4081,6 +4089,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4127,6 +4136,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5358,6 +5368,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7157,6 +7169,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7423,6 +7436,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7775,6 +7789,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7819,6 +7834,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 94540f44ac7..4564473ba13 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -1422,6 +1422,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1653,7 +1654,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2182,6 +2185,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2681,6 +2685,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2924,6 +2929,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -3110,6 +3116,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3313,6 +3320,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -3838,6 +3846,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -4038,6 +4047,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4084,6 +4094,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5301,6 +5312,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7073,6 +7086,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7334,6 +7348,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7674,6 +7689,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7718,6 +7734,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; @@ -8279,6 +8296,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index c6436d1d728..22d82a721f2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -1422,6 +1422,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1653,7 +1654,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2182,6 +2185,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2681,6 +2685,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2924,6 +2929,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -3110,6 +3116,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3313,6 +3320,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -3838,6 +3846,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -4038,6 +4047,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4084,6 +4094,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5300,6 +5311,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7071,6 +7084,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7332,6 +7346,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7672,6 +7687,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7716,6 +7732,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; @@ -8275,6 +8292,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index c35bcbb2cda..2d29666323a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -1422,6 +1422,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1653,7 +1654,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2182,6 +2185,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2681,6 +2685,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2924,6 +2929,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -3110,6 +3116,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3313,6 +3320,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -3838,6 +3846,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -4038,6 +4047,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4084,6 +4094,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5299,6 +5310,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7069,6 +7082,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7330,6 +7344,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7670,6 +7685,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7714,6 +7730,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; @@ -8273,6 +8290,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 8e459791eaf..9ce164f18ae 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -1430,6 +1430,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1665,7 +1666,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2200,6 +2203,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2703,6 +2707,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2950,6 +2955,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3141,6 +3147,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3346,6 +3353,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4080,6 +4088,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4126,6 +4135,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5356,6 +5366,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7155,6 +7167,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7421,6 +7434,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7773,6 +7787,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7817,6 +7832,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index f071eff3e71..9f312a97132 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -1430,6 +1430,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1664,7 +1665,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2199,6 +2202,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2702,6 +2706,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2949,6 +2954,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3140,6 +3146,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3345,6 +3352,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4079,6 +4087,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4125,6 +4134,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5355,6 +5365,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7150,6 +7162,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7416,6 +7429,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7768,6 +7782,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7812,6 +7827,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index fc079f4ab45..72c3763423f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -1430,6 +1430,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1664,7 +1665,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2199,6 +2202,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2701,6 +2705,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2948,6 +2953,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3139,6 +3145,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3344,6 +3351,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4078,6 +4086,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4124,6 +4133,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5353,6 +5363,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7148,6 +7160,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7414,6 +7427,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7765,6 +7779,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7809,6 +7824,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 33d8eac9aa6..6a7f7dbb61c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -1428,6 +1428,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1661,7 +1662,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2196,6 +2199,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2698,6 +2702,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2945,6 +2950,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3136,6 +3142,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3341,6 +3348,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4073,6 +4081,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4119,6 +4128,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5348,6 +5358,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7142,6 +7154,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7408,6 +7421,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7759,6 +7773,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7803,6 +7818,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 5e81a833083..75470676e94 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -1427,6 +1427,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1660,7 +1661,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2195,6 +2198,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2697,6 +2701,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2944,6 +2949,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3135,6 +3141,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3340,6 +3347,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4072,6 +4080,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4118,6 +4127,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5347,6 +5357,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7141,6 +7153,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7407,6 +7420,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7758,6 +7772,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7802,6 +7817,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 9a19550bb8c..2c63de232a5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -1426,6 +1426,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1659,7 +1660,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2194,6 +2197,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2696,6 +2700,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2943,6 +2948,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3133,6 +3139,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3338,6 +3345,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4070,6 +4078,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4116,6 +4125,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5344,6 +5354,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7137,6 +7149,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_4_1"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7402,6 +7415,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7751,6 +7765,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7795,6 +7810,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 6431dc6acc8..ecaa0525791 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -1426,6 +1426,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = doDistribute super."atto-lisp_0_2_2"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1657,7 +1658,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; @@ -2191,6 +2194,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2693,6 +2697,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2938,6 +2943,7 @@ self: super: { "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5"; "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4"; "exceptional" = dontDistribute super."exceptional"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "executable-hash" = doDistribute super."executable-hash_0_2_0_0"; "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -3128,6 +3134,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3333,6 +3340,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events" = dontDistribute super."ghc-events"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; @@ -4064,6 +4072,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -4110,6 +4119,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = dontDistribute super."hfsevents"; @@ -5335,6 +5345,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -7126,6 +7138,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7391,6 +7404,7 @@ self: super: { "splice" = dontDistribute super."splice"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7736,6 +7750,7 @@ self: super: { "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7780,6 +7795,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show" = dontDistribute super."text-show"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 27466c8216c..e81f80f76ff 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -1382,6 +1382,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1604,7 +1605,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -2113,6 +2116,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2596,6 +2600,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2799,6 +2804,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2831,6 +2837,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -3009,6 +3016,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3062,6 +3070,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3187,6 +3196,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3209,6 +3219,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3301,6 +3312,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3724,6 +3736,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3922,6 +3935,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3966,6 +3980,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5136,6 +5151,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5480,6 +5497,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6857,6 +6875,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7118,6 +7137,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7447,6 +7467,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7490,6 +7511,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -8028,6 +8050,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 98fb2c84b6e..63c55b1c023 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -1381,6 +1381,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1603,7 +1604,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -2112,6 +2115,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2595,6 +2599,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2798,6 +2803,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2830,6 +2836,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -3005,6 +3012,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3058,6 +3066,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3183,6 +3192,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3205,6 +3215,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3297,6 +3308,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3720,6 +3732,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3891,6 +3904,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3917,6 +3931,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3961,6 +3976,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5131,6 +5147,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5474,6 +5492,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6848,6 +6867,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7109,6 +7129,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7438,6 +7459,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7481,6 +7503,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -8018,6 +8041,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 2e8107faf59..2e42946cd2a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -1366,6 +1366,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1587,7 +1588,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1844,6 +1847,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2088,6 +2092,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2367,6 +2372,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2558,6 +2564,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2759,6 +2766,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2789,6 +2797,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2960,6 +2969,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3011,6 +3021,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3136,6 +3147,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3158,6 +3170,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3247,6 +3260,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3669,6 +3683,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3805,6 +3820,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3837,6 +3853,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3863,6 +3880,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3907,6 +3925,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5064,6 +5083,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5401,6 +5422,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6459,6 +6481,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6751,6 +6774,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_6"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7006,6 +7030,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7329,6 +7354,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7371,6 +7397,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7902,6 +7929,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 6e26abff338..d80c005eb5d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -1366,6 +1366,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1586,7 +1587,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1842,6 +1845,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2086,6 +2090,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2365,6 +2370,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2556,6 +2562,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2757,6 +2764,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2787,6 +2795,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2957,6 +2966,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3008,6 +3018,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3133,6 +3144,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3155,6 +3167,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3243,6 +3256,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3665,6 +3679,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3801,6 +3816,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3833,6 +3849,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3859,6 +3876,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3903,6 +3921,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5060,6 +5079,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5397,6 +5418,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6454,6 +6476,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6744,6 +6767,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6999,6 +7023,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7322,6 +7347,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7364,6 +7390,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7895,6 +7922,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 51c4b7dd729..e0f180cdc61 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -1365,6 +1365,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1585,7 +1586,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1841,6 +1844,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2081,6 +2085,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2360,6 +2365,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2551,6 +2557,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2752,6 +2759,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2782,6 +2790,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2952,6 +2961,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3003,6 +3013,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3128,6 +3139,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3150,6 +3162,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3238,6 +3251,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3659,6 +3673,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3795,6 +3810,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3827,6 +3843,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3853,6 +3870,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3897,6 +3915,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5054,6 +5073,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5391,6 +5412,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6447,6 +6469,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6737,6 +6760,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6992,6 +7016,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7314,6 +7339,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7356,6 +7382,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7886,6 +7913,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index 3b1134e5819..f77465dd8e8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -1365,6 +1365,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1585,7 +1586,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1841,6 +1844,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2081,6 +2085,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2360,6 +2365,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2551,6 +2557,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2752,6 +2759,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2782,6 +2790,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2952,6 +2961,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3003,6 +3013,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3128,6 +3139,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3150,6 +3162,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3238,6 +3251,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3659,6 +3673,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3795,6 +3810,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3827,6 +3843,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3853,6 +3870,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3897,6 +3915,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -5052,6 +5071,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5389,6 +5410,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6444,6 +6466,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6734,6 +6757,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6989,6 +7013,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7310,6 +7335,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7352,6 +7378,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7881,6 +7908,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 110e037d766..c825eb20d7c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -1363,6 +1363,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1583,7 +1584,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1838,6 +1841,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2078,6 +2082,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2356,6 +2361,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2446,6 +2452,7 @@ self: super: { "dia-functions" = dontDistribute super."dia-functions"; "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; @@ -2544,6 +2551,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2744,6 +2752,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2774,6 +2783,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2944,6 +2954,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2995,6 +3006,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3120,6 +3132,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3142,6 +3155,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3230,6 +3244,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3651,6 +3666,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3787,6 +3803,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3819,6 +3836,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3845,6 +3863,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3889,6 +3908,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -5043,6 +5063,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5378,6 +5400,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6432,6 +6455,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6722,6 +6746,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6977,6 +7002,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7297,6 +7323,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7339,6 +7366,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7868,6 +7896,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index 8416bbdd226..196ce630791 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -1362,6 +1362,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1582,7 +1583,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1837,6 +1840,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2077,6 +2081,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2355,6 +2360,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2445,6 +2451,7 @@ self: super: { "dia-functions" = dontDistribute super."dia-functions"; "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; @@ -2543,6 +2550,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2743,6 +2751,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2773,6 +2782,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2943,6 +2953,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2994,6 +3005,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3118,6 +3130,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3140,6 +3153,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3228,6 +3242,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3649,6 +3664,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3784,6 +3800,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3816,6 +3833,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3842,6 +3860,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3886,6 +3905,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -5038,6 +5058,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5373,6 +5395,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6425,6 +6448,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6714,6 +6738,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6969,6 +6994,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7289,6 +7315,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7331,6 +7358,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7859,6 +7887,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index c7073f598db..61f0822da0d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -1361,6 +1361,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1580,7 +1581,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1835,6 +1838,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2075,6 +2079,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2353,6 +2358,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2443,6 +2449,7 @@ self: super: { "dia-functions" = dontDistribute super."dia-functions"; "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; @@ -2541,6 +2548,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2741,6 +2749,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2770,6 +2779,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2940,6 +2950,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2991,6 +3002,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3115,6 +3127,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3137,6 +3150,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3225,6 +3239,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3645,6 +3660,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3780,6 +3796,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3812,6 +3829,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3838,6 +3856,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3882,6 +3901,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -5033,6 +5053,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5367,6 +5389,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6416,6 +6439,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6704,6 +6728,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6959,6 +6984,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7276,6 +7302,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7318,6 +7345,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7845,6 +7873,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index aa4e90d19f2..2fe2d0755b0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -1359,6 +1359,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1578,7 +1579,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1832,6 +1835,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2070,6 +2074,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2348,6 +2353,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2437,6 +2443,7 @@ self: super: { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; @@ -2535,6 +2542,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2735,6 +2743,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2764,6 +2773,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2934,6 +2944,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2985,6 +2996,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3109,6 +3121,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3131,6 +3144,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3219,6 +3233,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3638,6 +3653,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3773,6 +3789,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3805,6 +3822,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3831,6 +3849,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3875,6 +3894,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -5024,6 +5044,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5357,6 +5379,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6403,6 +6426,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6691,6 +6715,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6946,6 +6971,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7263,6 +7289,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7305,6 +7332,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7831,6 +7859,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix index a9a4ed10135..478bbdcfa28 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -1359,6 +1359,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1578,7 +1579,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1831,6 +1834,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2069,6 +2073,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2347,6 +2352,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2436,6 +2442,7 @@ self: super: { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; @@ -2534,6 +2541,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2734,6 +2742,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2763,6 +2772,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2933,6 +2943,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2984,6 +2995,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3108,6 +3120,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3130,6 +3143,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3217,6 +3231,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3633,6 +3648,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3767,6 +3783,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3799,6 +3816,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3825,6 +3843,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3869,6 +3888,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -5014,6 +5034,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5245,6 +5267,7 @@ self: super: { "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5346,6 +5369,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6389,6 +6413,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6677,6 +6702,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6931,6 +6957,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7248,6 +7275,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7289,6 +7317,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7813,6 +7842,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; @@ -7821,6 +7851,7 @@ self: super: { "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix index 321d516b14c..2aee00860bc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix @@ -1357,6 +1357,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1574,7 +1575,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1825,6 +1828,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2062,6 +2066,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2340,6 +2345,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2429,6 +2435,7 @@ self: super: { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; @@ -2527,6 +2534,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2727,6 +2735,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2756,6 +2765,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2926,6 +2936,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2977,6 +2988,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3101,6 +3113,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3123,6 +3136,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3210,6 +3224,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3626,6 +3641,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3760,6 +3776,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3792,6 +3809,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3818,6 +3836,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3862,6 +3881,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -5002,6 +5022,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5233,6 +5255,7 @@ self: super: { "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5334,6 +5357,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6374,6 +6398,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6661,6 +6686,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6914,6 +6940,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7231,6 +7258,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_2"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7272,6 +7300,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7796,6 +7825,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; @@ -7804,6 +7834,7 @@ self: super: { "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 4b36506ba21..27ea82620b7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -1378,6 +1378,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1600,7 +1601,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -2109,6 +2112,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2591,6 +2595,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2794,6 +2799,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2826,6 +2832,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -3001,6 +3008,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3054,6 +3062,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3179,6 +3188,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3201,6 +3211,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3292,6 +3303,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3715,6 +3727,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3886,6 +3899,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3912,6 +3926,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3956,6 +3971,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5124,6 +5140,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5467,6 +5485,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6543,6 +6562,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6837,6 +6857,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7096,6 +7117,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7424,6 +7446,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7467,6 +7490,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -8004,6 +8028,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix index 0e18f8f22b2..b310053158e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix @@ -1354,6 +1354,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1570,7 +1571,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1820,6 +1823,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2057,6 +2061,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2335,6 +2340,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2424,6 +2430,7 @@ self: super: { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; @@ -2522,6 +2529,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2722,6 +2730,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2751,6 +2760,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2921,6 +2931,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2972,6 +2983,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3096,6 +3108,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3118,6 +3131,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3205,6 +3219,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3621,6 +3636,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3755,6 +3771,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3787,6 +3804,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3813,6 +3831,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3857,6 +3876,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -4995,6 +5015,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5226,6 +5248,7 @@ self: super: { "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5327,6 +5350,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6365,6 +6389,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6652,6 +6677,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6905,6 +6931,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7221,6 +7248,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_2"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7261,6 +7289,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7785,6 +7814,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; @@ -7793,6 +7823,7 @@ self: super: { "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix index 7749dbd353c..24b1a57b29b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix @@ -1353,6 +1353,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1568,7 +1569,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1817,6 +1820,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2052,6 +2056,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2330,6 +2335,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2419,6 +2425,7 @@ self: super: { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; @@ -2517,6 +2524,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2717,6 +2725,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2746,6 +2755,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2914,6 +2924,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2965,6 +2976,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3089,6 +3101,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3111,6 +3124,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3198,6 +3212,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3613,6 +3628,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3747,6 +3763,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3779,6 +3796,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3805,6 +3823,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3849,6 +3868,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -4985,6 +5005,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5216,6 +5238,7 @@ self: super: { "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5316,6 +5339,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6350,6 +6374,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6628,6 +6653,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6880,6 +6906,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7196,6 +7223,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_2"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7236,6 +7264,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7744,6 +7773,7 @@ self: super: { "wai-devel" = dontDistribute super."wai-devel"; "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-extra" = doDistribute super."wai-extra_3_0_13_1"; "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; "wai-graceful" = dontDistribute super."wai-graceful"; "wai-handler-devel" = dontDistribute super."wai-handler-devel"; @@ -7755,6 +7785,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; @@ -7763,6 +7794,7 @@ self: super: { "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix index d3d69d0ce72..43b306a20fe 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix @@ -1353,6 +1353,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1568,7 +1569,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1817,6 +1820,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2052,6 +2056,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2330,6 +2335,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2419,6 +2425,7 @@ self: super: { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; @@ -2517,6 +2524,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2717,6 +2725,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2746,6 +2755,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2912,6 +2922,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2963,6 +2974,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3087,6 +3099,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3109,6 +3122,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3196,6 +3210,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3611,6 +3626,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3745,6 +3761,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3777,6 +3794,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3802,6 +3820,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3846,6 +3865,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -4979,6 +4999,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5210,6 +5232,7 @@ self: super: { "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5310,6 +5333,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6344,6 +6368,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6622,6 +6647,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6874,6 +6900,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7190,6 +7217,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_2"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7230,6 +7258,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7738,6 +7767,7 @@ self: super: { "wai-devel" = dontDistribute super."wai-devel"; "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-extra" = doDistribute super."wai-extra_3_0_13_1"; "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; "wai-graceful" = dontDistribute super."wai-graceful"; "wai-handler-devel" = dontDistribute super."wai-handler-devel"; @@ -7749,6 +7779,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; @@ -7757,6 +7788,7 @@ self: super: { "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 015ecca62fe..285564af249 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -1377,6 +1377,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1599,7 +1600,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -2107,6 +2110,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2587,6 +2591,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2790,6 +2795,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2822,6 +2828,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2996,6 +3003,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3049,6 +3057,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3174,6 +3183,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3196,6 +3206,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3287,6 +3298,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3710,6 +3722,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3881,6 +3894,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3907,6 +3921,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3951,6 +3966,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5117,6 +5133,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5460,6 +5478,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6535,6 +6554,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6829,6 +6849,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7087,6 +7108,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7414,6 +7436,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7457,6 +7480,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7993,6 +8017,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index c914cd506d4..eccead0048d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -1377,6 +1377,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1599,7 +1600,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -2106,6 +2109,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2586,6 +2590,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2789,6 +2794,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2821,6 +2827,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2995,6 +3002,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3048,6 +3056,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3173,6 +3182,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3195,6 +3205,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3286,6 +3297,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3709,6 +3721,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3880,6 +3893,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3906,6 +3920,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3950,6 +3965,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5116,6 +5132,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5459,6 +5477,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6534,6 +6553,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6827,6 +6847,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7085,6 +7106,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7411,6 +7433,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7454,6 +7477,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7990,6 +8014,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 96c247063ec..46addfdb0a8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -1376,6 +1376,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1598,7 +1599,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -2104,6 +2107,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2583,6 +2587,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2786,6 +2791,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2818,6 +2824,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2990,6 +2997,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3043,6 +3051,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3168,6 +3177,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3190,6 +3200,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3281,6 +3292,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3704,6 +3716,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3874,6 +3887,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3900,6 +3914,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3944,6 +3959,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5106,6 +5122,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5448,6 +5466,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6519,6 +6538,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6812,6 +6832,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_5"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7070,6 +7091,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7394,6 +7416,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7436,6 +7459,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7972,6 +7996,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index f24bb137b16..9e490a7387c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -1375,6 +1375,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1597,7 +1598,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1858,6 +1861,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2102,6 +2106,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2581,6 +2586,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2784,6 +2790,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2816,6 +2823,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2988,6 +2996,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3040,6 +3049,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3165,6 +3175,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3187,6 +3198,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3276,6 +3288,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3699,6 +3712,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3869,6 +3883,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3895,6 +3910,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3939,6 +3955,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5097,6 +5114,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5438,6 +5457,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6508,6 +6528,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6801,6 +6822,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_6"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7059,6 +7081,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7383,6 +7406,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7425,6 +7449,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7959,6 +7984,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index f1980ea5a02..4dea3fcf33a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -1372,6 +1372,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1594,7 +1595,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1855,6 +1858,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2099,6 +2103,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2576,6 +2581,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2779,6 +2785,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2811,6 +2818,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2983,6 +2991,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3034,6 +3043,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3159,6 +3169,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3181,6 +3192,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3270,6 +3282,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3693,6 +3706,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3829,6 +3843,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3861,6 +3876,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3887,6 +3903,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3931,6 +3948,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5088,6 +5106,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5428,6 +5448,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6493,6 +6514,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6786,6 +6808,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_6"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7042,6 +7065,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7366,6 +7390,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7408,6 +7433,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7941,6 +7967,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index b3a5533e928..150196e22de 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -1372,6 +1372,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1594,7 +1595,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1852,6 +1855,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2096,6 +2100,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2568,6 +2573,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2771,6 +2777,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2803,6 +2810,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2975,6 +2983,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3026,6 +3035,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3151,6 +3161,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3173,6 +3184,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3262,6 +3274,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3685,6 +3698,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3821,6 +3835,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3853,6 +3868,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3879,6 +3895,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3923,6 +3940,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5080,6 +5098,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5418,6 +5438,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6480,6 +6501,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6773,6 +6795,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_6"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7029,6 +7052,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7352,6 +7376,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7394,6 +7419,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7927,6 +7953,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index 704d9bc9e2f..6cfc9e6a4dc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -1370,6 +1370,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; @@ -1591,7 +1592,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; @@ -1848,6 +1851,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -2092,6 +2096,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2371,6 +2376,7 @@ self: super: { "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2563,6 +2569,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2765,6 +2772,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2796,6 +2804,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2967,6 +2976,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -3018,6 +3028,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -3143,6 +3154,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -3165,6 +3177,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -3254,6 +3267,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3677,6 +3691,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3813,6 +3828,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3845,6 +3861,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3871,6 +3888,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3915,6 +3933,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfsevents" = doDistribute super."hfsevents_0_1_5"; @@ -5072,6 +5091,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5410,6 +5431,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -6471,6 +6493,7 @@ self: super: { "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retry" = doDistribute super."retry_0_6"; @@ -6764,6 +6787,7 @@ self: super: { "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; "shakespeare" = doDistribute super."shakespeare_2_0_6"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -7020,6 +7044,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -7343,6 +7368,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -7385,6 +7411,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "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"; @@ -7918,6 +7945,7 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix index b0fbca2b58e..dcc4f2a695c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix @@ -451,6 +451,7 @@ self: super: { "HTTP-Simple" = dontDistribute super."HTTP-Simple"; "HTab" = dontDistribute super."HTab"; "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit" = doDistribute super."HUnit_1_3_0_0"; "HUnit-Diff" = dontDistribute super."HUnit-Diff"; "HUnit-Plus" = dontDistribute super."HUnit-Plus"; "HUnit-approx" = dontDistribute super."HUnit-approx"; @@ -533,6 +534,7 @@ self: super: { "InfixApplicative" = dontDistribute super."InfixApplicative"; "Interpolation" = dontDistribute super."Interpolation"; "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; + "IntervalMap" = doDistribute super."IntervalMap_0_4_1_1"; "Irc" = dontDistribute super."Irc"; "IrrHaskell" = dontDistribute super."IrrHaskell"; "IsNull" = dontDistribute super."IsNull"; @@ -1253,6 +1255,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec-arff" = dontDistribute super."attoparsec-arff"; @@ -1455,7 +1458,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1536,6 +1541,7 @@ self: super: { "breakout" = dontDistribute super."breakout"; "breve" = dontDistribute super."breve"; "brians-brain" = dontDistribute super."brians-brain"; + "brick" = doDistribute super."brick_0_3_1"; "brillig" = dontDistribute super."brillig"; "broccoli" = dontDistribute super."broccoli"; "broker-haskell" = dontDistribute super."broker-haskell"; @@ -1560,6 +1566,7 @@ self: super: { "buster" = dontDistribute super."buster"; "buster-gtk" = dontDistribute super."buster-gtk"; "buster-network" = dontDistribute super."buster-network"; + "bustle" = doDistribute super."bustle_0_5_2"; "butterflies" = dontDistribute super."butterflies"; "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; @@ -1690,6 +1697,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -1766,7 +1774,13 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_7"; + "clash-lib" = doDistribute super."clash-lib_0_6_7"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_4"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_3"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_3"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_4"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1816,6 +1830,7 @@ self: super: { "codecov-haskell" = dontDistribute super."codecov-haskell"; "codemonitor" = dontDistribute super."codemonitor"; "codepad" = dontDistribute super."codepad"; + "codex" = doDistribute super."codex_0_4_0_6"; "codo-notation" = dontDistribute super."codo-notation"; "cofunctor" = dontDistribute super."cofunctor"; "cognimeta-utils" = dontDistribute super."cognimeta-utils"; @@ -1904,6 +1919,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2172,6 +2188,7 @@ self: super: { "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2255,9 +2272,11 @@ self: super: { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_8"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; @@ -2344,6 +2363,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2537,6 +2557,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2563,6 +2584,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-mtl" = dontDistribute super."exception-mtl"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2620,6 +2642,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_10"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -2724,6 +2747,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2772,6 +2796,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -2891,6 +2916,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -2912,6 +2938,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -2963,6 +2990,7 @@ self: super: { "ginsu" = dontDistribute super."ginsu"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20151218"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; @@ -2988,6 +3016,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3185,6 +3214,7 @@ self: super: { "grm" = dontDistribute super."grm"; "groundhog-inspector" = dontDistribute super."groundhog-inspector"; "group-with" = dontDistribute super."group-with"; + "grouped-list" = doDistribute super."grouped-list_0_2_1_0"; "groupoid" = dontDistribute super."groupoid"; "growler" = dontDistribute super."growler"; "gruff" = dontDistribute super."gruff"; @@ -3350,6 +3380,7 @@ self: super: { "happs-tutorial" = dontDistribute super."happs-tutorial"; "happstack" = dontDistribute super."happstack"; "happstack-auth" = dontDistribute super."happstack-auth"; + "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_2"; "happstack-contrib" = dontDistribute super."happstack-contrib"; "happstack-data" = dontDistribute super."happstack-data"; "happstack-dlg" = dontDistribute super."happstack-dlg"; @@ -3390,6 +3421,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashabler" = dontDistribute super."hashabler"; "hashed-storage" = dontDistribute super."hashed-storage"; @@ -3499,6 +3531,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_15_1"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = dontDistribute super."hasql-postgres"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -3519,6 +3552,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3551,6 +3585,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3577,6 +3612,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3621,6 +3657,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -3741,6 +3778,7 @@ self: super: { "hnop" = dontDistribute super."hnop"; "ho-rewriting" = dontDistribute super."ho-rewriting"; "hoauth" = dontDistribute super."hoauth"; + "hoauth2" = doDistribute super."hoauth2_0_5_0"; "hob" = dontDistribute super."hob"; "hobbes" = dontDistribute super."hobbes"; "hobbits" = dontDistribute super."hobbits"; @@ -4039,6 +4077,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_1_0_0"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-gui" = dontDistribute super."hunit-gui"; @@ -4176,6 +4215,7 @@ self: super: { "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; + "inline-c" = doDistribute super."inline-c_0_5_5_1"; "inline-c-win32" = dontDistribute super."inline-c-win32"; "inline-r" = dontDistribute super."inline-r"; "inquire" = dontDistribute super."inquire"; @@ -4468,6 +4508,7 @@ self: super: { "language-slice" = dontDistribute super."language-slice"; "language-spelling" = dontDistribute super."language-spelling"; "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = doDistribute super."language-thrift_0_6_2_0"; "language-typescript" = dontDistribute super."language-typescript"; "language-vhdl" = dontDistribute super."language-vhdl"; "lat" = dontDistribute super."lat"; @@ -4689,6 +4730,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -4704,6 +4747,7 @@ self: super: { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = doDistribute super."luminance_0_9_1"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4804,6 +4848,7 @@ self: super: { "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; "meep" = dontDistribute super."meep"; "mega-sdist" = dontDistribute super."mega-sdist"; + "megaparsec" = doDistribute super."megaparsec_4_2_0"; "meldable-heap" = dontDistribute super."meldable-heap"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; @@ -4813,6 +4858,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_10"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "messente" = dontDistribute super."messente"; @@ -4904,6 +4950,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -4999,6 +5046,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -5578,6 +5626,7 @@ self: super: { "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-schema" = doDistribute super."postgresql-schema_0_1_9"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5954,8 +6003,10 @@ self: super: { "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_7_0_1"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6081,6 +6132,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbv" = doDistribute super."sbv_5_9"; "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; @@ -6217,6 +6269,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6457,6 +6510,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -6750,6 +6804,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_2"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -6789,6 +6844,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show-instances" = dontDistribute super."text-show-instances"; @@ -6953,6 +7009,7 @@ self: super: { "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; + "true-name" = doDistribute super."true-name_0_0_0_2"; "truelevel" = dontDistribute super."truelevel"; "trurl" = dontDistribute super."trurl"; "truthful" = dontDistribute super."truthful"; @@ -7262,6 +7319,7 @@ self: super: { "wai-devel" = dontDistribute super."wai-devel"; "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-extra" = doDistribute super."wai-extra_3_0_13_1"; "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; "wai-graceful" = dontDistribute super."wai-graceful"; "wai-handler-devel" = dontDistribute super."wai-handler-devel"; @@ -7273,10 +7331,12 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7288,6 +7348,7 @@ self: super: { "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; "wai-router" = dontDistribute super."wai-router"; + "wai-routes" = doDistribute super."wai-routes_0_9_4"; "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = doDistribute super."wai-session-postgresql_0_2_0_3"; @@ -7326,6 +7387,7 @@ self: super: { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_8_0_4"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix index b95fbc7a60a..22c9cb7b2f6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix @@ -451,6 +451,7 @@ self: super: { "HTTP-Simple" = dontDistribute super."HTTP-Simple"; "HTab" = dontDistribute super."HTab"; "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit" = doDistribute super."HUnit_1_3_0_0"; "HUnit-Diff" = dontDistribute super."HUnit-Diff"; "HUnit-Plus" = dontDistribute super."HUnit-Plus"; "HUnit-approx" = dontDistribute super."HUnit-approx"; @@ -532,6 +533,7 @@ self: super: { "InfixApplicative" = dontDistribute super."InfixApplicative"; "Interpolation" = dontDistribute super."Interpolation"; "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; + "IntervalMap" = doDistribute super."IntervalMap_0_4_1_1"; "Irc" = dontDistribute super."Irc"; "IrrHaskell" = dontDistribute super."IrrHaskell"; "IsNull" = dontDistribute super."IsNull"; @@ -1092,6 +1094,7 @@ self: super: { "air-spec" = dontDistribute super."air-spec"; "air-th" = dontDistribute super."air-th"; "airbrake" = dontDistribute super."airbrake"; + "airship" = doDistribute super."airship_0_4_2_0"; "aivika" = dontDistribute super."aivika"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; @@ -1249,6 +1252,7 @@ self: super: { "atomic-write" = dontDistribute super."atomic-write"; "atomo" = dontDistribute super."atomo"; "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec-arff" = dontDistribute super."attoparsec-arff"; @@ -1451,7 +1455,9 @@ self: super: { "bindynamic" = dontDistribute super."bindynamic"; "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1532,6 +1538,7 @@ self: super: { "breakout" = dontDistribute super."breakout"; "breve" = dontDistribute super."breve"; "brians-brain" = dontDistribute super."brians-brain"; + "brick" = doDistribute super."brick_0_3_1"; "brillig" = dontDistribute super."brillig"; "broccoli" = dontDistribute super."broccoli"; "broker-haskell" = dontDistribute super."broker-haskell"; @@ -1556,6 +1563,7 @@ self: super: { "buster" = dontDistribute super."buster"; "buster-gtk" = dontDistribute super."buster-gtk"; "buster-network" = dontDistribute super."buster-network"; + "bustle" = doDistribute super."bustle_0_5_2"; "butterflies" = dontDistribute super."butterflies"; "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; @@ -1686,6 +1694,7 @@ self: super: { "categorical-algebra" = dontDistribute super."categorical-algebra"; "categories" = dontDistribute super."categories"; "category-extras" = dontDistribute super."category-extras"; + "cayley-client" = doDistribute super."cayley-client_0_1_4_0"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -1762,7 +1771,13 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_7"; + "clash-lib" = doDistribute super."clash-lib_0_6_7"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_4"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_3"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_3"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_4"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1812,6 +1827,7 @@ self: super: { "codecov-haskell" = dontDistribute super."codecov-haskell"; "codemonitor" = dontDistribute super."codemonitor"; "codepad" = dontDistribute super."codepad"; + "codex" = doDistribute super."codex_0_4_0_6"; "codo-notation" = dontDistribute super."codo-notation"; "cofunctor" = dontDistribute super."cofunctor"; "cognimeta-utils" = dontDistribute super."cognimeta-utils"; @@ -1900,6 +1916,7 @@ self: super: { "configifier" = dontDistribute super."configifier"; "configuration" = dontDistribute super."configuration"; "configuration-tools" = dontDistribute super."configuration-tools"; + "configurator-export" = dontDistribute super."configurator-export"; "confsolve" = dontDistribute super."confsolve"; "congruence-relation" = dontDistribute super."congruence-relation"; "conjugateGradient" = dontDistribute super."conjugateGradient"; @@ -2168,6 +2185,7 @@ self: super: { "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; + "dbus" = doDistribute super."dbus_0_10_11"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2251,9 +2269,11 @@ self: super: { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_8"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; @@ -2339,6 +2359,7 @@ self: super: { "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; "doctest-prop" = dontDistribute super."doctest-prop"; "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; @@ -2530,6 +2551,7 @@ self: super: { "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = doDistribute super."esqueleto_2_4_1"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2556,6 +2578,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-mtl" = dontDistribute super."exception-mtl"; + "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2612,6 +2635,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_10"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -2715,6 +2739,7 @@ self: super: { "flowsim" = dontDistribute super."flowsim"; "fltkhs" = dontDistribute super."fltkhs"; "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; "fluent-logger" = dontDistribute super."fluent-logger"; "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; @@ -2763,6 +2788,7 @@ self: super: { "frame" = dontDistribute super."frame"; "frame-markdown" = dontDistribute super."frame-markdown"; "franchise" = dontDistribute super."franchise"; + "free" = doDistribute super."free_4_12_1"; "free-concurrent" = dontDistribute super."free-concurrent"; "free-functors" = dontDistribute super."free-functors"; "free-game" = dontDistribute super."free-game"; @@ -2882,6 +2908,7 @@ self: super: { "geniconvert" = dontDistribute super."geniconvert"; "genifunctors" = dontDistribute super."genifunctors"; "geniplate" = dontDistribute super."geniplate"; + "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1"; "geniserver" = dontDistribute super."geniserver"; "genprog" = dontDistribute super."genprog"; "gentlemark" = dontDistribute super."gentlemark"; @@ -2903,6 +2930,7 @@ self: super: { "ghc-core" = dontDistribute super."ghc-core"; "ghc-core-html" = dontDistribute super."ghc-core-html"; "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; @@ -2954,6 +2982,7 @@ self: super: { "ginsu" = dontDistribute super."ginsu"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20151218"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; @@ -2979,6 +3008,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3176,6 +3206,7 @@ self: super: { "grm" = dontDistribute super."grm"; "groundhog-inspector" = dontDistribute super."groundhog-inspector"; "group-with" = dontDistribute super."group-with"; + "grouped-list" = doDistribute super."grouped-list_0_2_1_0"; "groupoid" = dontDistribute super."groupoid"; "growler" = dontDistribute super."growler"; "gruff" = dontDistribute super."gruff"; @@ -3341,6 +3372,7 @@ self: super: { "happs-tutorial" = dontDistribute super."happs-tutorial"; "happstack" = dontDistribute super."happstack"; "happstack-auth" = dontDistribute super."happstack-auth"; + "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_2"; "happstack-contrib" = dontDistribute super."happstack-contrib"; "happstack-data" = dontDistribute super."happstack-data"; "happstack-dlg" = dontDistribute super."happstack-dlg"; @@ -3381,6 +3413,7 @@ self: super: { "hascat-setup" = dontDistribute super."hascat-setup"; "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; + "hashable" = doDistribute super."hashable_1_2_3_3"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashabler" = dontDistribute super."hashabler"; "hashed-storage" = dontDistribute super."hashed-storage"; @@ -3490,6 +3523,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_15_1"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = dontDistribute super."hasql-postgres"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -3510,6 +3544,7 @@ self: super: { "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_2"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3542,6 +3577,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_2_1"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3567,6 +3603,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; "hellnet" = dontDistribute super."hellnet"; @@ -3611,6 +3648,7 @@ self: super: { "hfiar" = dontDistribute super."hfiar"; "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; "hfusion" = dontDistribute super."hfusion"; @@ -3731,6 +3769,7 @@ self: super: { "hnop" = dontDistribute super."hnop"; "ho-rewriting" = dontDistribute super."ho-rewriting"; "hoauth" = dontDistribute super."hoauth"; + "hoauth2" = doDistribute super."hoauth2_0_5_0"; "hob" = dontDistribute super."hob"; "hobbes" = dontDistribute super."hobbes"; "hobbits" = dontDistribute super."hobbits"; @@ -4029,6 +4068,7 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = doDistribute super."human-readable-duration_0_1_0_0"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-gui" = dontDistribute super."hunit-gui"; @@ -4162,6 +4202,7 @@ self: super: { "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; + "inline-c" = doDistribute super."inline-c_0_5_5_1"; "inline-c-win32" = dontDistribute super."inline-c-win32"; "inline-r" = dontDistribute super."inline-r"; "inquire" = dontDistribute super."inquire"; @@ -4453,6 +4494,7 @@ self: super: { "language-slice" = dontDistribute super."language-slice"; "language-spelling" = dontDistribute super."language-spelling"; "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = doDistribute super."language-thrift_0_6_2_0"; "language-typescript" = dontDistribute super."language-typescript"; "language-vhdl" = dontDistribute super."language-vhdl"; "lat" = dontDistribute super."lat"; @@ -4671,6 +4713,8 @@ self: super: { "loshadka" = dontDistribute super."loshadka"; "lostcities" = dontDistribute super."lostcities"; "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -4686,6 +4730,7 @@ self: super: { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = doDistribute super."luminance_0_9_1"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4786,6 +4831,7 @@ self: super: { "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; "meep" = dontDistribute super."meep"; "mega-sdist" = dontDistribute super."mega-sdist"; + "megaparsec" = doDistribute super."megaparsec_4_2_0"; "meldable-heap" = dontDistribute super."meldable-heap"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; @@ -4795,6 +4841,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_10"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "messente" = dontDistribute super."messente"; @@ -4886,6 +4933,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_16"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -4981,6 +5029,7 @@ self: super: { "multirec" = dontDistribute super."multirec"; "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset" = doDistribute super."multiset_0_3_0"; "multiset-comb" = dontDistribute super."multiset-comb"; "multisetrewrite" = dontDistribute super."multisetrewrite"; "multistate" = dontDistribute super."multistate"; @@ -5558,6 +5607,7 @@ self: super: { "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-schema" = doDistribute super."postgresql-schema_0_1_9"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5933,8 +5983,10 @@ self: super: { "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_7_0_1"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6060,6 +6112,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbv" = doDistribute super."sbv_5_9"; "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; @@ -6196,6 +6249,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; "shakespeare-js" = dontDistribute super."shakespeare-js"; @@ -6436,6 +6490,7 @@ self: super: { "splaytree" = dontDistribute super."splaytree"; "spline3" = dontDistribute super."spline3"; "splines" = dontDistribute super."splines"; + "split" = doDistribute super."split_0_2_2"; "split-channel" = dontDistribute super."split-channel"; "split-record" = dontDistribute super."split-record"; "split-tchan" = dontDistribute super."split-tchan"; @@ -6729,6 +6784,7 @@ self: super: { "terminfo" = doDistribute super."terminfo_0_4_0_2"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; @@ -6768,6 +6824,7 @@ self: super: { "text-postgresql" = dontDistribute super."text-postgresql"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; "text-show-instances" = dontDistribute super."text-show-instances"; @@ -6932,6 +6989,7 @@ self: super: { "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; + "true-name" = doDistribute super."true-name_0_0_0_2"; "truelevel" = dontDistribute super."truelevel"; "trurl" = dontDistribute super."trurl"; "truthful" = dontDistribute super."truthful"; @@ -7240,6 +7298,7 @@ self: super: { "wai-devel" = dontDistribute super."wai-devel"; "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-extra" = doDistribute super."wai-extra_3_0_13_1"; "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; "wai-graceful" = dontDistribute super."wai-graceful"; "wai-handler-devel" = dontDistribute super."wai-handler-devel"; @@ -7251,10 +7310,12 @@ self: super: { "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger" = doDistribute super."wai-logger_2_2_4_1"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7266,6 +7327,7 @@ self: super: { "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; "wai-router" = dontDistribute super."wai-router"; + "wai-routes" = doDistribute super."wai-routes_0_9_4"; "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7303,6 +7365,7 @@ self: super: { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_8_0_4"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 8e2a6180602..ad820012bd1 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -88,7 +88,7 @@ let (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") (enableFeature enableSplitObjs "split-objs") (enableFeature enableLibraryProfiling "library-profiling") - (enableFeature enableExecutableProfiling "executable-profiling") + (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla")) (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic")) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 80d9a5e83c6..e24b039d786 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -776,6 +776,8 @@ self: { pname = "Agda"; version = "2.4.2.5"; sha256 = "959658a372d93b735d92191b372d221461026c98de4f92e56d198b576dfb67ee"; + revision = "1"; + editedCabalFile = "85d09d8a607a351be092c5e168c35b8c303b20765ceb0f01cd34956c44ba7f5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2273,8 +2275,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, parsec, readline }: mkDerivation { pname = "CPL"; - version = "0.0.7"; - sha256 = "27bf5fc5dbc64f1f739250409350ea21143ee4e40594fe72c32e5cb62dd5a2c2"; + version = "0.0.8"; + sha256 = "20d364f60d8250b8a0f07da0864e02815b1527ced1e52b213c5def85339e9438"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -7713,8 +7715,8 @@ self: { ({ mkDerivation, array, base, X11 }: mkDerivation { pname = "HGL"; - version = "3.2.0.5"; - sha256 = "8b97240ff97d3e5eda09d8ceead6e6d7315e444bdbbfd3b9a260942e5e770d7d"; + version = "3.2.2"; + sha256 = "16a355c102ba057b8c9df363bfc65f6cf24a2d3fd9296cae911ab68eef0d762a"; libraryHaskellDepends = [ array base X11 ]; description = "A simple graphics library based on X11 or Win32"; license = stdenv.lib.licenses.bsd3; @@ -9103,7 +9105,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "HTTP_4000_3_1" = callPackage + "HTTP_4000_3_2" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive, conduit , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl , network, network-uri, parsec, pureMD5, split, test-framework @@ -9111,8 +9113,8 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.1"; - sha256 = "0223366708cb318767d2dce84a5f923c5fbfe88d7c4c4f30ad7b824d4e98215c"; + version = "4000.3.2"; + sha256 = "15ee93db252703f87c114bf848eda04ed0c8e3d7411aeb9dc911201aa4f756ae"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -9190,7 +9192,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HUnit" = callPackage + "HUnit_1_3_0_0" = callPackage ({ mkDerivation, base, deepseq, filepath }: mkDerivation { pname = "HUnit"; @@ -9203,9 +9205,10 @@ self: { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HUnit_1_3_1_0" = callPackage + "HUnit" = callPackage ({ mkDerivation, base, deepseq, filepath }: mkDerivation { pname = "HUnit"; @@ -9216,7 +9219,6 @@ self: { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HUnit-Diff" = callPackage @@ -11074,7 +11076,7 @@ self: { license = "unknown"; }) {}; - "IntervalMap" = callPackage + "IntervalMap_0_4_1_1" = callPackage ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }: mkDerivation { pname = "IntervalMap"; @@ -11085,6 +11087,20 @@ self: { homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; description = "Maps from Intervals to values, with efficient search"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "IntervalMap" = callPackage + ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }: + mkDerivation { + pname = "IntervalMap"; + version = "0.5.0.0"; + sha256 = "c4d156c11b6433cf3d31204bd0e6d81aafa9bc9cf6c07ea0a6eac874cea13b1d"; + libraryHaskellDepends = [ base containers deepseq ]; + testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; + homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; + description = "Containers for intervals, with efficient search"; + license = stdenv.lib.licenses.bsd3; }) {}; "Irc" = callPackage @@ -11619,6 +11635,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.1.0"; sha256 = "dc7ee68f2e28e2b2344bdaabd5810ebfc15353d4013cd10387289189e8bae9f9"; + revision = "1"; + editedCabalFile = "5b187d4f46adbd5ff68ddda4f2f0221370dc3f4f47d7a95f652d147a7bd9f36a"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -13299,6 +13317,22 @@ self: { license = "unknown"; }) {}; + "MonadRandom_0_4_2_1" = callPackage + ({ mkDerivation, base, mtl, random, transformers + , transformers-compat + }: + mkDerivation { + pname = "MonadRandom"; + version = "0.4.2.1"; + sha256 = "635871e4f20bb01c6476a0361cc7069b6242d86c87524b0b8b3fad60ebf1fa6d"; + libraryHaskellDepends = [ + base mtl random transformers transformers-compat + ]; + description = "Random-number generation monad"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MonadRandomLazy" = callPackage ({ mkDerivation, base, MonadRandom, mtl, random }: mkDerivation { @@ -15693,6 +15727,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_8_2" = callPackage + ({ mkDerivation, base, containers, random, template-haskell + , test-framework, tf-random, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.8.2"; + sha256 = "98c64de1e2dbf801c54dcdcb8ddc33b3569e0da38b39d711ee6ac505769926aa"; + libraryHaskellDepends = [ + base containers random template-haskell tf-random transformers + ]; + testHaskellDepends = [ + base containers template-haskell test-framework + ]; + jailbreak = true; + homepage = "https://github.com/nick8325/quickcheck"; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -17187,16 +17242,17 @@ self: { "ShellCheck" = callPackage ({ mkDerivation, base, containers, directory, json, mtl, parsec - , QuickCheck, regex-tdfa + , process, QuickCheck, regex-tdfa }: mkDerivation { pname = "ShellCheck"; - version = "0.4.2"; - sha256 = "26a4a0be02cf2dd443b60e0b4900cbe278c207f6118af6a1d95bee70e02221e3"; + version = "0.4.3"; + sha256 = "df71c303c43ae79846c9f9198a4d4ba2c4c2ee4c06974491d7130fcea0b8efdf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory json mtl parsec QuickCheck regex-tdfa + base containers directory json mtl parsec process QuickCheck + regex-tdfa ]; executableHaskellDepends = [ base containers directory json mtl parsec QuickCheck regex-tdfa @@ -18070,6 +18126,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "StateVar_1_1_0_3" = callPackage + ({ mkDerivation, base, stm, transformers }: + mkDerivation { + pname = "StateVar"; + version = "1.1.0.3"; + sha256 = "b494e6895185826cef9c67be54bb73beb2b76ad69a963c5d7e83da59dc0eac2f"; + libraryHaskellDepends = [ base stm transformers ]; + homepage = "https://github.com/haskell-opengl/StateVar"; + description = "State variables"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "StateVar-transformer" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -18931,12 +19000,13 @@ self: { }) {}; "TypeCompose" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, base-orphans }: mkDerivation { pname = "TypeCompose"; - version = "0.9.10"; - sha256 = "b8775cdd8239bfba32b9cc62abf44124bc39be907b5fa29d19f433e31a6ef4f2"; - libraryHaskellDepends = [ base ]; + version = "0.9.11"; + sha256 = "124c2f9971aa8e45c8cc4f706407f9c28805e63b387400a0b2b9e115aa22044a"; + libraryHaskellDepends = [ base base-orphans ]; + jailbreak = true; homepage = "https://github.com/conal/TypeCompose"; description = "Type composition classes & instances"; license = stdenv.lib.licenses.bsd3; @@ -22077,6 +22147,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "adjunctions_4_3" = callPackage + ({ mkDerivation, array, base, comonad, containers, contravariant + , distributive, free, mtl, profunctors, semigroupoids, semigroups + , tagged, transformers, transformers-compat, void + }: + mkDerivation { + pname = "adjunctions"; + version = "4.3"; + sha256 = "b948a14fafe8857f451ae3e474f5264c907b5a2d841d52bf78249ae4749c3ecc"; + libraryHaskellDepends = [ + array base comonad containers contravariant distributive free mtl + profunctors semigroupoids semigroups tagged transformers + transformers-compat void + ]; + homepage = "http://github.com/ekmett/adjunctions/"; + description = "Adjunctions and representable functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "adobe-swatch-exchange" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 , language-css, mtl, pretty @@ -22186,6 +22276,8 @@ self: { pname = "aeson"; version = "0.8.0.2"; sha256 = "0707588dfb5fdfe787eba5b3d5a9950acb224a8dae9dcdcfc9c974ae2b6788d5"; + revision = "1"; + editedCabalFile = "8062e672ca956e133718772983f98be0fda9990c431299afab8b4e22703c943c"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq dlist ghc-prim hashable mtl scientific syb template-haskell text time @@ -22213,6 +22305,8 @@ self: { pname = "aeson"; version = "0.10.0.0"; sha256 = "3fefae24f68fcb47371e8b13664b47f7343e00b21d65efeb6824efe8f21877a6"; + revision = "1"; + editedCabalFile = "e0c6473d5afc602a085c78ec97731f29d4c85581f2d4d7df8df251cfae78bd45"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq dlist ghc-prim hashable mtl scientific syb template-haskell text time transformers @@ -22434,6 +22528,8 @@ self: { pname = "aeson-extra"; version = "0.3.0.0"; sha256 = "b9e54cf293c25bbd5646a777cf71a23c4158b708dd358fe3e705add326d5870f"; + revision = "1"; + editedCabalFile = "a6142a2f67fa6c7363339934a13aa920c1b20c5fcd9312932617470fba9b0328"; libraryHaskellDepends = [ aeson aeson-compat base base-compat bytestring containers exceptions hashable parsec scientific template-haskell text time @@ -23134,7 +23230,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "airship" = callPackage + "airship_0_4_2_0" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, bytestring-trie, case-insensitive, cryptohash , directory, either, filepath, http-date, http-media, http-types @@ -23162,9 +23258,10 @@ self: { homepage = "https://github.com/helium/airship/"; description = "A Webmachine-inspired HTTP library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "airship_0_4_3_0" = callPackage + "airship" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, bytestring-trie, case-insensitive, cryptohash , directory, either, filepath, http-date, http-media, http-types @@ -23192,7 +23289,6 @@ self: { homepage = "https://github.com/helium/airship/"; description = "A Webmachine-inspired HTTP library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika" = callPackage @@ -30699,6 +30795,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "atrans" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "atrans"; + version = "0.1.0.1"; + sha256 = "84440b6c0a27c656a580df640db912a19eb0fb5aaa09a1437f451b5809ee6035"; + libraryHaskellDepends = [ base mtl ]; + homepage = "https://github.com/aphorisme/atrans"; + description = "A small collection of monad (transformer) instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "attempt" = callPackage ({ mkDerivation, base, failure }: mkDerivation { @@ -31477,6 +31585,7 @@ self: { rethinkdb-client-driver scrypt stm text time unordered-containers vector ]; + jailbreak = true; description = "empty"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -33058,6 +33167,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-compat_0_9_0" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.9.0"; + sha256 = "8317b62e0655cd0f1ce46856df50ec948d829065e870b8ccf63dc7223c6c04c1"; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A compatibility layer for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-generics" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -33143,6 +33265,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-orphans_0_5_0" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: + mkDerivation { + pname = "base-orphans"; + version = "0.5.0"; + sha256 = "05ea25f680c0acc65a99acbb39413761181b334566c9be1fcac1c1df8a2d6428"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/haskell-compat/base-orphans#readme"; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-prelude_0_1_6" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -34318,6 +34454,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bifunctors_5_2" = callPackage + ({ mkDerivation, base, comonad, containers, hspec, QuickCheck + , semigroups, tagged, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.2"; + sha256 = "46e173dac5863a7b8404b44ab1ead2de94e743d24a2de571ff086cfb8748de14"; + libraryHaskellDepends = [ + base comonad containers semigroups tagged template-haskell + transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck transformers transformers-compat + ]; + homepage = "http://github.com/ekmett/bifunctors/"; + description = "Bifunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -34637,8 +34795,8 @@ self: { ({ mkDerivation, base, binary }: mkDerivation { pname = "binary-enum"; - version = "0.1.0.0"; - sha256 = "9d35688cc9b761993567385230fa5514b6e7ff2ef06da0fa421a8689e05553f7"; + version = "0.1.2.0"; + sha256 = "15e7d259293db928980579cc8898dc6d545ffeaa5be97635cb93bb65a6a68688"; libraryHaskellDepends = [ base binary ]; homepage = "https://github.com/tolysz/binary-enum"; description = "Simple wrappers around enum types"; @@ -35963,6 +36121,19 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "bini" = callPackage + ({ mkDerivation, base, binary, bytestring }: + mkDerivation { + pname = "bini"; + version = "0.1.3"; + sha256 = "0230985959d9bd82d014ce62e14768cb46cb0b78b77f7ab34d07208976c00981"; + revision = "1"; + editedCabalFile = "9ea37e003df728ff0addc67d1ff8d15533a4baa4c525339c4638bad137d6c953"; + libraryHaskellDepends = [ base binary bytestring ]; + description = "A collection of various methods for reading and writing bini files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bio" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, mtl, old-time, parallel, parsec, process, QuickCheck @@ -36049,6 +36220,39 @@ self: { license = "LGPL"; }) {}; + "biohazard" = callPackage + ({ mkDerivation, aeson, array, async, attoparsec, base, binary + , bytestring, bytestring-mmap, containers, deepseq, directory + , exceptions, filepath, hashable, iteratee, ListLike + , nonlinear-optimization, primitive, random, scientific, stm + , template-haskell, text, transformers, unix, unordered-containers + , Vec, vector, vector-algorithms, vector-th-unbox, zlib + }: + mkDerivation { + pname = "biohazard"; + version = "0.6.2"; + sha256 = "0038256ab3a4072bd542b7fcdcf4a68ee2bd4afce14664bf4c2b3cb04fdef8c2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async attoparsec base binary bytestring bytestring-mmap + containers directory exceptions filepath iteratee ListLike + primitive random scientific stm template-haskell text transformers + unix unordered-containers Vec vector vector-algorithms + vector-th-unbox zlib + ]; + executableHaskellDepends = [ + aeson async base binary bytestring containers deepseq directory + exceptions hashable iteratee nonlinear-optimization random text + transformers unordered-containers vector vector-algorithms + vector-th-unbox + ]; + jailbreak = true; + homepage = "http://github.com/udo-stenzel/biohazard"; + description = "bioinformatics support library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bioinformatics-toolkit" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bbi, binary, bytestring , bytestring-lexing, clustering, colour, conduit, containers @@ -36895,6 +37099,7 @@ self: { testHaskellDepends = [ base containers directory process shake stm text time unix vector ]; + doCheck = false; homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; description = "HTML5 Canvas Graphics Library"; license = stdenv.lib.licenses.bsd3; @@ -38421,7 +38626,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "brick" = callPackage + "brick_0_3_1" = callPackage ({ mkDerivation, base, containers, contravariant, data-default , deepseq, lens, template-haskell, text, text-zipper, transformers , vector, vty @@ -38442,17 +38647,18 @@ self: { homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "brick_0_4" = callPackage + "brick" = callPackage ({ mkDerivation, base, containers, contravariant, data-default , deepseq, lens, template-haskell, text, text-zipper, transformers , vector, vty }: mkDerivation { pname = "brick"; - version = "0.4"; - sha256 = "138fbf408e26ad7cf0dbc9a490e79965a84a9dbd33fa2016791ae295f08f3526"; + version = "0.4.1"; + sha256 = "bea0df7fdcb476fc955f7301e77bfb8845008ab0e36cab2c2dcc1cf679a4595d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38465,7 +38671,6 @@ self: { 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 @@ -39089,11 +39294,11 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bustle" = callPackage + "bustle_0_5_2" = callPackage ({ mkDerivation, base, bytestring, cairo, containers, dbus , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango - , parsec, pcap, process, QuickCheck, setlocale, test-framework - , test-framework-hunit, text, time + , parsec, pcap, process, QuickCheck, setlocale, system-glib + , test-framework, test-framework-hunit, text, time }: mkDerivation { pname = "bustle"; @@ -39101,6 +39306,7 @@ self: { sha256 = "659d75f91d2d08447bce484a8176f6a2cc94cc10a2d732b7e733e4312a527e90"; isLibrary = false; isExecutable = true; + libraryPkgconfigDepends = [ system-glib ]; executableHaskellDepends = [ base bytestring cairo containers dbus directory filepath gio glib gtk3 hgettext mtl pango parsec pcap process setlocale text time @@ -39114,13 +39320,13 @@ self: { description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {system-glib = pkgs.glib;}; - "bustle_0_5_3" = callPackage + "bustle" = callPackage ({ mkDerivation, base, bytestring, cairo, containers, dbus , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango - , parsec, pcap, process, QuickCheck, setlocale, test-framework - , test-framework-hunit, text, time + , parsec, pcap, process, QuickCheck, setlocale, system-glib + , test-framework, test-framework-hunit, text, time }: mkDerivation { pname = "bustle"; @@ -39128,6 +39334,7 @@ self: { sha256 = "9e525611cfb0c0715969b0ea77c2f63aaf7bc6ad70c9cf889a1655b66c0c24fd"; isLibrary = false; isExecutable = true; + libraryPkgconfigDepends = [ system-glib ]; executableHaskellDepends = [ base bytestring cairo containers dbus directory filepath gio glib gtk3 hgettext mtl pango parsec pcap process setlocale text time @@ -39141,7 +39348,7 @@ self: { description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {system-glib = pkgs.glib;}; "butterflies" = callPackage ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw @@ -39359,6 +39566,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytes_0_15_2" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, containers + , directory, doctest, filepath, hashable, mtl, scientific, text + , time, transformers, transformers-compat, unordered-containers + , void + }: + mkDerivation { + pname = "bytes"; + version = "0.15.2"; + sha256 = "0bfaaf70154d3622be1ee620dd75e9c93cf4d4a21544d83f281d01439f261f34"; + libraryHaskellDepends = [ + base binary bytestring cereal containers hashable mtl scientific + text time transformers transformers-compat unordered-containers + void + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "https://github.com/ekmett/bytes"; + description = "Sharing code for serialization between binary and cereal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "byteset" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -40862,6 +41091,7 @@ self: { executableHaskellDepends = [ base bytestring containers directory HTTP process tar ]; + jailbreak = true; homepage = "http://github.com/snoyberg/cabal-nirvana"; description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -41093,6 +41323,7 @@ self: { http-conduit http-types network process resourcet shelly system-fileio system-filepath tar text transformers ]; + jailbreak = true; homepage = "https://github.com/yesodweb/cabal-src"; description = "Alternative install procedure to avoid the diamond dependency issue"; license = stdenv.lib.licenses.bsd3; @@ -41118,6 +41349,7 @@ self: { http-conduit http-types network process resourcet shelly system-fileio system-filepath tar temporary text transformers ]; + jailbreak = true; homepage = "https://github.com/yesodweb/cabal-src"; description = "Alternative install procedure to avoid the diamond dependency issue"; license = stdenv.lib.licenses.bsd3; @@ -41144,6 +41376,7 @@ self: { streaming-commons system-fileio system-filepath tar temporary text transformers ]; + jailbreak = true; homepage = "https://github.com/yesodweb/cabal-src"; description = "Alternative install procedure to avoid the diamond dependency issue"; license = stdenv.lib.licenses.bsd3; @@ -41167,6 +41400,7 @@ self: { http-conduit http-types network process resourcet shelly system-fileio system-filepath tar text transformers ]; + jailbreak = true; homepage = "https://github.com/yesodweb/cabal-src"; description = "Alternative install procedure to avoid the diamond dependency issue"; license = stdenv.lib.licenses.bsd3; @@ -43094,7 +43328,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cayley-client" = callPackage + "cayley-client_0_1_4_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions , http-client, http-conduit, lens, lens-aeson, mtl, text , transformers, unordered-containers, vector @@ -43111,6 +43345,26 @@ self: { homepage = "https://github.com/MichelBoucey/cayley-client"; description = "A Haskell client for the Cayley graph database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cayley-client" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions + , http-client, http-conduit, lens, lens-aeson, mtl, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "cayley-client"; + version = "0.1.5.0"; + sha256 = "9ad3361bda007e98dfc9977c81881d2ccfcb7a8bcded8996d6543c3b95b288b5"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring exceptions http-client + http-conduit lens lens-aeson mtl text transformers + unordered-containers vector + ]; + homepage = "https://github.com/MichelBoucey/cayley-client"; + description = "A Haskell client for the Cayley graph database"; + license = stdenv.lib.licenses.bsd3; }) {}; "cayley-dickson" = callPackage @@ -45121,7 +45375,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc" = callPackage + "clash-ghc_0_6_7" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl , containers, directory, filepath, ghc, ghc-typelits-extra @@ -45145,6 +45399,33 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-ghc" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib + , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl + , containers, directory, filepath, ghc, ghc-typelits-extra + , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl + , process, text, transformers, unbound-generics, unix + , unordered-containers + }: + mkDerivation { + pname = "clash-ghc"; + version = "0.6.8"; + sha256 = "3d7adf1cb5a895a2240fdd74f94540719cf804a0aa3eb3bfc89ef5b0a8644059"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-verilog clash-vhdl containers directory + filepath ghc ghc-typelits-extra ghc-typelits-natnormalise hashable + haskeline lens mtl process text transformers unbound-generics unix + unordered-containers + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-lib_0_5_10" = callPackage @@ -45243,7 +45524,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-lib" = callPackage + "clash-lib_0_6_7" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl , filepath, hashable, lens, mtl, pretty, process, template-haskell @@ -45263,6 +45544,29 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-lib" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, hashable, lens, mtl, pretty, process, template-haskell + , text, time, transformers, unbound-generics, unordered-containers + , uu-parsinglib, wl-pprint-text + }: + mkDerivation { + pname = "clash-lib"; + version = "0.6.8"; + sha256 = "7582ce8364d2e3d2793555d7a80aa0ab90489cabbe9d8640272f9d95d7abec7d"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clash-prelude concurrent-supply + containers deepseq directory errors fgl filepath hashable lens mtl + pretty process template-haskell text time transformers + unbound-generics unordered-containers uu-parsinglib wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude_0_9_2" = callPackage @@ -45308,7 +45612,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-prelude" = callPackage + "clash-prelude_0_10_4" = callPackage ({ mkDerivation, array, base, data-default, doctest, ghc-prim , ghc-typelits-extra, ghc-typelits-natnormalise, Glob, integer-gmp , lens, QuickCheck, reflection, singletons, template-haskell @@ -45327,6 +45631,27 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-prelude" = callPackage + ({ mkDerivation, array, base, data-default, doctest, ghc-prim + , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens + , QuickCheck, reflection, singletons, template-haskell, th-lift + }: + mkDerivation { + pname = "clash-prelude"; + version = "0.10.5"; + sha256 = "5a840a84f1ec02f1c2537b4ee9de0a1d98b71c401e4726e298b108a5ccad39fb"; + libraryHaskellDepends = [ + array base data-default ghc-prim ghc-typelits-extra + ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection + singletons template-haskell th-lift + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude-quickcheck" = callPackage @@ -45414,7 +45739,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-systemverilog" = callPackage + "clash-systemverilog_0_6_3" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -45429,6 +45754,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-systemverilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-systemverilog"; + version = "0.6.4"; + sha256 = "18172fec133b0971b216997e6421ddbb5575431634f5543b17674d7fab2855e5"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-verilog_0_5_7" = callPackage @@ -45503,7 +45846,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-verilog" = callPackage + "clash-verilog_0_6_3" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -45518,6 +45861,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-verilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-verilog"; + version = "0.6.4"; + sha256 = "178fa48768fbdf99f121ee34701431c788451bcb2411cca2156cdf4bedc1b4da"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Verilog backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-vhdl_0_5_8" = callPackage @@ -45592,7 +45953,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-vhdl" = callPackage + "clash-vhdl_0_6_4" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -45607,6 +45968,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-vhdl" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.6.5"; + sha256 = "a613685f811411452739bd13d6616be1314ec110e0f7b9a2f42e8d07d8c652f5"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - VHDL backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "classify" = callPackage @@ -47572,7 +47951,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "codex" = callPackage + "codex_0_4_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash , directory, either, filepath, hackage-db, http-client, lens , machines, machines-directory, MissingH, monad-loops, network @@ -47593,12 +47972,14 @@ self: { base bytestring Cabal directory either filepath hackage-db MissingH monad-loops network process transformers wreq yaml ]; + jailbreak = true; homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "codex_0_4_0_8" = callPackage + "codex" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash , directory, either, filepath, hackage-db, http-client, lens , machines, machines-directory, MissingH, monad-loops, network @@ -47619,11 +48000,9 @@ self: { base bytestring Cabal directory either filepath hackage-db MissingH monad-loops network process transformers wreq yaml ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codo-notation" = callPackage @@ -48310,6 +48689,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5" = callPackage + ({ mkDerivation, base, containers, contravariant, directory + , distributive, doctest, filepath, semigroups, tagged, transformers + , transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5"; + sha256 = "78e5b19da5b701d14ceb2ca19191cc6205b2024ff2f71b754f5e949faa19cb2a"; + libraryHaskellDepends = [ + base containers contravariant distributive semigroups tagged + transformers transformers-compat + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/comonad/"; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -49235,6 +49634,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concurrent-supply_0_1_8" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hashable }: + mkDerivation { + pname = "concurrent-supply"; + version = "0.1.8"; + sha256 = "ccf827dcd221298ae93fad6021c63a06707456de0671706b44f1f2fed867f21f"; + libraryHaskellDepends = [ base ghc-prim hashable ]; + testHaskellDepends = [ base containers ]; + homepage = "http://github.com/ekmett/concurrent-supply/"; + description = "A fast concurrent unique identifier supply with a pure API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-utilities" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -50325,6 +50738,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "configurator-export" = callPackage + ({ mkDerivation, base, configurator, pretty, semigroups, text + , unordered-containers + }: + mkDerivation { + pname = "configurator-export"; + version = "0.1.0.0"; + sha256 = "8efbda4c0e912ebf834099667b8df8e260fbeb35e765de00a5bbf9498c7eeb92"; + libraryHaskellDepends = [ + base configurator pretty semigroups text unordered-containers + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/mstksg/configurator-export"; + description = "Pretty printer and exporter for configurations from the \"configurator\" library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "confsolve" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio , system-filepath, text, time, unordered-containers @@ -50635,6 +51065,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "constraints_0_8" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl + , transformers, transformers-compat + }: + mkDerivation { + pname = "constraints"; + version = "0.8"; + sha256 = "4cd08765345a151f21a0a4c5ef0a85661f4e53ffe807a623d5502d9ed3ae1588"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl transformers + transformers-compat + ]; + homepage = "http://github.com/ekmett/constraints/"; + description = "Constraint manipulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "constructible" = callPackage ({ mkDerivation, arithmoi, base, binary-search, complex-generic }: mkDerivation { @@ -51110,6 +51558,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "contravariant_1_4" = callPackage + ({ mkDerivation, base, semigroups, StateVar, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "contravariant"; + version = "1.4"; + sha256 = "e1666df1373ed784baa7d1e8e963bbc2d1f3c391578ac550ae74e7399173ee84"; + libraryHaskellDepends = [ + base semigroups StateVar transformers transformers-compat void + ]; + homepage = "http://github.com/ekmett/contravariant/"; + description = "Contravariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "contravariant-extras" = callPackage ({ mkDerivation, base, base-prelude, contravariant , template-haskell, tuple-th @@ -52387,8 +52852,8 @@ self: { ({ mkDerivation, array, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "2.5.3"; - sha256 = "c7f2d323f0b558e8a39a387f21d7f93b8449f25082d7e8515cc7f805d2a31919"; + version = "2.5.4"; + sha256 = "d9b1c49aace29dda1189a711888ca39c6af4ab5adb4798e65a1bef489813449e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers parallel ]; @@ -54866,26 +55331,28 @@ 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"; version = "2.10.2"; sha256 = "6337d3fac04711fa2ef5813558b409c59166c5599b0c9d68c418d21cdccfb327"; + revision = "1"; + editedCabalFile = "ef15936009bbe7f50614dfc66bcb182d28129b353e312e82ae301b0517af24fe"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; 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 ]; @@ -54897,7 +55364,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 @@ -56186,8 +56652,8 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "data-ref"; - version = "0.0.1"; - sha256 = "6669a8b1351f826829a85d9b360bfc5328b316272dacb22f7186ef76824687ed"; + version = "0.0.1.1"; + sha256 = "a4dabee83c7419199791d0ebf7870f926b1ca834a361ecfeb3c134f7fa64f268"; libraryHaskellDepends = [ base stm transformers ]; homepage = "http://wiki.haskell.org/Mutable_variable"; description = "Unify STRef and IORef in plain Haskell 98"; @@ -56736,30 +57202,14 @@ self: { }) {}; "dawg-ord" = callPackage - ({ mkDerivation, base, containers, mtl, transformers, vector }: - mkDerivation { - pname = "dawg-ord"; - version = "0.4.0.2"; - sha256 = "a8f007ba497f5592d4e7a6253dcc7b1ed3c8885ec98506571b3135ac94c9e4be"; - revision = "1"; - editedCabalFile = "e855c06865af4ca1c876baf8c89cfe3479efb00501449f2bb717ad749161a638"; - libraryHaskellDepends = [ - base containers mtl transformers vector - ]; - homepage = "https://github.com/kawu/dawg-ord"; - description = "Directed acyclic word graphs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dawg-ord_0_5_0_0" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers , vector }: mkDerivation { pname = "dawg-ord"; - version = "0.5.0.0"; - sha256 = "86d9ba955c6c03c5f9916d11d2c886f6ecdeae488dd3759da397efad2d9ab4cc"; + version = "0.5.0.1"; + sha256 = "febbe3a465f67931bf1a96069680c862b8cd9a423013f85e21204832626a5dee"; libraryHaskellDepends = [ base containers mtl transformers vector ]; @@ -56770,7 +57220,6 @@ self: { homepage = "https://github.com/kawu/dawg-ord"; description = "Directed acyclic word graphs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbcleaner" = callPackage @@ -56876,7 +57325,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "dbus" = callPackage + "dbus_0_10_11" = callPackage ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck , containers, directory, filepath, libxml-sax, network, parsec , process, QuickCheck, random, text, transformers, unix, vector @@ -56899,6 +57348,32 @@ self: { homepage = "https://john-millikin.com/software/haskell-dbus/"; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dbus" = callPackage + ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck + , containers, directory, filepath, libxml-sax, network, parsec + , process, QuickCheck, random, text, transformers, unix, vector + , xml-types + }: + mkDerivation { + pname = "dbus"; + version = "0.10.12"; + sha256 = "f6d7b5640eb03e9598e38b1a2b2e7af1e9d357f3f845fc9528f9750965b92d54"; + libraryHaskellDepends = [ + base bytestring cereal containers libxml-sax network parsec random + text transformers unix vector xml-types + ]; + testHaskellDepends = [ + base bytestring cereal chell chell-quickcheck containers directory + filepath libxml-sax network parsec process QuickCheck random text + transformers unix vector xml-types + ]; + doCheck = false; + homepage = "https://john-millikin.com/software/haskell-dbus/"; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.gpl3; }) {}; "dbus-client" = callPackage @@ -58933,6 +59408,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-builder_0_7_2_2" = callPackage + ({ mkDerivation, base, base-orphans, bytestring, cmdargs + , diagrams-cairo, diagrams-lib, diagrams-postscript + , diagrams-rasterific, diagrams-svg, directory, exceptions + , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens + , lucid-svg, mtl, split, transformers + }: + mkDerivation { + pname = "diagrams-builder"; + version = "0.7.2.2"; + sha256 = "f489b766b89a70700d213df0270e4962e0597928c339e41e02d6b90c9d32567d"; + configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-orphans cmdargs diagrams-lib directory exceptions + filepath hashable haskell-src-exts hint lens mtl split transformers + ]; + executableHaskellDepends = [ + base bytestring cmdargs diagrams-cairo diagrams-lib + diagrams-postscript diagrams-rasterific diagrams-svg directory + filepath JuicyPixels lens lucid-svg + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "hint-based build service for the diagrams graphics EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-cairo_1_2_0_4" = callPackage ({ mkDerivation, base, bytestring, cairo, colour, containers , data-default-class, diagrams-core, diagrams-lib, directory @@ -59147,14 +59651,13 @@ self: { }: mkDerivation { pname = "diagrams-canvas"; - version = "1.3.0.2"; - sha256 = "0c5cd38a5a6eb1186ca0188aef79939c94bc8f2f509e536256e5c156e77e74ca"; + version = "1.3.0.3"; + sha256 = "de44724fa034506ab8c7cd9e494eea1856f0b6a80226ccd2e58b86dcb00e13c1"; libraryHaskellDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative statestack text ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -59491,7 +59994,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-core" = callPackage + "diagrams-core_1_3_0_4" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, semigroups , unordered-containers @@ -59507,6 +60010,25 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "diagrams-core" = callPackage + ({ mkDerivation, adjunctions, base, containers, distributive + , dual-tree, lens, linear, monoid-extras, mtl, semigroups + , unordered-containers + }: + mkDerivation { + pname = "diagrams-core"; + version = "1.3.0.5"; + sha256 = "e898afe6cb88fb8caf9555b700a22021e84783d2cbe825d16cbb8cee461fae8c"; + libraryHaskellDepends = [ + adjunctions base containers distributive dual-tree lens linear + monoid-extras mtl semigroups unordered-containers + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "Core libraries for diagrams EDSL"; + license = stdenv.lib.licenses.bsd3; }) {}; "diagrams-graphviz" = callPackage @@ -59891,7 +60413,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-lib" = callPackage + "diagrams-lib_1_3_0_8" = callPackage ({ mkDerivation, active, adjunctions, array, base, colour , containers, data-default-class, diagrams-core, diagrams-solve , directory, distributive, dual-tree, exceptions, filepath @@ -59913,6 +60435,31 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "diagrams-lib" = callPackage + ({ mkDerivation, active, adjunctions, array, base, colour + , containers, data-default-class, diagrams-core, diagrams-solve + , directory, distributive, dual-tree, exceptions, filepath + , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens + , linear, monoid-extras, mtl, optparse-applicative, process + , semigroups, tagged, text, transformers, unordered-containers + }: + mkDerivation { + pname = "diagrams-lib"; + version = "1.3.0.9"; + sha256 = "e908935df463b5caaa203205cc98a9163ce8d346ac9cb8bca6fe49630c536c85"; + libraryHaskellDepends = [ + active adjunctions array base colour containers data-default-class + diagrams-core diagrams-solve directory distributive dual-tree + exceptions filepath fingertree fsnotify hashable intervals + JuicyPixels lens linear monoid-extras mtl optparse-applicative + process semigroups tagged text transformers unordered-containers + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "Embedded domain-specific language for declarative graphics"; + license = stdenv.lib.licenses.bsd3; }) {}; "diagrams-pandoc" = callPackage @@ -61558,18 +62105,18 @@ self: { "discrimination" = callPackage ({ mkDerivation, array, base, containers, contravariant, deepseq - , ghc-prim, primitive, profunctors, promises, semigroups - , transformers, vector, void + , ghc-prim, hashable, primitive, profunctors, promises, semigroups + , transformers, transformers-compat, vector, void }: mkDerivation { pname = "discrimination"; - version = "0.1"; - sha256 = "818e170c2cbd1447e3d1552bc59d5c1a995ffbf690246ab2863f302c3dbcad85"; + version = "0.2.1"; + sha256 = "b431a43f635af98df8677a44c0e76726b95d12ea338e47db248aa3bbc3be2ccf"; libraryHaskellDepends = [ - array base containers contravariant deepseq ghc-prim primitive - profunctors promises semigroups transformers vector void + array base containers contravariant deepseq ghc-prim hashable + primitive profunctors promises semigroups transformers + transformers-compat vector void ]; - jailbreak = true; homepage = "http://github.com/ekmett/discrimination/"; description = "Fast generic linear-time sorting, joins and container construction"; license = stdenv.lib.licenses.bsd3; @@ -62522,6 +63069,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributive_0_5_0_2" = callPackage + ({ mkDerivation, base, base-orphans, directory, doctest, filepath + , tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "distributive"; + version = "0.5.0.2"; + sha256 = "f884996f491fe5b275b7dda2cebdadfecea0d7788a142546e0271e9575cc1609"; + libraryHaskellDepends = [ + base base-orphans tagged transformers transformers-compat + ]; + testHaskellDepends = [ base directory doctest filepath ]; + jailbreak = true; + homepage = "http://github.com/ekmett/distributive/"; + description = "Distributive functors -- Dual to Traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diversity_0_7_1_1" = callPackage ({ mkDerivation, base, containers, data-ordlist, fasta , math-functions, MonadRandom, optparse-applicative, parsec, pipes @@ -63211,6 +63777,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dom-parser" = callPackage + ({ mkDerivation, base, data-default, hspec, lens, mtl, semigroups + , shakespeare, text, transformers, xml-conduit + }: + mkDerivation { + pname = "dom-parser"; + version = "0.0.1"; + sha256 = "5ade4315c5e59bfbaf1e078a1171c6f3109d4f3bd3c394d7ef923140e253f86b"; + libraryHaskellDepends = [ + base lens mtl semigroups shakespeare text transformers xml-conduit + ]; + testHaskellDepends = [ + base data-default hspec shakespeare text xml-conduit + ]; + homepage = "https://github.com/s9gf4ult/dom-parser"; + description = "Simple monad for parsing DOM"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dom-selector" = callPackage ({ mkDerivation, base, blaze-html, containers, html-conduit, parsec , QuickCheck, template-haskell, text, th-lift, xml-conduit @@ -63756,8 +64341,8 @@ self: { }: mkDerivation { pname = "drifter"; - version = "0.2.1"; - sha256 = "0e7019f08595769149e58e86ce503e636afa52028a68211dd4df1882c03626bd"; + version = "0.2.2"; + sha256 = "e47e0ceff7ff4e33c681719c6a1af3052f0c123c847dae2cb1fb73e08d3311e1"; libraryHaskellDepends = [ base containers fgl text ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck text @@ -63773,15 +64358,15 @@ self: { }: mkDerivation { pname = "drifter-postgresql"; - version = "0.0.1"; - sha256 = "a256bfe89eb0bf8a7191a4a912c77869154fcfb0b178e69804c20036a145f1c7"; + version = "0.0.2"; + sha256 = "07fbd1e08b517d2fde939657237c7a05f2b1d1abe276681ab7254b1ab8415190"; libraryHaskellDepends = [ base drifter either mtl postgresql-simple time ]; testHaskellDepends = [ base drifter either postgresql-simple tasty tasty-hunit text ]; - jailbreak = true; + doCheck = false; description = "PostgreSQL support for the drifter schema migration tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -65198,6 +65783,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "effect-handlers_0_1_0_7" = callPackage + ({ mkDerivation, base, free, hspec, hspec-discover, HUnit + , kan-extensions, mtl, QuickCheck + }: + mkDerivation { + pname = "effect-handlers"; + version = "0.1.0.7"; + sha256 = "42649d2d1b02759e4c455cf36eb968a1496b8de83a3ffbeb1e1d7e6a9efa41f5"; + libraryHaskellDepends = [ base free kan-extensions mtl ]; + testHaskellDepends = [ + base hspec hspec-discover HUnit QuickCheck + ]; + homepage = "https://github.com/edofic/effect-handlers"; + description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "effect-monad" = callPackage ({ mkDerivation, base, ghc-prim, type-level-sets }: mkDerivation { @@ -66385,6 +66988,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, ghc-prim, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "email-validate"; + version = "2.2.0"; + sha256 = "aa7fd3f02c015bbc4ae67c2f3586f16c757d54a8cf09f7a04e70045828d9cb69"; + libraryHaskellDepends = [ attoparsec base bytestring ghc-prim ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; + description = "Validating an email address string against RFC 5322"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validator" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, dns, doctest , email-validate, HUnit, parallel-io, pcre-light, tasty @@ -67521,6 +68144,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors_2_1_1" = callPackage + ({ mkDerivation, base, safe, transformers, transformers-compat + , unexceptionalio + }: + mkDerivation { + pname = "errors"; + version = "2.1.1"; + sha256 = "28002b14fd33135870ed8fad398aeef3c43f1cfb2501ad2e4d9d72f0a3bf19d3"; + libraryHaskellDepends = [ + base safe transformers transformers-compat unexceptionalio + ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersatz_0_2_6_1" = callPackage ({ mkDerivation, array, base, blaze-builder, blaze-textual , bytestring, containers, data-default, data-reify, directory @@ -67758,7 +68397,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "esqueleto" = callPackage + "esqueleto_2_4_1" = callPackage ({ mkDerivation, base, blaze-html, bytestring, conduit, containers , hspec, HUnit, monad-control, monad-logger, persistent , persistent-sqlite, persistent-template, QuickCheck, resourcet @@ -67780,6 +68419,31 @@ self: { homepage = "https://github.com/prowdsponsor/esqueleto"; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "esqueleto" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, conduit, containers + , hspec, HUnit, monad-control, monad-logger, persistent + , persistent-sqlite, persistent-template, QuickCheck, resourcet + , tagged, text, transformers, unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "2.4.2"; + sha256 = "bd5207df73339bf22f426dde9e6945d5a9376a7e12c5a3948291e75d4468174f"; + libraryHaskellDepends = [ + base blaze-html bytestring conduit monad-logger persistent + resourcet tagged text transformers unordered-containers + ]; + testHaskellDepends = [ + base conduit containers hspec HUnit monad-control monad-logger + persistent persistent-sqlite persistent-template QuickCheck + resourcet text transformers + ]; + homepage = "https://github.com/prowdsponsor/esqueleto"; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = stdenv.lib.licenses.bsd3; }) {}; "ess" = callPackage @@ -68509,7 +69173,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "exceptions" = callPackage + "exceptions_0_8_0_2" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, test-framework , test-framework-quickcheck2, transformers, transformers-compat }: @@ -68529,6 +69193,52 @@ self: { homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "exceptions" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-quickcheck2, transformers + , transformers-compat + }: + mkDerivation { + pname = "exceptions"; + version = "0.8.1"; + sha256 = "8e2835cf2d6714d3f687e892872519e8ef8e3c51f4048386474ced94dd1bdbb0"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-quickcheck2 transformers transformers-compat + ]; + jailbreak = true; + doCheck = false; + homepage = "http://github.com/ekmett/exceptions/"; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "exceptions_0_8_2_1" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-quickcheck2, transformers + , transformers-compat + }: + mkDerivation { + pname = "exceptions"; + version = "0.8.2.1"; + sha256 = "c435877ff2f04a1855e50c78bbcbf8c89f3dc42837e440956500599f6d851035"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-quickcheck2 transformers transformers-compat + ]; + homepage = "http://github.com/ekmett/exceptions/"; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "executable-hash_0_2_0_0" = callPackage @@ -68755,8 +69465,8 @@ self: { ({ mkDerivation, base, compensated, log-domain }: mkDerivation { pname = "exp-extended"; - version = "0.1.0.1"; - sha256 = "a78427101de6fb57975be3310a3c59ba5504c3b5edef6da2b9c89fd0730b0f6d"; + version = "0.1.1"; + sha256 = "275f074e88748acd68c0b1aadd8ca56a3cc021c5da5fcdbb68300f18cc532f33"; libraryHaskellDepends = [ base compensated log-domain ]; homepage = "http://code.mathr.co.uk/exp-extended"; description = "floating point with extended exponent range"; @@ -70010,7 +70720,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fay" = callPackage + "fay_0_23_1_10" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , data-default, data-lens-light, directory, filepath, ghc-paths , haskell-src-exts, language-ecmascript, mtl, mtl-compat @@ -70023,6 +70733,38 @@ self: { pname = "fay"; version = "0.23.1.10"; sha256 = "600005bf694f64a394934a7dc539b292d928af27f70169a0ac9af0cd8ee0dc76"; + revision = "2"; + editedCabalFile = "8cd0961f893a01cb5a6fb6cd4b4928992a1b17dc689adc7a0185c21ab3eb483e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers data-default + data-lens-light directory filepath ghc-paths haskell-src-exts + language-ecmascript mtl mtl-compat process safe sourcemap split + spoon syb text time transformers transformers-compat + traverse-with-class type-eq uniplate unordered-containers + utf8-string vector + ]; + executableHaskellDepends = [ base mtl optparse-applicative split ]; + homepage = "https://github.com/faylang/fay/wiki"; + description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "fay" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , data-default, data-lens-light, directory, filepath, ghc-paths + , haskell-src-exts, language-ecmascript, mtl, mtl-compat + , optparse-applicative, process, safe, sourcemap, split, spoon, syb + , text, time, transformers, transformers-compat + , traverse-with-class, type-eq, uniplate, unordered-containers + , utf8-string, vector + }: + mkDerivation { + pname = "fay"; + version = "0.23.1.12"; + sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73114,8 +73856,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.3.0.1"; - sha256 = "121f25a6cc82de7edc7718b4a244803b0a71973784b5a8e01680aabacdc0ad43"; + version = "0.4.0.0"; + sha256 = "7e975cca6e57dc947abdc776a90fb94cee9f30fc8a0f395570c9665d23e53644"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -73132,8 +73874,8 @@ self: { ({ mkDerivation, base, bytestring, fltkhs }: mkDerivation { pname = "fltkhs-fluid-examples"; - version = "0.0.0.2"; - sha256 = "1152b9d4e25df28011abd695fa066a798b11839c34d31eb5ccd2820587eaa3b7"; + version = "0.0.0.3"; + sha256 = "29d569819feafbe4aa9deb6c78a2e3189780e1cbb4aa350a3e32aa18b6435bf0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring fltkhs ]; @@ -73142,6 +73884,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "fltkhs-hello-world" = callPackage + ({ mkDerivation, base, fltkhs }: + mkDerivation { + pname = "fltkhs-hello-world"; + version = "0.0.0.2"; + sha256 = "c7f8e729ba129ba983624da2d8696629c3e476b80ae5ea76a28e1a37ceedade1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base fltkhs ]; + homepage = "http://github.com/deech/fltkhs-hello-world"; + description = "Fltkhs template project"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fluent-logger" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal , cereal-conduit, conduit, conduit-extra, containers, exceptions @@ -73452,6 +74209,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foldl_1_1_3" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers, mwc-random + , primitive, profunctors, text, transformers, vector + }: + mkDerivation { + pname = "foldl"; + version = "1.1.3"; + sha256 = "af81eb42e6530f6f0ba992965c337d89483d755b50c7c94b12325dd793435474"; + libraryHaskellDepends = [ + base bytestring comonad containers mwc-random primitive profunctors + text transformers vector + ]; + description = "Composable, streaming, and efficient left folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldl-incremental" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, foldl , histogram-fill, mwc-random, pipes, QuickCheck, tasty @@ -74548,7 +75322,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "free" = callPackage + "free_4_12_1" = callPackage ({ mkDerivation, base, bifunctors, comonad, distributive , exceptions, mtl, prelude-extras, profunctors, semigroupoids , semigroups, template-haskell, transformers @@ -74564,6 +75338,48 @@ self: { homepage = "http://github.com/ekmett/free/"; description = "Monads for free"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "free" = callPackage + ({ mkDerivation, base, bifunctors, comonad, containers + , distributive, exceptions, mtl, prelude-extras, profunctors + , semigroupoids, semigroups, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "free"; + version = "4.12.2"; + sha256 = "9b65172e90ff03d4daf1d533ed5e967d8a24286ac5facc1edd05e203fe88461b"; + libraryHaskellDepends = [ + base bifunctors comonad containers distributive exceptions mtl + prelude-extras profunctors semigroupoids semigroups + template-haskell transformers transformers-compat + ]; + homepage = "http://github.com/ekmett/free/"; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "free_4_12_4" = callPackage + ({ mkDerivation, base, bifunctors, comonad, containers + , distributive, exceptions, mtl, prelude-extras, profunctors + , semigroupoids, semigroups, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "free"; + version = "4.12.4"; + sha256 = "c9fe45aae387855626ecb5a0fea6afdb207143cb00af3b1f715d1032d2d08784"; + libraryHaskellDepends = [ + base bifunctors comonad containers distributive exceptions mtl + prelude-extras profunctors semigroupoids semigroups + template-haskell transformers transformers-compat + ]; + homepage = "http://github.com/ekmett/free/"; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-concurrent" = callPackage @@ -76946,7 +77762,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "geniplate-mirror" = callPackage + "geniplate-mirror_0_7_1" = callPackage ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; @@ -76956,6 +77772,19 @@ self: { homepage = "https://github.com/danr/geniplate"; description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "geniplate-mirror" = callPackage + ({ mkDerivation, base, mtl, template-haskell }: + mkDerivation { + pname = "geniplate-mirror"; + version = "0.7.2"; + sha256 = "2797766702a57f16739378e6da50e8a074d48318601eb5a3e4528b2819509082"; + libraryHaskellDepends = [ base mtl template-haskell ]; + homepage = "https://github.com/danr/geniplate"; + description = "Use Template Haskell to generate Uniplate-like functions"; + license = stdenv.lib.licenses.bsd3; }) {}; "geniserver" = callPackage @@ -77360,6 +78189,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-dump-tree" = callPackage + ({ mkDerivation, aeson, base, bytestring, ghc, optparse-applicative + , pretty, pretty-show, process, unordered-containers, vector + }: + mkDerivation { + pname = "ghc-dump-tree"; + version = "0.2.0.0"; + sha256 = "2b1cf817fcd1727b029a74d393816da936cb49e9048524dc743afb3d9cc65e5e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring ghc pretty pretty-show process + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring ghc optparse-applicative pretty pretty-show + process unordered-containers vector + ]; + homepage = "https://github.com/edsko/ghc-dump-tree"; + description = "Dump GHC's parsed, renamed, and type checked ASTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-dup" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -78978,7 +79830,7 @@ self: { jailbreak = true; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; - installPhase = "make PREFIX=$out CABAL=./Setup install"; + installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install"; checkPhase = "./git-annex test"; enableSharedExecutables = false; homepage = "http://git-annex.branchable.com/"; @@ -78991,7 +79843,7 @@ self: { inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; - "git-annex" = callPackage + "git-annex_5_20151218" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, case-insensitive , clientsession, concurrent-output, conduit, conduit-extra @@ -79044,7 +79896,73 @@ self: { ]; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; - installPhase = "make PREFIX=$out CABAL=./Setup install"; + installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install"; + checkPhase = "./git-annex test"; + enableSharedExecutables = false; + homepage = "http://git-annex.branchable.com/"; + description = "manage files with git, without checking their contents into git"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; + inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; + inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; + inherit (pkgs) which;}; + + "git-annex" = callPackage + ({ mkDerivation, aeson, async, aws, base, blaze-builder + , bloomfilter, bup, byteable, bytestring, case-insensitive + , clientsession, concurrent-output, conduit, conduit-extra + , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus + , directory, dlist, dns, edit-distance, esqueleto, exceptions + , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify + , hslogger, http-client, http-conduit, http-types, IfElse, json + , lsof, MissingH, monad-control, monad-logger, mtl, network + , network-info, network-multicast, network-protocol-xmpp + , network-uri, old-locale, openssh, optparse-applicative + , path-pieces, perl, persistent, persistent-sqlite + , persistent-template, process, QuickCheck, random, regex-tdfa + , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare + , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun + , template-haskell, text, time, torrent, transformers, unix + , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls + , wget, which, xml-types, yesod, yesod-core, yesod-default + , yesod-form, yesod-static + }: + mkDerivation { + pname = "git-annex"; + version = "6.20160114"; + sha256 = "671d165f9ea583b9a86060b60741c6aa54dbfde0673a2b278d82d761b7500181"; + configureFlags = [ + "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" + "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" + "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" + "-fwebapp-secure" "-fwebdav" "-fxmpp" + ]; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async aws base blaze-builder bloomfilter byteable bytestring + case-insensitive clientsession concurrent-output conduit + conduit-extra containers crypto-api cryptonite data-default DAV + dbus directory dlist dns edit-distance esqueleto exceptions + fdo-notify feed filepath gnutls hinotify hslogger http-client + http-conduit http-types IfElse json MissingH monad-control + monad-logger mtl network network-info network-multicast + network-protocol-xmpp network-uri old-locale optparse-applicative + path-pieces persistent persistent-sqlite persistent-template + process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi + securemem shakespeare stm tasty tasty-hunit tasty-quickcheck + tasty-rerun template-haskell text time torrent transformers unix + unix-compat utf8-string uuid wai wai-extra warp warp-tls xml-types + yesod yesod-core yesod-default yesod-form yesod-static + ]; + executableSystemDepends = [ + bup curl git gnupg lsof openssh perl rsync wget which + ]; + preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; + postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; + installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install"; checkPhase = "./git-annex test"; enableSharedExecutables = false; homepage = "http://git-annex.branchable.com/"; @@ -79891,7 +80809,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gitrev" = callPackage + "gitrev_1_1_0" = callPackage ({ mkDerivation, base, directory, filepath, process , template-haskell }: @@ -79905,9 +80823,10 @@ self: { homepage = "https://github.com/acfoltzer/gitrev"; description = "Compile git revision info into Haskell projects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gitrev_1_2_0" = callPackage + "gitrev" = callPackage ({ mkDerivation, base, directory, filepath, process , template-haskell }: @@ -79921,7 +80840,6 @@ self: { homepage = "https://github.com/acfoltzer/gitrev"; description = "Compile git revision info into Haskell projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitson" = callPackage @@ -80095,6 +81013,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mesa;}; + "gl_0_7_8" = callPackage + ({ mkDerivation, base, containers, directory, filepath, fixed, half + , hxt, mesa, split, transformers + }: + mkDerivation { + pname = "gl"; + version = "0.7.8"; + sha256 = "4ee12e21d759399f56932a14d5aa7e4266c387fa834103680011a0914b9e8db6"; + libraryHaskellDepends = [ + base containers directory filepath fixed half hxt split + transformers + ]; + librarySystemDepends = [ mesa ]; + description = "Complete OpenGL raw bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mesa;}; + "gl-capture" = callPackage ({ mkDerivation, base, bytestring, OpenGL }: mkDerivation { @@ -83153,6 +84089,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graphs_0_7" = callPackage + ({ mkDerivation, array, base, containers, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "graphs"; + version = "0.7"; + sha256 = "eea656ac6092eac99bafc0b7817efa34529b895408fc1267a5b573fb332f6f4c"; + libraryHaskellDepends = [ + array base containers transformers transformers-compat void + ]; + homepage = "http://github.com/ekmett/graphs"; + description = "A simple monadic graph library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "graphtype" = callPackage ({ mkDerivation, base, containers, dotgen, haskell-src-exts , haskell98, uniplate @@ -83763,7 +84716,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "grouped-list" = callPackage + "grouped-list_0_2_1_0" = callPackage ({ mkDerivation, base, containers, deepseq, pointed, QuickCheck , tasty, tasty-quickcheck }: @@ -83776,9 +84729,10 @@ self: { homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md"; description = "Grouped lists. Equal consecutive elements are grouped."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "grouped-list_0_2_1_1" = callPackage + "grouped-list" = callPackage ({ mkDerivation, base, containers, deepseq, pointed, QuickCheck , tasty, tasty-quickcheck }: @@ -83791,7 +84745,6 @@ self: { homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md"; description = "Grouped lists. Equal consecutive elements are grouped."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groupoid" = callPackage @@ -84283,11 +85236,10 @@ self: { ({ mkDerivation, base, glib, gtk, gtk2, x11 }: mkDerivation { pname = "gtk-traymanager"; - version = "0.1.5"; - sha256 = "1582e229aafe22cf5499fe1519e2ff4f49cecbe83a6eb1a8de04f45dd44df443"; + version = "0.1.6"; + sha256 = "cb30f5d55430836032abc876706af0a61de996c9e2b5a4b41c029d3149683642"; libraryHaskellDepends = [ base glib gtk ]; libraryPkgconfigDepends = [ gtk2 x11 ]; - jailbreak = true; homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; @@ -85224,47 +86176,6 @@ self: { }) {}; "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.3"; - sha256 = "2f1ff22747fdef1ac87f0dca27af6a632a5e6cac2201f942243a914ea2cb9a6a"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hOpenPGP_2_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib , conduit, conduit-extra, containers, crypto-cipher-types @@ -86108,10 +87019,8 @@ self: { }: mkDerivation { pname = "hackage-diff"; - version = "0.1.0.0"; - sha256 = "bf8010479ba75032c6750444edc7979a65c6ce4c919a629562ddd81aa03aac4d"; - revision = "1"; - editedCabalFile = "eddc65fed41375eaa4ce2aa729bd35364d558d7e33b23fcafca58dd6ce3cff1c"; + version = "0.1.0.1"; + sha256 = "251410eafa7672c817ef5b697798770b37795e9699e42059aeba9e4b82b4d002"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86240,6 +87149,8 @@ self: { pname = "hackage-repo-tool"; version = "0.1.1"; sha256 = "23f6c2719d42ce51ae8fe9dc6c8d9c8585265486df81d4ca483b28cc917064f4"; + revision = "1"; + editedCabalFile = "0ff107dc07dc9099ef89c1195c1bc26f482ed25bc0d858422ed3c870e7179d0e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86260,8 +87171,8 @@ self: { }: mkDerivation { pname = "hackage-security"; - version = "0.5.0.1"; - sha256 = "84cafa85d8b29eac0fac51f6f03903d217e3f0686b9badea64decb19046cfe9c"; + version = "0.5.0.2"; + sha256 = "4135221bb74e899fde71ff5e878d0401b8c274af6ade996ca7ac15d2b77dbd98"; libraryHaskellDepends = [ base base64-bytestring bytestring Cabal containers cryptohash directory ed25519 filepath ghc-prim mtl network network-uri parsec @@ -87698,6 +88609,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "half_0_2_2_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "half"; + version = "0.2.2.3"; + sha256 = "85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/ekmett/half"; + description = "Half-precision floating-point"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "halfs" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , directory, filepath, fingertree, HFuse, mtl, QuickCheck, random @@ -88251,7 +89175,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "happstack-authenticate" = callPackage + "happstack-authenticate_2_3_2" = callPackage ({ mkDerivation, acid-state, aeson, authenticate, base , base64-bytestring, boomerang, bytestring, containers , data-default, email-validate, filepath, happstack-hsp @@ -88278,6 +89202,36 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "happstack-authenticate" = callPackage + ({ mkDerivation, acid-state, aeson, authenticate, base + , base64-bytestring, boomerang, bytestring, containers + , data-default, email-validate, filepath, happstack-hsp + , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs + , http-conduit, http-types, ixset-typed, jmacro, jwt, lens + , mime-mail, mtl, pwstore-purehaskell, random, safecopy + , shakespeare, text, time, unordered-containers, userid, web-routes + , web-routes-boomerang, web-routes-happstack, web-routes-hsp + , web-routes-th + }: + mkDerivation { + pname = "happstack-authenticate"; + version = "2.3.3"; + sha256 = "e8bd1802370ad1d6f3099eb1a6ab4310a52aaaac1a7b0644d574dc71ee7c55d0"; + libraryHaskellDepends = [ + acid-state aeson authenticate base base64-bytestring boomerang + bytestring containers data-default email-validate filepath + happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro + hsx2hs http-conduit http-types ixset-typed jmacro jwt lens + mime-mail mtl pwstore-purehaskell random safecopy shakespeare text + time unordered-containers userid web-routes web-routes-boomerang + web-routes-happstack web-routes-hsp web-routes-th + ]; + homepage = "http://www.happstack.com/"; + description = "Happstack Authentication Library"; + license = stdenv.lib.licenses.bsd3; }) {}; "happstack-clientsession" = callPackage @@ -89362,7 +90316,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hashable" = callPackage + "hashable_1_2_3_3" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp , QuickCheck, random, test-framework, test-framework-hunit , test-framework-quickcheck2, text, unix @@ -89371,6 +90325,30 @@ self: { pname = "hashable"; version = "1.2.3.3"; sha256 = "fc923f7d1fdc0062416a61f6ab96b4e1958e1aee1ddf1c71fa2cc6d08154e44e"; + revision = "2"; + editedCabalFile = "abaa1b40915bdb6b825db78b8db5d375365c6dc0e0d94cc1e47a20d1aa7b8712"; + libraryHaskellDepends = [ + base bytestring ghc-prim integer-gmp text + ]; + testHaskellDepends = [ + base bytestring ghc-prim HUnit QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text unix + ]; + homepage = "http://github.com/tibbe/hashable"; + description = "A class for types that can be converted to a hash value"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hashable" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp + , QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.2.4.0"; + sha256 = "fb9671db0c39cd48d38e2e13e3352e2bf7dfa6341edfe68789a1753d21bb3cf3"; libraryHaskellDepends = [ base bytestring ghc-prim integer-gmp text ]; @@ -89440,6 +90418,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashable-extras_0_2_3" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, directory, doctest + , filepath, hashable, transformers, transformers-compat + }: + mkDerivation { + pname = "hashable-extras"; + version = "0.2.3"; + sha256 = "03e0303a50e265d8682402152c90e199d0f4685a1e553bf20a380652d6f06b6a"; + libraryHaskellDepends = [ + base bifunctors bytestring hashable transformers + transformers-compat + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/analytics/hashable-extras/"; + description = "Higher-rank Hashable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashable-generics" = callPackage ({ mkDerivation, base, ghc-prim, hashable, QuickCheck , test-framework, test-framework-quickcheck2 @@ -91021,8 +92018,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.2.9"; - sha256 = "eafc441bad4f15d60c8686c189d6dd49ea9e87bdddf09a24cef2a3eca9eca859"; + version = "1.2.10"; + sha256 = "e9712ccaa38bb2ca4242272eee72c72e5b2d0943d7d35c846fccdd89a5428e7d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91495,8 +92492,8 @@ self: { }: mkDerivation { pname = "haskellscrabble"; - version = "1.3.3"; - sha256 = "3de776ff49e739f760ac37d296e4f0f5e9857624a454ca0cc18f85ae4ddbd01f"; + version = "1.4.3"; + sha256 = "73b49427676a19a55bc8c86deee8b1864cdbd39f15b74d811d7b8cc8ac1f3d9b"; libraryHaskellDepends = [ array arrows base containers errors listsafe mtl parsec QuickCheck random safe semigroups split transformers unordered-containers @@ -92399,7 +93396,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hasql" = callPackage + "hasql_0_15_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , contravariant, contravariant-extras, data-default-class, dlist , either, hashable, hashtables, loch-th, placeholders @@ -92428,6 +93425,39 @@ self: { homepage = "https://github.com/nikita-volkov/hasql"; description = "A very efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hasql" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , contravariant, contravariant-extras, data-default-class, dlist + , either, hashable, hashtables, loch-th, mtl, placeholders + , postgresql-binary, postgresql-libpq, profunctors, QuickCheck + , quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.3.1"; + sha256 = "b31e66b2baecbc238e24e0914897bfbb6261124da17efe18e821eb52ec18d6e3"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring contravariant + contravariant-extras data-default-class dlist either hashable + hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors scientific text time transformers uuid + vector + ]; + testHaskellDepends = [ + base base-prelude bytestring contravariant contravariant-extras + data-default-class dlist either hashable profunctors QuickCheck + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text time transformers uuid vector + ]; + doCheck = false; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "A very efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; }) {}; "hasql-backend_0_2_1" = callPackage @@ -92549,8 +93579,8 @@ self: { ({ mkDerivation, base-prelude, hasql, resource-pool, time }: mkDerivation { pname = "hasql-pool"; - version = "0.1"; - sha256 = "be1db9c80ebdaf6f1ef0e75970e28286d435141a515ea6f83742373ffb51e330"; + version = "0.3"; + sha256 = "7afb74396758b9df4e5a5c0b2d63de1253e7717011eaea6269f9740423f18428"; libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; homepage = "https://github.com/nikita-volkov/hasql-pool"; description = "A pool of connections for Hasql"; @@ -92897,16 +93927,14 @@ self: { }) {}; "hasql-th" = callPackage - ({ mkDerivation, attoparsec, base-prelude, bytestring, hasql - , hasql-transaction, template-haskell, text + ({ mkDerivation, base-prelude, bytestring, template-haskell, text }: mkDerivation { pname = "hasql-th"; - version = "0.1.0.1"; - sha256 = "170b6128b06e57675778de8b8ffe29ea0082cb8d2047d67f1fce0a5d0e45c2bf"; + version = "0.2"; + sha256 = "c08dab84a62bb5adff1e8f0aa2e0a626d1a8347597ca287deebb12b46602a4e4"; libraryHaskellDepends = [ - attoparsec base-prelude bytestring hasql hasql-transaction - template-haskell text + base-prelude bytestring template-haskell text ]; homepage = "https://github.com/nikita-volkov/hasql-th"; description = "Template Haskell utilities for Hasql"; @@ -92916,16 +93944,16 @@ self: { "hasql-transaction" = callPackage ({ mkDerivation, base-prelude, bytestring, bytestring-tree-builder - , contravariant, contravariant-extras, either, hasql + , contravariant, contravariant-extras, either, hasql, mtl , postgresql-error-codes, transformers }: mkDerivation { pname = "hasql-transaction"; - version = "0.3.1"; - sha256 = "dec9cbb6be2ca68da83af8a512293f6b41ebfc7747cc38105d5aed11625c9037"; + version = "0.4.2"; + sha256 = "b8e6e62cae96802c7f74620106d0e7b17b3fdd8ad0b30f58c81f8c8550ddea49"; libraryHaskellDepends = [ base-prelude bytestring bytestring-tree-builder contravariant - contravariant-extras either hasql postgresql-error-codes + contravariant-extras either hasql mtl postgresql-error-codes transformers ]; homepage = "https://github.com/nikita-volkov/hasql-transaction"; @@ -93419,7 +94447,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haxr" = callPackage + "haxr_3000_11_1_2" = callPackage ({ mkDerivation, array, base, base-compat, base64-bytestring , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams , http-types, io-streams, mtl, mtl-compat, network, network-uri @@ -93438,6 +94466,28 @@ self: { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haxr" = callPackage + ({ mkDerivation, array, base, base-compat, base64-bytestring + , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams + , http-types, io-streams, mtl, mtl-compat, network, network-uri + , old-locale, old-time, template-haskell, time, utf8-string + }: + mkDerivation { + pname = "haxr"; + version = "3000.11.1.3"; + sha256 = "99aafefc48dfd49c4d638dd9b049c602aa69cf22eafa8dcbd5c6b1a3a379ad53"; + libraryHaskellDepends = [ + array base base-compat base64-bytestring blaze-builder bytestring + HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat + network network-uri old-locale old-time template-haskell time + utf8-string + ]; + homepage = "http://www.haskell.org/haskellwiki/HaXR"; + description = "XML-RPC client and server library"; + license = stdenv.lib.licenses.bsd3; }) {}; "haxr-th" = callPackage @@ -94173,7 +95223,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hdevtools" = callPackage + "hdevtools_0_1_2_1" = callPackage ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory , filepath, ghc, ghc-paths, network, process, syb, time, unix }: @@ -94190,9 +95240,10 @@ self: { homepage = "https://github.com/schell/hdevtools/"; description = "Persistent GHC powered background server for FAST haskell development tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hdevtools_0_1_2_2" = callPackage + "hdevtools" = callPackage ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory , filepath, ghc, ghc-paths, network, process, syb, time , transformers, unix @@ -94210,7 +95261,6 @@ self: { homepage = "https://github.com/hdevtools/hdevtools/"; description = "Persistent GHC powered background server for FAST haskell development tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdf" = callPackage @@ -94506,6 +95556,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heaps_0_3_3" = callPackage + ({ mkDerivation, base, directory, doctest, filepath }: + mkDerivation { + pname = "heaps"; + version = "0.3.3"; + sha256 = "04e358d3e6d8ca7786749b6d3945e18159506f8b21ca48b1913c771dcaae1537"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base directory doctest filepath ]; + jailbreak = true; + homepage = "http://github.com/ekmett/heaps/"; + description = "Asymptotically optimal Brodal/Okasaki heaps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heapsort" = callPackage ({ mkDerivation, array, base, QuickCheck }: mkDerivation { @@ -94916,6 +95981,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "helix" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, data-default-class + , filepath, hspec, hspec-wai, hspec-wai-json, http-types + , mime-types, monad-loops, mtl, path-pieces, random + , template-haskell, text, vault, wai, wai-app-static, wai-extra + }: + mkDerivation { + pname = "helix"; + version = "0.9.5"; + sha256 = "20e24be12f0db6cf15ec66d28e20e0a14f1fcba79a728aad3843d48f4f581fab"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive containers + cookie data-default-class filepath http-types mime-types + monad-loops mtl path-pieces random template-haskell text vault wai + wai-app-static wai-extra + ]; + testHaskellDepends = [ + aeson base hspec hspec-wai hspec-wai-json text wai + ]; + homepage = "https://ajnsit.github.io/helix/"; + description = "Web development micro framework for haskell with typesafe URLs"; + license = stdenv.lib.licenses.mit; + }) {}; + "hell" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , data-default, directory, filepath, ghc, ghc-paths, haskeline @@ -95810,6 +96900,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hformat" = callPackage + ({ mkDerivation, base, base-unicode-symbols, hspec, text }: + mkDerivation { + pname = "hformat"; + version = "0.1.0.0"; + sha256 = "722f3d6bcf285477c93c68bcf62a23312cc8715d573989d87c8c1a6d0e725323"; + libraryHaskellDepends = [ base base-unicode-symbols text ]; + testHaskellDepends = [ base base-unicode-symbols hspec text ]; + homepage = "http://github.com/mvoidex/hformat"; + description = "Simple Haskell formatting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hfov" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -98224,8 +99327,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "0.27.2"; - sha256 = "aa637d484796eda892cc2e1b1138746ac7c2b4bf0dba0855b257100fe4a2bcba"; + version = "0.27.3"; + sha256 = "87dcd09479acc3e84a883d427c988a110451dee75a5e1f1c9d5ea2b34e99c4c1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99677,7 +100780,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hoauth2" = callPackage + "hoauth2_0_5_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-conduit , http-types, text, wai, warp }: @@ -99697,6 +100800,29 @@ self: { homepage = "https://github.com/freizl/hoauth2"; description = "hoauth2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hoauth2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-conduit + , http-types, text, wai, warp + }: + mkDerivation { + pname = "hoauth2"; + version = "0.5.0.1"; + sha256 = "17766cb63f0f232b6ad21d855e32fa88da7d4f5ae5c545f391c5b92d4cd57468"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-conduit http-types text + ]; + executableHaskellDepends = [ + aeson base bytestring containers http-conduit http-types text wai + warp + ]; + homepage = "https://github.com/freizl/hoauth2"; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; }) {}; "hoauth2_0_5_1" = callPackage @@ -103538,40 +104664,42 @@ self: { }) {}; "hsdev" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base - , bin-package-db, bytestring, Cabal, containers, deepseq, directory - , exceptions, filepath, fsnotify, ghc, ghc-mod, ghc-paths - , ghc-syb-utils, haddock-api, haskell-src-exts, hdocs, hlint, HTTP - , lens, lifted-base, monad-control, monad-loops - , MonadCatchIO-transformers, mtl, network, process - , regex-pcre-builtin, scientific, simple-log, syb, template-haskell - , text, time, transformers, transformers-base, uniplate, unix + ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec + , base, bin-package-db, bytestring, Cabal, containers, cpphs + , data-default, deepseq, directory, exceptions, filepath, fsnotify + , ghc, ghc-mod, ghc-paths, ghc-syb-utils, haddock-api + , haskell-src-exts, hdocs, hformat, hlint, HTTP, lens, lifted-base + , monad-control, monad-loops, MonadCatchIO-transformers, mtl + , network, optparse-applicative, process, regex-pcre-builtin + , scientific, simple-log, syb, template-haskell, text, text-region + , time, transformers, transformers-base, uniplate, unix , unordered-containers, vector }: mkDerivation { pname = "hsdev"; - version = "0.1.4.3"; - sha256 = "66c1bf834bfff8030533f056bb57d4fc4a61d1698ea10c217c9841d2b13aa9ad"; - revision = "1"; - editedCabalFile = "42abb281e07630ed6ebee4022d6b07fef645d7b2e5c20f36de0d65f96e3ab0d7"; + version = "0.1.5.2"; + sha256 = "c60c0ff6283a3b3a043f63598440fe9a577409037bb252481171d1ce839df86f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty array attoparsec base bin-package-db bytestring - Cabal containers deepseq directory exceptions filepath fsnotify ghc - ghc-mod ghc-paths ghc-syb-utils haddock-api haskell-src-exts hdocs - hlint HTTP lens lifted-base monad-control monad-loops - MonadCatchIO-transformers mtl network process regex-pcre-builtin - scientific simple-log syb template-haskell text time transformers + aeson aeson-pretty array async attoparsec base bin-package-db + bytestring Cabal containers cpphs data-default deepseq directory + exceptions filepath fsnotify ghc ghc-mod ghc-paths ghc-syb-utils + haddock-api haskell-src-exts hdocs hformat hlint HTTP lens + lifted-base monad-control monad-loops MonadCatchIO-transformers mtl + network optparse-applicative process regex-pcre-builtin scientific + simple-log syb template-haskell text text-region time transformers transformers-base uniplate unix unordered-containers vector ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring containers deepseq directory exceptions filepath ghc haskell-src-exts lens monad-loops mtl - network process text transformers unordered-containers vector + network optparse-applicative process text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + async base containers data-default deepseq hformat lens mtl text ]; - testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc"; license = stdenv.lib.licenses.bsd3; @@ -104725,6 +105853,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_2_2" = callPackage + ({ mkDerivation, base, directory, hspec-core, hspec-discover + , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder + , transformers + }: + mkDerivation { + pname = "hspec"; + version = "2.2.2"; + sha256 = "91310e6feb10c31b23ec2739422f8ed25ed43bc606bd355cb034a66bb297c9d9"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations HUnit QuickCheck + transformers + ]; + testHaskellDepends = [ + base directory hspec-core hspec-meta stringbuilder + ]; + jailbreak = true; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -104991,6 +106142,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_2_2" = callPackage + ({ mkDerivation, ansi-terminal, async, base, deepseq + , hspec-expectations, hspec-meta, HUnit, process, QuickCheck + , quickcheck-io, random, setenv, silently, tf-random, time + , transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.2.2"; + sha256 = "01344835b8de81371087d187dbdb1011eea2c7e41132ed4edad643136d464398"; + libraryHaskellDepends = [ + ansi-terminal async base deepseq hspec-expectations HUnit + QuickCheck quickcheck-io random setenv tf-random time transformers + ]; + testHaskellDepends = [ + ansi-terminal async base deepseq hspec-expectations hspec-meta + HUnit process QuickCheck quickcheck-io random setenv silently + tf-random time transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-discover_2_1_2" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { @@ -105127,6 +106303,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_2_2" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta }: + mkDerivation { + pname = "hspec-discover"; + version = "2.2.2"; + sha256 = "4279c668ee8b537ad8192db47ba4a2c30fd49a90f6f5858bd7d2c835e752e81f"; + isLibrary = true; + isExecutable = true; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ base directory filepath hspec-meta ]; + doHaddock = false; + homepage = "http://hspec.github.io/"; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations_0_6_1" = callPackage ({ mkDerivation, base, hspec, HUnit, markdown-unlit, silently }: mkDerivation { @@ -105375,6 +106568,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-meta_2_2_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, deepseq, directory + , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io + , random, setenv, time, transformers + }: + mkDerivation { + pname = "hspec-meta"; + version = "2.2.1"; + sha256 = "aa7b54c33cad9842783035d1a5cddbbbc3d556c8b2c8f6d0e6bfd3177b9e37d4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async base deepseq hspec-expectations HUnit + QuickCheck quickcheck-io random setenv time transformers + ]; + executableHaskellDepends = [ base directory filepath ]; + homepage = "http://hspec.github.io/"; + description = "A version of Hspec which is used to test Hspec itself"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-monad-control" = callPackage ({ mkDerivation, base, hspec-core, monad-control, transformers , transformers-base @@ -106489,8 +107704,8 @@ self: { }) {}; "htar" = callPackage - ({ mkDerivation, base, bytestring, bzlib, directory, filepath, tar - , time, zlib + ({ mkDerivation, base, bytestring, bzlib, directory, filepath + , old-locale, tar, time, zlib }: mkDerivation { pname = "htar"; @@ -106499,8 +107714,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring bzlib directory filepath tar time zlib + base bytestring bzlib directory filepath old-locale tar time zlib ]; + jailbreak = true; description = "Command-line tar archive utility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -108741,7 +109957,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http2_1_4_0" = callPackage + "http2_1_4_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , bytestring-builder, containers, directory, doctest, filepath , Glob, hex, hspec, mwc-random, psqueues, stm, text @@ -108749,8 +109965,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "1.4.0"; - sha256 = "26ffd2cb8ec5f44da3ca1c14640a356d55177ecb4e463fa6defef788902c409f"; + version = "1.4.2"; + sha256 = "721c4a0e70594e6750cedbaa795b44a0b1f1ea332c4ac5eb453e42464f86e2d9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109001,7 +110217,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "human-readable-duration" = callPackage + "human-readable-duration_0_1_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "human-readable-duration"; @@ -109011,6 +110227,19 @@ self: { homepage = "http://github.com/yogsototh/human-readable-duration#readme"; description = "Provide duration helper"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "human-readable-duration" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "human-readable-duration"; + version = "0.2.0.0"; + sha256 = "4c1959b3014c2e7dcdc754814129e4a3e5f4b5d7eb317f0f315f1d01025d097d"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/yogsototh/human-readable-duration#readme"; + description = "Provide duration helper"; + license = stdenv.lib.licenses.bsd3; }) {}; "hums" = callPackage @@ -111462,6 +112691,7 @@ self: { haddock-api ide-backend-common mtl process tar temporary text time transformers unix unordered-containers zlib ]; + jailbreak = true; description = "An IDE backend server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -111486,6 +112716,7 @@ self: { haddock-api ide-backend-common mtl network process tar temporary text time transformers unix unordered-containers zlib ]; + jailbreak = true; description = "An IDE backend server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -112339,30 +113570,27 @@ self: { }) {}; "imagemagick" = callPackage - ({ mkDerivation, base, bytestring, directory, HUnit, imagemagick + ({ mkDerivation, base, bytestring, directory, filepath, imagemagick , lifted-base, MonadCatchIO-transformers, QuickCheck, resourcet - , system-filepath, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, transformers, vector + , tasty, tasty-hunit, text, transformers, vector }: mkDerivation { pname = "imagemagick"; - version = "0.0.3.7"; - sha256 = "e33b0437468e785465852e244c0ec5a1dcebb989d7873e3ddec47167a1fec0f7"; + version = "0.0.4"; + sha256 = "0faa50be5db638cdcd51c0e35fd418041204eff0173547a2d076995fa163b82f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring MonadCatchIO-transformers resourcet system-filepath - text transformers vector + base bytestring filepath MonadCatchIO-transformers resourcet text + transformers vector ]; libraryPkgconfigDepends = [ imagemagick ]; executablePkgconfigDepends = [ imagemagick ]; testHaskellDepends = [ - base bytestring directory HUnit lifted-base QuickCheck resourcet - system-filepath test-framework test-framework-hunit - test-framework-quickcheck2 text transformers vector + base bytestring directory filepath lifted-base QuickCheck resourcet + tasty tasty-hunit text transformers vector ]; testPkgconfigDepends = [ imagemagick ]; - jailbreak = true; description = "bindings to imagemagick library"; license = "unknown"; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; @@ -112854,9 +114082,11 @@ self: { pname = "indentation"; version = "0.2.1.1"; sha256 = "72134a7c01812ccadacf1c5db86e40892136e7bf583b85c083b088cec19e65f1"; + revision = "1"; + editedCabalFile = "642875a7d7d3b8bd626f1671ff1dad1a8584bfa0fab236e5e404d8b26345317e"; libraryHaskellDepends = [ base mtl parsec parsers trifecta ]; testHaskellDepends = [ base parsec tasty tasty-hunit trifecta ]; - homepage = "https://bitbucket.org/mdmkolbe/indentation"; + homepage = "https://bitbucket.org/adamsmd/indentation"; description = "Indentation sensitive parsing combinators for Parsec and Trifecta"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -113333,7 +114563,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "inline-c" = callPackage + "inline-c_0_5_5_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring , containers, cryptohash, directory, filepath, gsl, gslcblas , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq @@ -113359,6 +114589,35 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl; gslcblas = null;}; + + "inline-c" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring + , containers, cryptohash, directory, filepath, gsl, gslcblas + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, template-haskell, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.5.5.2"; + sha256 = "b1265ed095cc1b832d20e3c30de574817f906534f46660ed2ff55b85b15677d6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base binary bytestring containers cryptohash + directory filepath hashable mtl parsec parsers QuickCheck + template-haskell transformers unordered-containers vector + ]; + executableSystemDepends = [ gsl gslcblas ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; }) {inherit (pkgs) gsl; gslcblas = null;}; "inline-c-cpp" = callPackage @@ -113914,6 +115173,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "intervals_0_7_2" = callPackage + ({ mkDerivation, array, base, directory, distributive, doctest + , filepath, ghc-prim, QuickCheck, template-haskell + }: + mkDerivation { + pname = "intervals"; + version = "0.7.2"; + sha256 = "0dd04a7dfd0ac6b364c66b78dafa48739c5116253078d4023e104f5e99d5fe28"; + libraryHaskellDepends = [ array base distributive ghc-prim ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "http://github.com/ekmett/intervals"; + description = "Interval Arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intricacy" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , cryptohash, directory, filepath, hscurses, mtl, network-fancy @@ -114382,8 +115659,8 @@ self: { }: mkDerivation { pname = "ipopt-hs"; - version = "0.5.0.0"; - sha256 = "2cd1a8c4c7f8bac55384f38ed25397e1ec7702f477f586e89a2ecee5c7b1970d"; + version = "0.5.1.0"; + sha256 = "aaf193c06daed43998d4d37f7916d8c1bb73b61e01815755eff61bd2c472344a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115780,8 +117057,8 @@ self: { ({ mkDerivation, base, random-shuffle }: mkDerivation { pname = "java-poker"; - version = "0.1.1.0"; - sha256 = "e8e09b478e518e91a4fe50cdb60161a45c774ff919e95c47527aee6f805f35da"; + version = "0.1.2.0"; + sha256 = "031e0b69cb30ac98acfc59b067ccc73fdda6b2abe446f3fc501c56593e83c213"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random-shuffle ]; @@ -117706,6 +118983,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kan-extensions_5_0_1" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, free, mtl, semigroupoids, tagged + , transformers + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.0.1"; + sha256 = "01de9fe57064a125ecb1d1161519df27043c2058ca246bbd5cd2d73c899ba0e2"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive free mtl semigroupoids tagged transformers + ]; + homepage = "http://github.com/ekmett/kan-extensions/"; + description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -117747,6 +119043,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1"; + revision = "1"; + editedCabalFile = "6f3238173ad5a0fbdd82c2b73e96b4c43f17fa45f76f7249e6e925ed7eef9a97"; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time transformers unordered-containers @@ -118756,6 +120054,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "keys_3_11" = callPackage + ({ mkDerivation, array, base, comonad, containers, free, hashable + , semigroupoids, semigroups, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "keys"; + version = "3.11"; + sha256 = "0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2"; + libraryHaskellDepends = [ + array base comonad containers free hashable semigroupoids + semigroups transformers transformers-compat unordered-containers + ]; + homepage = "http://github.com/ekmett/keys/"; + description = "Keyed functors and containers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "keystore" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, api-tools , asn1-encoding, asn1-types, base, base64-bytestring, byteable @@ -121303,7 +122620,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-thrift" = callPackage + "language-thrift_0_6_2_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens , parsers, QuickCheck, template-haskell, text, transformers , trifecta, wl-pprint @@ -121326,6 +122643,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-thrift" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens + , parsers, QuickCheck, template-haskell, text, transformers + , trifecta, wl-pprint + }: + mkDerivation { + pname = "language-thrift"; + version = "0.7.0.0"; + sha256 = "41ebf1f8f630b6add359b648b32c366a85e68007ffd4af6e6649ace2fd3b79ab"; + libraryHaskellDepends = [ + ansi-wl-pprint base lens parsers template-haskell text transformers + trifecta wl-pprint + ]; + testHaskellDepends = [ + ansi-wl-pprint base hspec hspec-discover parsers QuickCheck text + trifecta wl-pprint + ]; + homepage = "https://github.com/abhinav/language-thrift"; + description = "Parser and pretty printer for the Thrift IDL format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-typescript" = callPackage ({ mkDerivation, base, containers, parsec, pretty }: mkDerivation { @@ -122314,6 +123654,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens_4_13_1" = callPackage + ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring + , comonad, containers, contravariant, deepseq, directory + , distributive, doctest, exceptions, filepath, free + , generic-deriving, ghc-prim, hashable, hlint, HUnit + , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck + , reflection, semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, text, transformers + , transformers-compat, unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.13.1"; + sha256 = "987137d11f189e08ceeb0e2e5c047c1456ad666642974067d2d8e11309ef6b7b"; + libraryHaskellDepends = [ + array base base-orphans bifunctors bytestring comonad containers + contravariant distributive exceptions filepath free ghc-prim + hashable kan-extensions mtl parallel profunctors reflection + semigroupoids semigroups tagged template-haskell text transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving hlint HUnit mtl nats parallel QuickCheck + semigroups simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + jailbreak = true; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-action_0_1_0_1" = callPackage ({ mkDerivation, base, comonad, contravariant, directory, doctest , filepath, lens, mtl, profunctors, semigroupoids, semigroups @@ -124295,6 +125671,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear_1_20_4" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, cereal, containers, deepseq, directory, distributive + , doctest, filepath, ghc-prim, hashable, HUnit, lens, reflection + , semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.20.4"; + sha256 = "7bd91c482611f9b7226ec346a9630d2cf1975672b3a67e1b52ae24cdd039ddd3"; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable lens reflection + semigroupoids semigroups tagged template-haskell transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring directory doctest filepath HUnit lens + simple-reflect test-framework test-framework-hunit + ]; + jailbreak = true; + homepage = "http://github.com/ekmett/linear/"; + description = "Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, lens, linear }: mkDerivation { @@ -126871,6 +128277,45 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "lp-diagrams" = callPackage + ({ mkDerivation, base, containers, glpk-hs, graphviz, labeled-tree + , lens, mtl, polynomials-bernstein, text, typography-geometry + , vector + }: + mkDerivation { + pname = "lp-diagrams"; + version = "1.0"; + sha256 = "f10a4e0258fed5fde24a787d248a6e115c912374314f4091f11421500159b6a1"; + libraryHaskellDepends = [ + base containers glpk-hs graphviz labeled-tree lens mtl + polynomials-bernstein text typography-geometry vector + ]; + description = "An EDSL for diagrams based based on linear constraints"; + license = stdenv.lib.licenses.agpl3; + }) {}; + + "lp-diagrams-svg" = callPackage + ({ mkDerivation, base, containers, FontyFruity, JuicyPixels, lens + , linear, lp-diagrams, lucid-svg, mtl, optparse-applicative + , svg-tree, text, vector + }: + mkDerivation { + pname = "lp-diagrams-svg"; + version = "1.0"; + sha256 = "05b67150d7f4559f9b6aea62ffa9382551b1fb1ad56cfaf204ff2dc3c7db6325"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers FontyFruity JuicyPixels lens linear lp-diagrams + lucid-svg mtl optparse-applicative svg-tree text vector + ]; + executableHaskellDepends = [ + base containers FontyFruity lens lp-diagrams + ]; + description = "SVG Backend for lp-diagrams"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "lrucache" = callPackage ({ mkDerivation, base, containers, contravariant }: mkDerivation { @@ -127298,7 +128743,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {objc = null;}; - "luminance" = callPackage + "luminance_0_9_1" = callPackage ({ mkDerivation, base, containers, contravariant, dlist, gl, linear , mtl, resourcet, semigroups, transformers, vector, void }: @@ -127313,6 +128758,42 @@ self: { homepage = "https://github.com/phaazon/luminance"; description = "Type-safe, type-level and stateless graphics framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "luminance" = callPackage + ({ mkDerivation, base, containers, contravariant, dlist, gl, linear + , mtl, resourcet, semigroups, transformers, vector, void + }: + mkDerivation { + pname = "luminance"; + version = "0.9.1.1"; + sha256 = "5173588f12ec9949a483db6607cf6583132fb6b958a09c8473e025fa191210c2"; + libraryHaskellDepends = [ + base containers contravariant dlist gl linear mtl resourcet + semigroups transformers vector void + ]; + homepage = "https://github.com/phaazon/luminance"; + description = "Type-safe, type-level and stateless graphics framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "luminance_0_9_1_2" = callPackage + ({ mkDerivation, base, containers, contravariant, dlist, gl, linear + , mtl, resourcet, semigroups, transformers, vector, void + }: + mkDerivation { + pname = "luminance"; + version = "0.9.1.2"; + sha256 = "fd9d9b75c8bfff765eafc10023a709f10027928ea300932b82762e4543c10d5f"; + libraryHaskellDepends = [ + base containers contravariant dlist gl linear mtl resourcet + semigroups transformers vector void + ]; + homepage = "https://github.com/phaazon/luminance"; + description = "Type-safe, type-level and stateless graphics framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "luminance-samples" = callPackage @@ -127335,6 +128816,26 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "luminance-samples_0_9_1" = callPackage + ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear + , luminance, mtl, resourcet, transformers + }: + mkDerivation { + pname = "luminance-samples"; + version = "0.9.1"; + sha256 = "e3c67132470eb7e5f9b16c291dd686c5e281a25e66dd2e8ffc307230897895f7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base contravariant GLFW-b JuicyPixels linear luminance mtl + resourcet transformers + ]; + homepage = "https://github.com/phaazon/luminance-samples"; + description = "Luminance samples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lushtags" = callPackage ({ mkDerivation, base, haskell-src-exts, text, vector }: mkDerivation { @@ -127752,6 +129253,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "machines_0_6" = callPackage + ({ mkDerivation, adjunctions, base, comonad, containers, directory + , distributive, doctest, filepath, free, mtl, pointed, profunctors + , semigroupoids, semigroups, transformers, transformers-compat + , void + }: + mkDerivation { + pname = "machines"; + version = "0.6"; + sha256 = "69a54f22a9788e4a7ef2691c49626cd1c22465da2b9f903839d7b20c41eb11f6"; + libraryHaskellDepends = [ + adjunctions base comonad containers distributive free mtl pointed + profunctors semigroupoids semigroups transformers + transformers-compat void + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/machines/"; + description = "Networked stream transducers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "machines-binary" = callPackage ({ mkDerivation, base, binary, bytestring, machines }: mkDerivation { @@ -130194,7 +131717,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "megaparsec" = callPackage + "megaparsec_4_2_0" = callPackage ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 , text, transformers @@ -130211,6 +131734,28 @@ self: { homepage = "https://github.com/mrkkrp/megaparsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "megaparsec" = callPackage + ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "megaparsec"; + version = "4.3.0"; + sha256 = "2298f02815b1ebbf200817c68c5e7414ef558c70fe64b2ee01fbbe1142d78680"; + revision = "2"; + editedCabalFile = "937110189d9bc4843e11cfdf80b4a215845a8c9ecca0fea40a13ad00f6c6c1bc"; + libraryHaskellDepends = [ base bytestring mtl text transformers ]; + testHaskellDepends = [ + base HUnit mtl QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; + homepage = "https://github.com/mrkkrp/megaparsec"; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; }) {}; "meldable-heap" = callPackage @@ -130416,6 +131961,8 @@ self: { pname = "memoize"; version = "0.7"; sha256 = "04dbd6e367132c477342a3a7271438a9d2ec55cd433e1d01807a6091934d11eb"; + revision = "1"; + editedCabalFile = "4dccaf9fbeff4ff6207a78541ec3a6592db9c732fc65aa8bef1c5d8ff9c1f9f2"; libraryHaskellDepends = [ base template-haskell ]; description = "A memoization library"; license = stdenv.lib.licenses.bsd3; @@ -130457,7 +132004,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "memory" = callPackage + "memory_0_10" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty , tasty-hunit, tasty-quickcheck }: @@ -130472,6 +132019,22 @@ self: { homepage = "https://github.com/vincenthz/hs-memory"; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "memory" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.11"; + sha256 = "7b7fa325def957f4cc0a884f7c1e0d549c9329a8d1aa9e1456e37e5aff4e3fa6"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abstraction stuff"; + license = stdenv.lib.licenses.bsd3; }) {}; "memscript" = callPackage @@ -132250,6 +133813,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmorph_1_0_5" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "mmorph"; + version = "1.0.5"; + sha256 = "6ae92f8c9e0aa767ecce520833ac46d3cf293931050650dc8896be16fb16da9d"; + libraryHaskellDepends = [ base transformers ]; + description = "Monad morphisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmtl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -132889,6 +134464,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "a333b087835aa4902d0814e76fe4f32a523092fd7b13526aad415160a8317192"; + revision = "1"; + editedCabalFile = "6dc1e9978860f42d76fc6f82d5166c9396ebdb2a555575c589970334200f5ad5"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -133163,7 +134740,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-logger" = callPackage + "monad-logger_0_3_16" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans @@ -133183,6 +134760,29 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "monad-logger" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, conduit + , conduit-extra, exceptions, fast-logger, lifted-base + , monad-control, monad-loops, mtl, resourcet, stm, stm-chans + , template-haskell, text, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.17"; + sha256 = "25dd1e420c1bbc83b968cac738a08ebc6d708581a6e190f5e61c8de5e698e1ea"; + libraryHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra exceptions + fast-logger lifted-base monad-control monad-loops mtl resourcet stm + stm-chans template-haskell text transformers transformers-base + transformers-compat + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; }) {}; "monad-logger-json" = callPackage @@ -133493,6 +135093,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-products_4_0_1" = callPackage + ({ mkDerivation, base, semigroupoids }: + mkDerivation { + pname = "monad-products"; + version = "4.0.1"; + sha256 = "02bfe1db2ae1a5cff19f73736a219605b1f0649f6af44ca848d09160a7946cea"; + libraryHaskellDepends = [ base semigroupoids ]; + homepage = "http://github.com/ekmett/monad-products"; + description = "Monad products"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-ran" = callPackage ({ mkDerivation, base, ghc-prim, mtl }: mkDerivation { @@ -133847,6 +135460,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monadic-arrays_0_2_2" = callPackage + ({ mkDerivation, array, base, stm, transformers + , transformers-compat + }: + mkDerivation { + pname = "monadic-arrays"; + version = "0.2.2"; + sha256 = "667714c6100272b48c4377cf2e2984b67a4445521a2a2e9c37539128c7e276a0"; + libraryHaskellDepends = [ + array base stm transformers transformers-compat + ]; + homepage = "http://github.com/ekmett/monadic-arrays/"; + description = "Boxed and unboxed arrays for monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monadiccp" = callPackage ({ mkDerivation, base, containers, mtl, parsec, pretty, random }: mkDerivation { @@ -135852,7 +137482,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "multiset" = callPackage + "multiset_0_3_0" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "multiset"; @@ -135861,19 +137491,19 @@ self: { libraryHaskellDepends = [ base containers ]; description = "The Data.MultiSet container type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "multiset_0_3_1" = callPackage + "multiset" = callPackage ({ mkDerivation, base, containers, doctest, Glob }: mkDerivation { pname = "multiset"; - version = "0.3.1"; - sha256 = "9303952e410141e93fd301bb5ff0e0951c5d17b0c4bb7c46c03a65b3445d505e"; + version = "0.3.2"; + sha256 = "e576efc992d808585a40baeb22dd83e0b42001d79ed13e2085b6eb6d6008a6bb"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest Glob ]; description = "The Data.MultiSet container type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multiset-comb" = callPackage @@ -138110,6 +139740,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nettle;}; + "nettle_0_2_0" = callPackage + ({ mkDerivation, array, base, byteable, bytestring + , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle + , QuickCheck, securemem, tagged, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "nettle"; + version = "0.2.0"; + sha256 = "220184713b802c53ee26783b891a3bbee6c6b2571f798bd6def2496a504e9bde"; + libraryHaskellDepends = [ + base byteable bytestring crypto-cipher-types securemem tagged + ]; + libraryPkgconfigDepends = [ nettle ]; + testHaskellDepends = [ + array base bytestring crypto-cipher-tests crypto-cipher-types HUnit + QuickCheck tagged test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/stbuehler/haskell-nettle"; + description = "safe nettle binding"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) nettle;}; + "nettle-frp" = callPackage ({ mkDerivation, base, bimap, binary, bytestring, containers, mtl , nettle-openflow, network, network-data, random, time @@ -139926,6 +141581,7 @@ self: { base bytestring containers data-named filepath polysoup tar text zlib ]; + jailbreak = true; homepage = "https://github.com/kawu/nkjp"; description = "Manipulating the National Corpus of Polish (NKJP)"; license = stdenv.lib.licenses.bsd3; @@ -141910,17 +143566,12 @@ self: { }) {}; "opencog-atomspace" = callPackage - ({ mkDerivation, atomspace-cwrapper, base, containers, directory - , filepath, mtl, template-haskell, transformers - }: + ({ mkDerivation, atomspace-cwrapper, base, transformers }: mkDerivation { pname = "opencog-atomspace"; - version = "0.1.0.2"; - sha256 = "fc7d96645ef0c14e56ffdbcad9537f0ea766616ac3f1dc105e817a53990a30d1"; - libraryHaskellDepends = [ - base containers directory filepath mtl template-haskell - transformers - ]; + version = "0.1.0.3"; + sha256 = "c4848b27f3c2d6f7e2fc22d338a9bc1547c5282d970c0d7d4d83672a948e4dd0"; + libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ atomspace-cwrapper ]; homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell"; description = "Haskell Bindings for the AtomSpace"; @@ -144052,29 +145703,29 @@ self: { license = "GPL"; }) {}; - "pandoc_1_16_0_1" = callPackage + "pandoc_1_16_0_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , cmark, containers, data-default, deepseq-generics, Diff - , directory, executable-path, extensible-exceptions, filemanip - , filepath, ghc-prim, haddock-library, highlighting-kate, hslua - , HTTP, http-client, http-client-tls, http-types, HUnit - , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types - , parsec, process, QuickCheck, random, scientific, SHA, syb - , tagsoup, temporary, test-framework, test-framework-hunit - , test-framework-quickcheck2, texmath, text, time - , unordered-containers, vector, xml, yaml, zip-archive, zlib + , cmark, containers, data-default, deepseq, Diff, directory + , executable-path, extensible-exceptions, filemanip, filepath + , ghc-prim, haddock-library, highlighting-kate, hslua, HTTP + , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl + , network, network-uri, old-time, pandoc-types, parsec, process + , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , texmath, text, time, unordered-containers, vector, xml, yaml + , zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "1.16.0.1"; - sha256 = "211bc1a4f1beaaf888d82e4e67414a3984cf494b58be49e157a1c21d9a09db1a"; + version = "1.16.0.2"; + sha256 = "f5f3262ef4574a111936fea0118557c523a8b0eaa7fea84b64b377b20a80f348"; configureFlags = [ "-fhttps" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base64-bytestring binary blaze-html blaze-markup - bytestring cmark containers data-default deepseq-generics directory + bytestring cmark containers data-default deepseq directory extensible-exceptions filemanip filepath ghc-prim haddock-library highlighting-kate hslua HTTP http-client http-client-tls http-types JuicyPixels mtl network network-uri old-time pandoc-types parsec @@ -150357,21 +152008,21 @@ self: { }) {}; "pipes-websockets" = callPackage - ({ mkDerivation, base, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, pipes, pipes-concurrency, text, transformers + , websockets }: mkDerivation { pname = "pipes-websockets"; - version = "0.0.0.0"; - sha256 = "66c2a883dde7d8a8323f8c17866e86dc9f45971c924df83851065a75c8b9cf9c"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 + version = "0.1.0.0"; + sha256 = "b86dcf98d0536c7d6830b64a84d14a89aaa68659abd715b5891e98975de9bac2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base pipes pipes-concurrency text transformers websockets ]; - jailbreak = true; - homepage = "https://github.com/ixmatus/pipes-websockets"; - description = "Library for using websockets ontop of pipes-network"; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/silky/pipes-websockets#readme"; + description = "WebSockets in the Pipes framework"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -151142,6 +152793,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pointed_5" = callPackage + ({ mkDerivation, base, comonad, containers, data-default-class + , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged + , transformers, transformers-compat, unordered-containers + }: + mkDerivation { + pname = "pointed"; + version = "5"; + sha256 = "8906b8af5125ab3376794a290c5484dbec5a35d0bd0a57e94392ec0e12535d17"; + libraryHaskellDepends = [ + base comonad containers data-default-class hashable kan-extensions + semigroupoids semigroups stm tagged transformers + transformers-compat unordered-containers + ]; + jailbreak = true; + homepage = "http://github.com/ekmett/pointed/"; + description = "Pointed and copointed data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pointedlist" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -152362,7 +154034,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "postgresql-schema" = callPackage + "postgresql-schema_0_1_9" = callPackage ({ mkDerivation, base, basic-prelude, optparse-applicative , postgresql-simple, shelly, text, time, time-locale-compat }: @@ -152382,6 +154054,29 @@ self: { homepage = "https://github.com/mfine/postgresql-schema"; description = "PostgreSQL Schema Management"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "postgresql-schema" = callPackage + ({ mkDerivation, base, basic-prelude, optparse-applicative + , postgresql-simple, shelly, text, time, time-locale-compat + }: + mkDerivation { + pname = "postgresql-schema"; + version = "0.1.10"; + sha256 = "29307e09916a7fd9aec965ed2f62663e26b5e66b5ab441d3ed52713d551ae27a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base basic-prelude postgresql-simple shelly text + ]; + executableHaskellDepends = [ + base basic-prelude optparse-applicative shelly text time + time-locale-compat + ]; + homepage = "https://github.com/mfine/postgresql-schema"; + description = "PostgreSQL Schema Management"; + license = stdenv.lib.licenses.bsd3; }) {}; "postgresql-simple_0_4_8_0" = callPackage @@ -152566,17 +154261,19 @@ self: { "postgresql-typed" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, cryptohash, haskell-src-meta, network, old-locale - , postgresql-binary, QuickCheck, scientific, template-haskell, text - , time, utf8-string, uuid + , QuickCheck, scientific, template-haskell, text, time, utf8-string + , uuid }: mkDerivation { pname = "postgresql-typed"; version = "0.4.2.2"; sha256 = "80b2be671ad75782e19a808cbdecb1e814e2450b7645d2da0280c12802df188c"; + revision = "1"; + editedCabalFile = "a774fcb5f4d1cd12b2495cd376a5a010b6c1eac422601bbc4c379b1df99b4f5f"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptohash - haskell-src-meta network old-locale postgresql-binary scientific - template-haskell text time utf8-string uuid + haskell-src-meta network old-locale scientific template-haskell + text time utf8-string uuid ]; testHaskellDepends = [ base bytestring network QuickCheck time ]; homepage = "https://github.com/dylex/postgresql-typed"; @@ -153158,6 +154855,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prelude-extras_0_4_0_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "prelude-extras"; + version = "0.4.0.3"; + sha256 = "09bb087f0870a353ec1e7e1a08017b9a766d430d956afb88ca000a6a876bf877"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/ekmett/prelude-extras"; + description = "Higher order versions of Prelude classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prelude-generalize" = callPackage ({ mkDerivation, base, comonad, logict, transformers }: mkDerivation { @@ -153823,6 +155533,8 @@ self: { pname = "process-extras"; version = "0.3.3.4"; sha256 = "77d550a6aa270e41f55193025201f70410b8728028c72450837e329e3f3dd8b2"; + revision = "1"; + editedCabalFile = "2ab4fd50b430fda365a8d22012f2ad28ce27a96346c5ff7f7683bb5cbc85e761"; libraryHaskellDepends = [ base bytestring deepseq ListLike process text ]; @@ -153839,6 +155551,8 @@ self: { pname = "process-extras"; version = "0.3.3.5"; sha256 = "da546fabdb83755618cdd10cbe6510d995d1834a130a1d0342856fd80fd9dea1"; + revision = "1"; + editedCabalFile = "beaa9e19a781212403fe07d03b9aabf7d2ef482d9b7e9c51c1f2e8a1efb7e7a0"; libraryHaskellDepends = [ base bytestring deepseq ListLike process text ]; @@ -153847,6 +155561,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "process-extras_0_3_3_6" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ListLike, process, text + }: + mkDerivation { + pname = "process-extras"; + version = "0.3.3.6"; + sha256 = "a1638f8bf59873a271f86a948f9355a55f6f84bc580e7a0e673ca250ed966ed1"; + revision = "1"; + editedCabalFile = "b04a582a1803030f005ac9bc2f82f3eca132ce1a51661613a2986435bf7259ad"; + libraryHaskellDepends = [ + base bytestring deepseq ListLike process text + ]; + homepage = "https://github.com/seereason/process-extras"; + description = "Process extras"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "process-iterio" = callPackage ({ mkDerivation, base, bytestring, cpphs, iterIO, process , transformers @@ -154272,6 +156004,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "profunctors_5_2" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , contravariant, distributive, tagged, transformers + }: + mkDerivation { + pname = "profunctors"; + version = "5.2"; + sha256 = "87a7e25c4745ea8ff479dd1212ec2e57710abb3d3dd30f948fa16be1d3ee05a4"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad contravariant distributive + tagged transformers + ]; + jailbreak = true; + homepage = "http://github.com/ekmett/profunctors/"; + description = "Profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "progress" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -154547,8 +156298,8 @@ self: { ({ mkDerivation, base, primitive }: mkDerivation { pname = "promises"; - version = "0.2"; - sha256 = "501daa14749b03ca3150946323cc111c1b260e48c43f9da0cbdb8de4e4ffec39"; + version = "0.3"; + sha256 = "bf7c901915c122e7ab270f4c90cf02e83a703bf78f246948dc2452dcd294f260"; libraryHaskellDepends = [ base primitive ]; homepage = "http://github.com/ekmett/promises/"; description = "Lazy demand-driven promises"; @@ -154593,8 +156344,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.15.2"; - sha256 = "9409e81802e2809f6ce8bbf9b6ce509c9a0e6e2f787349e752beebd910088a0c"; + version = "2.15.3"; + sha256 = "8d83603d915fcce9ce109b70bd19499a94a70de6abc2a31ac2ebd892f76af683"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156656,6 +158407,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.11"; sha256 = "02962005e51d77b84e94dd0a8f3f1be89af6e8099d25e6c0bf417f364c323a10"; + revision = "1"; + editedCabalFile = "b87744a86ad200cf18eb3df19a1729cd93df3e87eea5e861881135e03d9c4f4c"; libraryHaskellDepends = [ array base bytestring containers hashable old-time QuickCheck text time unordered-containers @@ -158224,8 +159977,8 @@ self: { }: mkDerivation { pname = "react-flux"; - version = "1.0.2"; - sha256 = "eb5520adb34979a1f8ae7ce11ecc127d3df4ee7e419129c0e2ca2a1c01ef7c21"; + version = "1.0.3"; + sha256 = "b30f88e08577f8fd9375fe71d0e3a8dcd4452b5c8e0019d93b6a5146715d3710"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159107,6 +160860,7 @@ self: { QuickCheck random tasty tasty-ant-xml tasty-hunit tasty-quickcheck vector ]; + jailbreak = true; homepage = "http://github.com/NicolasT/reedsolomon"; description = "Reed-Solomon Erasure Coding in Haskell"; license = stdenv.lib.licenses.mit; @@ -161467,6 +163221,26 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "resolve-trivial-conflicts_0_3_2_2" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory + , filepath, mtl, optparse-applicative, process, unix + }: + mkDerivation { + pname = "resolve-trivial-conflicts"; + version = "0.3.2.2"; + sha256 = "2d68535d32943a6640845c86de751ab5185c687a2604c3435e4d757a2a263c1b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base base-compat Diff directory filepath mtl + optparse-applicative process unix + ]; + homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; + description = "Remove trivial conflict markers in a git repository"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "resource-effect" = callPackage ({ mkDerivation, base, containers, extensible-effects, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -163027,7 +164801,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rethinkdb-client-driver" = callPackage + "rethinkdb-client-driver_0_0_20" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, hashable, hspec , hspec-smallcheck, mtl, network, old-locale, scientific , smallcheck, template-haskell, text, time, unordered-containers @@ -163050,6 +164824,33 @@ self: { homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; description = "Client driver for RethinkDB"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rethinkdb-client-driver" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , hashable, hspec, hspec-smallcheck, mtl, network, old-locale + , scientific, smallcheck, template-haskell, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "rethinkdb-client-driver"; + version = "0.0.21"; + sha256 = "27bfbca15e5bff5215deed35c19d2ec17d1c27e9cc6b9fe147e8b9ed50cd76d0"; + libraryHaskellDepends = [ + aeson base binary bytestring containers hashable mtl network + old-locale scientific template-haskell text time + unordered-containers vector + ]; + testHaskellDepends = [ + base hspec hspec-smallcheck smallcheck text time + unordered-containers vector + ]; + doHaddock = false; + doCheck = false; + homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; + description = "Client driver for RethinkDB"; + license = stdenv.lib.licenses.mit; }) {}; "rethinkdb-model" = callPackage @@ -163115,7 +164916,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "retry" = callPackage + "retry_0_7_0_1" = callPackage ({ mkDerivation, base, data-default-class, exceptions, hspec, HUnit , QuickCheck, random, stm, time, transformers }: @@ -163135,6 +164936,29 @@ self: { homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "retry" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, hspec, HUnit + , QuickCheck, random, stm, time, transformers + }: + mkDerivation { + pname = "retry"; + version = "0.7.1"; + sha256 = "55900f2b01de0acd83874fc6a986c12f34f31e362cb318e271942418dedef680"; + libraryHaskellDepends = [ + base data-default-class exceptions random transformers + ]; + testHaskellDepends = [ + base data-default-class exceptions hspec HUnit QuickCheck random + stm time transformers + ]; + jailbreak = true; + doCheck = false; + homepage = "http://github.com/Soostone/retry"; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; }) {}; "retryer" = callPackage @@ -165693,7 +167517,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sbv" = callPackage + "sbv_5_9" = callPackage ({ mkDerivation, array, async, base, base-compat, containers , crackNum, data-binary-ieee754, deepseq, directory, filepath , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb @@ -165718,6 +167542,34 @@ self: { homepage = "http://leventerkok.github.com/sbv/"; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "sbv" = callPackage + ({ mkDerivation, array, async, base, base-compat, containers + , crackNum, data-binary-ieee754, deepseq, directory, filepath + , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb + }: + mkDerivation { + pname = "sbv"; + version = "5.11"; + sha256 = "9ede93f41cdbdfb73638f25eec9c201190d049163ad503202ebefa2d18cfc90d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base base-compat containers crackNum + data-binary-ieee754 deepseq directory filepath mtl old-time pretty + process QuickCheck random syb + ]; + executableHaskellDepends = [ + base data-binary-ieee754 directory filepath HUnit process syb + ]; + testHaskellDepends = [ + base data-binary-ieee754 directory filepath HUnit syb + ]; + homepage = "http://leventerkok.github.com/sbv/"; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; }) {}; "sbvPlugin" = callPackage @@ -166348,6 +168200,8 @@ self: { pname = "scientific"; version = "0.3.4.4"; sha256 = "f7c81e6ce6bf1161033ad4bc47b5bf164f4404d9df686dd0edadd488db25a519"; + revision = "1"; + editedCabalFile = "dd4a9ebfd75c61461e605995131104989a13780c987f3288c64b0a4ec80e08dc"; libraryHaskellDepends = [ base binary bytestring containers deepseq ghc-prim hashable integer-gmp text vector @@ -167704,6 +169558,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_0_1" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, directory, distributive, doctest + , filepath, semigroups, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.0.1"; + sha256 = "0ce989b8b0dc02ebe9aa19c47982a6bc802b8dc973c39c7ac40ea7a21cdbd616"; + revision = "1"; + editedCabalFile = "94d9167b701f148cb429e6746dd2bbb3b6559521b7fc2e98ce47339ad09af9f2"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive semigroups tagged transformers transformers-compat + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/semigroupoids"; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -169491,8 +171367,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204"; - revision = "1"; - editedCabalFile = "b9472e33042ed5317fdf61d3f413ae148e66b3747a20248ba059db75272c57d4"; + revision = "2"; + editedCabalFile = "3ef09bca6255336c4a1dfd58b27a0d24957ea31e42d51d3b9334790518818ed0"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -169826,8 +171702,8 @@ self: { ({ mkDerivation, base, containers, utility-ht }: mkDerivation { pname = "set-cover"; - version = "0.0.5"; - sha256 = "a3a4b4f2099780fe5652036346d7dae2bf1db4a56e77e663ca6964312dec7c99"; + version = "0.0.6"; + sha256 = "6b1554247fda64306c4d47957b00794e06e0744f9996d287dbdb6612774179f9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers utility-ht ]; @@ -170053,8 +171929,8 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "1.0.0"; - sha256 = "e90495a6fd7993cd4f943a5a9e2759304a9f055a8cea0c2bc2f94645bc150a1e"; + version = "1.1.0"; + sha256 = "e784db96a9fdcf1fe5f48adfc62e8b4ef9795bf4558769c149f244ed5ef9415c"; libraryHaskellDepends = [ array base containers mtl scientific semigroups split stack-prism template-haskell text wl-pprint-text @@ -170679,6 +172555,7 @@ self: { version = "0.1.2"; sha256 = "413dc10d9b141ba885b3067b2ab76aee7f2978a930e874885fa0baf3d8b1c247"; libraryHaskellDepends = [ base bytestring bzlib shake tar ]; + jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-pack"; description = "Shake File Pack Rule"; license = stdenv.lib.licenses.bsd3; @@ -170961,6 +172838,21 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare-babel" = callPackage + ({ mkDerivation, base, classy-prelude, shakespeare + , template-haskell + }: + mkDerivation { + pname = "shakespeare-babel"; + version = "0.1.0.0"; + sha256 = "a072ca9cf9397f23b74920d395d880108a7268d63a93da3086ed5a40ee0c2035"; + libraryHaskellDepends = [ + base classy-prelude shakespeare template-haskell + ]; + description = "compile es2015"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "shakespeare-css" = callPackage ({ mkDerivation, base, shakespeare }: mkDerivation { @@ -171333,6 +173225,8 @@ self: { pname = "shelltestrunner"; version = "1.3.5"; sha256 = "4265eb9cc87c352655099da26f49fb7829f5163edd03a20105b7a25609d3a829"; + revision = "1"; + editedCabalFile = "4ccce28f099594a89bbb8ff9c8f6408955b4be02a01eb2d552e1ce7165dce3aa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -171340,7 +173234,6 @@ self: { pretty-show process regex-tdfa safe test-framework test-framework-hunit utf8-string ]; - jailbreak = true; homepage = "http://joyful.com/shelltestrunner"; description = "A tool for testing command-line programs"; license = "GPL"; @@ -171849,8 +173742,8 @@ self: { }: mkDerivation { pname = "sign"; - version = "0.4.2"; - sha256 = "2ce6cc3b2803f11ad03abaf5ca0b11b37aa131f3867d8f3a741f0b9b51d67659"; + version = "0.4.3"; + sha256 = "77855b6953a17cdba1459efc5241b7174cd628629583245ced96684dfd1f7544"; libraryHaskellDepends = [ base containers deepseq hashable lattices universe-base ]; @@ -176639,6 +178532,8 @@ self: { pname = "spdx"; version = "0.2.1.0"; sha256 = "a7f0d6098e201f5d7b14c13387fe699b9830c95c0192bbd8ceda446a30c980f2"; + revision = "1"; + editedCabalFile = "adba306bc3280e794c4f69da6fb87346d53bd5c72bd9940069d68d1fc194ce61"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; homepage = "https://github.com/phadej/spdx"; @@ -176759,6 +178654,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "speculation_1_5_0_3" = callPackage + ({ mkDerivation, base, ghc-prim, stm, transformers }: + mkDerivation { + pname = "speculation"; + version = "1.5.0.3"; + sha256 = "73bf641a87e0d28a2ba233922db936e0776c3dc24ed421f6f963f015e2eb4d3f"; + libraryHaskellDepends = [ base ghc-prim stm transformers ]; + homepage = "http://github.com/ekmett/speculation"; + description = "A framework for safe, programmable, speculative parallelism"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "speculation-transformers" = callPackage ({ mkDerivation, speculation }: mkDerivation { @@ -177029,7 +178937,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "split" = callPackage + "split_0_2_2" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "split"; @@ -177041,6 +178949,19 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Combinator library for splitting lists"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "split" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "split"; + version = "0.2.3"; + sha256 = "a6d100e433fa27eda72127475ba9c55481ca4105cfbb6ff55b67023d00ccead9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Combinator library for splitting lists"; + license = stdenv.lib.licenses.bsd3; }) {}; "split-channel" = callPackage @@ -178364,8 +180285,8 @@ self: { pname = "stack"; version = "1.0.0"; sha256 = "cd2f606d390fe521b6ba0794de87edcba64c4af66856af09594907c2b4f4751d"; - revision = "4"; - editedCabalFile = "f9396c12ec617c8c49730105f6cec3fe14bfa679fbf8ad37fa66b687691733e0"; + revision = "6"; + editedCabalFile = "d2de14a5f76d0d1b7ff78d1a7647a429e4151ffdda57fa3b061a0c5641272931"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184084,8 +186005,8 @@ self: { }: mkDerivation { pname = "taffybar"; - version = "0.4.5"; - sha256 = "9cb676fdc80f570b066fe847b3ff459f8f8cea0d651b9d5f0c264e575fc1fc45"; + version = "0.4.6"; + sha256 = "620918469d79d33067808114bdf8d4d6f5a5ae6d77ff672a37ea04ecc5e0caf5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184100,7 +186021,6 @@ self: { base dyre filepath gtk safe xdg-basedir ]; executablePkgconfigDepends = [ gtk2 ]; - jailbreak = true; homepage = "http://github.com/travitch/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; @@ -184745,27 +186665,6 @@ self: { }) {}; "tar" = callPackage - ({ mkDerivation, array, base, bytestring, bytestring-handle - , containers, deepseq, directory, filepath, old-time, QuickCheck - , tasty, tasty-quickcheck, time - }: - mkDerivation { - pname = "tar"; - version = "0.4.5.0"; - sha256 = "2959d7bb5e941969f023ba558e38f1723e72c6883e6eeca459472f42be33f32a"; - libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath time - ]; - testHaskellDepends = [ - array base bytestring bytestring-handle containers deepseq - directory filepath old-time QuickCheck tasty tasty-quickcheck time - ]; - doCheck = false; - description = "Reading, writing and manipulating \".tar\" archive files."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tar_0_5_0_1" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-handle , containers, deepseq, directory, filepath, QuickCheck, tasty , tasty-quickcheck, time @@ -184781,9 +186680,9 @@ self: { array base bytestring bytestring-handle containers deepseq directory filepath QuickCheck tasty tasty-quickcheck time ]; + doCheck = false; description = "Reading, writing and manipulating \".tar\" archive files."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tardis" = callPackage @@ -185771,6 +187670,27 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tellbot_0_6_0_11" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, containers + , http-conduit, mtl, network, regex-pcre, split, tagsoup, text + , time, transformers + }: + mkDerivation { + pname = "tellbot"; + version = "0.6.0.11"; + sha256 = "0589e73acc704ef0b38e59b98caba0faba9aef9802672f50efc1fcb7c0287c9f"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bifunctors bytestring containers http-conduit mtl network + regex-pcre split tagsoup text time transformers + ]; + homepage = "https://github.com/phaazon/tellbot"; + description = "IRC tellbot"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "template" = callPackage ({ mkDerivation, base, mtl, text }: mkDerivation { @@ -186262,6 +188182,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "terntup" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "terntup"; + version = "0.0.1"; + sha256 = "ffbb4c7dd4ccf56628360671a31745125a52f8131254fc98f2041e32bbe93ff7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "a ternary library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "terrahs" = callPackage ({ mkDerivation, base, haskell98, old-time, terralib4c, translib }: mkDerivation { @@ -187579,6 +189516,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "text-region" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , containers, groups, hspec, lens, mtl, text + }: + mkDerivation { + pname = "text-region"; + version = "0.1.0.0"; + sha256 = "bf65047a5608e62b55a6a10067068b5ef63675df1b41148ad198f464e8f80673"; + libraryHaskellDepends = [ + aeson base base-unicode-symbols bytestring containers groups lens + mtl text + ]; + testHaskellDepends = [ + base base-unicode-symbols containers hspec lens mtl text + ]; + homepage = "https://github.com/mvoidex/text-region"; + description = "Provides functions to update text region positions according to text edit actions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text-register-machine" = callPackage ({ mkDerivation, base, containers, mtl, vector }: mkDerivation { @@ -189041,11 +190998,11 @@ self: { }: mkDerivation { pname = "tickle"; - version = "0.0.5"; - sha256 = "bf8c57ddea14842bc5e5e2099c5fbc8e9c85544f3daad57a33ba1db6fa244102"; + version = "0.0.6"; + sha256 = "a5701be4825537d2426f1d84366847b50876087319bdf8df96028b8f874ebba7"; libraryHaskellDepends = [ - base bifunctors bytestring lens mtl semigroupoids semigroups - transformers validation + base bifunctors bytestring filepath lens mtl semigroupoids + semigroups transformers validation ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -191045,12 +193002,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers_0_5_0_0" = callPackage + "transformers_0_5_0_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.5.0.0"; - sha256 = "720541fc11ed72737c7059f47836361edb05f6eadcd535fffbee8801f3d03feb"; + version = "0.5.0.2"; + sha256 = "3fb9c00cae4b0531a05d29c8d21de775352b97c8ab1091f35e9acdbee28facc6"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -191148,6 +193105,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-compat_0_5_1_4" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "transformers-compat"; + version = "0.5.1.4"; + sha256 = "d881ef4ec164b631591b222efe7ff555af6d5397c9d86475b309ba9402a8ca9f"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + 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 ({ mkDerivation, base, transformers }: mkDerivation { @@ -191654,7 +193624,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "true-name" = callPackage + "true-name_0_0_0_2" = callPackage ({ mkDerivation, base, containers, template-haskell, time }: mkDerivation { pname = "true-name"; @@ -191665,9 +193635,10 @@ self: { homepage = "https://github.com/liyang/true-name"; description = "Template Haskell hack to violate another module's abstractions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "true-name_0_1_0_0" = callPackage + "true-name" = callPackage ({ mkDerivation, base, containers, template-haskell, time }: mkDerivation { pname = "true-name"; @@ -191678,7 +193649,6 @@ self: { homepage = "https://github.com/liyang/true-name"; description = "Template Haskell hack to violate another module's abstractions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "truelevel" = callPackage @@ -192964,8 +194934,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "type-combinators"; - version = "0.2.0.0"; - sha256 = "0b0b07f8ac2bc3237114753f8f9e2d8f41cdc4c97d3bd5cd4725beaaa4b7c99a"; + version = "0.2.2.0"; + sha256 = "52688cdc72f387baa0a39ca4e8cb020ec3018fab03c9da25ae1fb9693d32a1d3"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/kylcarte/type-combinators"; description = "A collection of data types for type-level programming"; @@ -194510,8 +196480,8 @@ self: { }: mkDerivation { pname = "uniform-io"; - version = "1.1.0.0"; - sha256 = "6775fa62ca0b1e87e70c6ae468a54486a8a1ca510f0a86de5cc376a39729da9f"; + version = "1.1.1.0"; + sha256 = "a731b2c38d988631519f7e7487ed2372337c834e56f827e41ec672a71dbfa5ed"; libraryHaskellDepends = [ attoparsec base bytestring data-default-class iproute network transformers word8 @@ -194596,6 +196566,8 @@ self: { pname = "unique"; version = "0"; sha256 = "e3fb171b7b1787683863934df0fc082fb47c0da6972bb1839c2ee8ceb64a0a90"; + revision = "1"; + editedCabalFile = "68933757e4bd3e7f53f226bd344f8ee980e86fe74eed20fa19edb5867c51035f"; libraryHaskellDepends = [ base ghc-prim hashable ]; homepage = "http://github.com/ekmett/unique/"; description = "Fully concurrent unique identifiers"; @@ -195120,6 +197092,8 @@ self: { pname = "unordered-containers"; version = "0.2.5.1"; sha256 = "6e5878ade3ea65f2a7cb0a1df155f88f7e710d5bb975a5cbf1b45fb8cfee811a"; + revision = "1"; + editedCabalFile = "573b8855cce6de6c1f4111933e84375e4afa8a250e3a1c17e2206cb705236d4d"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck @@ -195130,6 +197104,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_6_0" = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, deepseq + , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.6.0"; + sha256 = "5f9fbba5f616344bd3b1b633d45f820cf9c840ad101e1110e698abc77d9de3f3"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -199991,7 +201985,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-extra" = callPackage + "wai-extra_3_0_13_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -200018,6 +202012,36 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-extra" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, HUnit, iproute, lifted-base, network, old-locale + , resourcet, streaming-commons, stringsearch, text, time + , transformers, unix, unix-compat, vault, void, wai, wai-logger + , word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.14"; + sha256 = "63f0df82dcd7c871c458e1ee67aca6d48b8794ff474e6b5e93873d4bbf6f7f2c"; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types iproute lifted-base network + old-locale resourcet streaming-commons stringsearch text time + transformers unix unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base blaze-builder bytestring case-insensitive cookie fast-logger + hspec http-types HUnit resourcet text time transformers wai zlib + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; }) {}; "wai-frontend-monadcgi" = callPackage @@ -200301,7 +202325,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-logger" = callPackage + "wai-logger_2_2_4_1" = callPackage ({ mkDerivation, auto-update, base, blaze-builder, byteorder , bytestring, case-insensitive, doctest, easy-file, fast-logger , http-types, network, unix, unix-time, wai @@ -200319,6 +202343,27 @@ self: { doCheck = false; description = "A logging system for WAI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-logger" = callPackage + ({ mkDerivation, auto-update, base, blaze-builder, byteorder + , bytestring, case-insensitive, doctest, easy-file, fast-logger + , http-types, network, unix, unix-time, wai + }: + mkDerivation { + pname = "wai-logger"; + version = "2.2.5"; + sha256 = "678e6fa92d2a8c71182b96e809c69cca4558ddd132ec41bdcf786cf5f1800ba3"; + libraryHaskellDepends = [ + auto-update base blaze-builder byteorder bytestring + case-insensitive easy-file fast-logger http-types network unix + unix-time wai + ]; + testHaskellDepends = [ base doctest ]; + doCheck = false; + description = "A logging system for WAI"; + license = stdenv.lib.licenses.bsd3; }) {}; "wai-logger-prefork" = callPackage @@ -200491,6 +202536,8 @@ self: { pname = "wai-middleware-content-type"; version = "0.2.0"; sha256 = "d45ace35cf7a7ac92d8bd46b9001d1c237d68a20810634467663779b228f5866"; + revision = "1"; + editedCabalFile = "6958bfd062d09a59c33c0d5f0c52356df462bd2185ee8088ac3e8078ffacf692"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay exceptions hashable http-media http-types lucid mmorph monad-control @@ -200569,7 +202616,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-middleware-crowd" = callPackage + "wai-middleware-crowd_0_1_3" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, clientsession , containers, cookie, gitrev, http-client, http-client-tls @@ -200596,6 +202643,36 @@ self: { ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-middleware-crowd" = callPackage + ({ mkDerivation, authenticate, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, clientsession + , containers, cookie, gitrev, http-client, http-client-tls + , http-reverse-proxy, http-types, optparse-applicative, resourcet + , template-haskell, text, time, transformers, unix-compat, vault + , wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-crowd"; + version = "0.1.4"; + sha256 = "f496aa3581ecb75ec611c50fbbb10b17cbca612c7caba00dfa24191aba1585cb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + authenticate base base64-bytestring binary blaze-builder bytestring + case-insensitive clientsession containers cookie http-client + http-client-tls http-types resourcet text time unix-compat vault + wai + ]; + executableHaskellDepends = [ + base bytestring clientsession gitrev http-client http-client-tls + http-reverse-proxy http-types optparse-applicative template-haskell + text transformers wai wai-app-static wai-extra warp + ]; + description = "Middleware and utilities for using Atlassian Crowd authentication"; + license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -201074,7 +203151,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-routes" = callPackage + "wai-routes_0_9_4" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, containers, cookie, data-default-class , filepath, hspec, hspec-wai, hspec-wai-json, http-types @@ -201097,6 +203174,32 @@ self: { homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-routes" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, data-default-class + , filepath, hspec, hspec-wai, hspec-wai-json, http-types + , mime-types, monad-loops, mtl, path-pieces, random + , template-haskell, text, vault, wai, wai-app-static, wai-extra + }: + mkDerivation { + pname = "wai-routes"; + version = "0.9.5"; + sha256 = "493083791e875fe9adebc12347a28bb2c7d84d808d54cd33ed6aa5fe99ee12c3"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive containers + cookie data-default-class filepath http-types mime-types + monad-loops mtl path-pieces random template-haskell text vault wai + wai-app-static wai-extra + ]; + testHaskellDepends = [ + aeson base hspec hspec-wai hspec-wai-json text wai + ]; + homepage = "https://ajnsit.github.io/wai-routes/"; + description = "Typesafe URLs for Wai applications"; + license = stdenv.lib.licenses.mit; }) {}; "wai-routing_0_12_1" = callPackage @@ -202346,7 +204449,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "warp_3_2_1" = callPackage + "warp_3_2_2" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date @@ -202356,8 +204459,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.1"; - sha256 = "c04acc6a4933ddba8bfa7a0752848f9b546162944b917fa39c65f82bca11b3a3"; + version = "3.2.2"; + sha256 = "c85382d4affc4a3d606de8f72f1031306da2c32f63d0a99deaeb93440e5796e6"; libraryHaskellDepends = [ array auto-update base blaze-builder bytestring bytestring-builder case-insensitive containers ghc-prim hashable http-date http-types @@ -203489,7 +205592,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "webdriver" = callPackage + "webdriver_0_8_0_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, data-default-class, directory, directory-tree , exceptions, filepath, http-client, http-types, lifted-base @@ -203512,6 +205615,32 @@ self: { homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "webdriver" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, data-default-class, directory, directory-tree + , exceptions, filepath, http-client, http-types, lifted-base + , monad-control, network, network-uri, scientific, temporary, text + , time, transformers, transformers-base, unordered-containers + , vector, zip-archive + }: + mkDerivation { + pname = "webdriver"; + version = "0.8.1"; + sha256 = "74ccd22c1fa6ce713d36997a09dc1c1931732a7f005f35d364600ec09d04933f"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring + data-default-class directory directory-tree exceptions filepath + http-client http-types lifted-base monad-control network + network-uri scientific temporary text time transformers + transformers-base unordered-containers vector zip-archive + ]; + doCheck = false; + homepage = "https://github.com/kallisti-dev/hs-webdriver"; + description = "a Haskell client for the Selenium WebDriver protocol"; + license = stdenv.lib.licenses.bsd3; }) {}; "webdriver-angular_0_1_7" = callPackage @@ -211091,6 +213220,7 @@ self: { transformers transformers-compat unix-compat unordered-containers wai wai-extra warp warp-tls yaml zlib ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; @@ -211125,6 +213255,7 @@ self: { transformers transformers-compat unix-compat unordered-containers wai wai-extra warp warp-tls yaml zlib ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; @@ -211159,6 +213290,7 @@ self: { transformers transformers-compat unix-compat unordered-containers wai wai-extra warp warp-tls yaml zlib ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; @@ -211193,6 +213325,7 @@ self: { transformers transformers-compat unix-compat unordered-containers wai wai-extra warp warp-tls yaml zlib ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; @@ -211227,6 +213360,7 @@ self: { transformers transformers-compat unix-compat unordered-containers wai wai-extra warp warp-tls yaml zlib ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; @@ -211261,6 +213395,7 @@ self: { transformers transformers-compat unix-compat unordered-containers wai wai-extra warp warp-tls yaml zlib ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8aa75829554..129c0ac6077 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -3,6 +3,7 @@ , glib, gmp, gtk, libffi, libjpeg, libpng , libtool, mpfr, openssl, pango, poppler , readline, sqlite +, disableDocs ? true }: let @@ -31,11 +32,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.2.1"; + version = "6.3"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "0555j63k7fs10iv0icmivlxpzgp6s7gwcbfddmbwxlf2rk80qhq0"; + sha256 = "0f21vnads6wsrzimfja969gf3pkl60s0rdfrjf9s70lcy9x0jz4i"; }; FONTCONFIG_FILE = fontsConf; @@ -50,7 +51,8 @@ stdenv.mkDerivation rec { cd src/build ''; - configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" "--disable-docs"]; + configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ] + ++ stdenv.lib.optional disableDocs [ "--disable-docs" ]; configureScript = "../configure"; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 150b72cf2f5..0e43b9fb602 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - version = "3.3-alpha1"; + version = "3.2.5"; in stdenv.mkDerivation { name = "eigen-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; - sha256 = "00vmxz3da76ml3j7s8w8447sdpszx71i3xhnmwivxhpc4smpvz2q"; + sha256 = "1vjixip19lwfia2bjpjwm09j7l20ry75493i6mjsk9djszj61agi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ffmpeg/2.2.nix b/pkgs/development/libraries/ffmpeg/2.2.nix deleted file mode 100644 index fbbb75cb832..00000000000 --- a/pkgs/development/libraries/ffmpeg/2.2.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.15"; - branch = "2.2"; - sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4"; -}) diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 383c1a7e223..1ca5d019b22 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gss, libidn }: +{ fetchurl, stdenv, gss, libidn, krb5Full }: stdenv.mkDerivation rec { name = "gsasl-1.8.0"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ libidn ] - ++ stdenv.lib.optional (!stdenv.isDarwin) gss; + ++ stdenv.lib.optional (!stdenv.isDarwin) gss + ++ stdenv.lib.optional stdenv.isDarwin krb5Full; configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--with-gssapi-impl=mit"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 980bccd39fb..256d09b0edd 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" - "--sysconfdir=/etc" + "--sysconfdir=/var/lib" "--with-libpcap" "--with-vmware" "--with-vbox" @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { installFlags = [ "localstatedir=$(TMPDIR)/var" - "sysconfdir=$(out)/etc" + "sysconfdir=$(out)/var/lib" ]; postInstall = '' diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 7fe57af5710..1862e633ad5 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran +{stdenv, fetchurl, gfortran, perl # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -9,17 +9,32 @@ with stdenv.lib; -stdenv.mkDerivation { - name = "openmpi-1.6.5"; +let + majorVersion = "1.10"; + +in stdenv.mkDerivation rec { + name = "openmpi-${majorVersion}.1"; + src = fetchurl { - url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2 ; - sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy"; + url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; + sha256 = "14p4px9a3qzjc22lnl6braxrcrmd9rgmy7fh4qpanawn2pgfq6br"; }; + buildInputs = [ gfortran ]; + + nativeBuildInputs = [ perl ]; + configureFlags = [] ++ optional enableSGE "--with-sge" ++ optional enablePrefix "--enable-mpirun-prefix-by-default" ; + + enableParallelBuilding = true; + + preBuild = '' + patchShebangs ompi/mpi/fortran/base/gen-mpi-sizeof.pl + ''; + meta = { homepage = http://www.open-mpi.org/; description = "Open source MPI-2 implementation"; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 3b40b7296a7..49745e23fca 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -2,18 +2,31 @@ , telepathy_farstream, telepathy_glib, pythonDBus, fetchpatch }: stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.6"; + name = "telepathy-qt-0.9.6.1"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "0j7hs055cx5g9chn3b2p0arig70m5g9547qgqvk29kxdyxxxsmqc"; + sha256 = "1y51c6rxk5qvmab98c8rnmrlyk27hnl248casvbq3cd93sav8vj9"; }; - patches = [(fetchpatch { - name = "gst-1.6.patch"; - url = "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch" - + "/?id=ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb"; - sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2"; - })]; + patches = let + mkUrl = hash: "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=" + hash; + in [ + (fetchpatch { + name = "gst-1.6.patch"; + url = mkUrl "ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb"; + sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2"; + }) + (fetchpatch { + name = "parallel-make-1.patch"; + url = mkUrl "1e1f53e9d91684918c34ec50392f86287e001a1e"; + sha256 = "1f9nk0bi90armb9zay53c7cz70zcwqqwli7sb9wgw76rmwqhl8qw"; + }) + (fetchpatch { + name = "parallel-make-2.patch"; + url = mkUrl "7389dc990c67d4269f3a79c924c054e87f2e4ac5"; + sha256 = "0mvdvyy76kpaxacljidf06wd43fr2qripr4mwsakjs3hxb1pkk57"; + }) + ]; nativeBuildInputs = [ cmake pkgconfig python ]; propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; @@ -22,11 +35,13 @@ stdenv.mkDerivation rec { cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; # remove after the next update + preBuild = '' NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" ''; - enableParallelBuilding = false; # missing _gen/future-constants.h + enableParallelBuilding = true; doCheck = false; # giving up for now meta = { diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 02c1546ace7..01ba759f4f6 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -219,7 +219,7 @@ stdenv.mkDerivation rec { fi done - for i in $out/libexec/android-sdk-*/build-tools/android-*/* + for i in $out/libexec/android-sdk-*/build-tools/*/* do if [ ! -d $i ] && [ -x $i ] then diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 1b49c8f6fc4..2918acd8c15 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { mkdir -p $out/build-tools cd $out/build-tools unzip $src + mv android-* ${version} ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' - cd android-* + cd ${version} # Patch the interpreter for i in aapt aidl bcc_compat dexdump llvm-rs-cc diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index e219b59de5d..9a30a5e4615 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -4,13 +4,13 @@ buildOcaml rec { name = "cohttp"; - version = "0.17.1"; + version = "0.19.3"; minimumSupportedOcamlVersion = "4.02"; src = fetchurl { url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz"; - sha256 = "fb124fb2fb5ff2e74559bf380627f6a537e208c1518ddcb01f0d37b62b55f673"; + sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv"; }; buildInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 23959306d2d..ef0a88fb228 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -8,12 +8,12 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; stdenv.mkDerivation rec { pname = "eliom"; - version = "4.1.0"; + version = "4.2.0"; name = "${pname}-${version}"; src = fetchurl { - url = https://github.com/ocsigen/eliom/archive/4.1.0.tar.gz; - sha256 = "10v7mrq3zsbxdlg8k8xif777mbvcdpabvnd1g7p2yqivr7f1qm24"; + url = https://github.com/ocsigen/eliom/archive/4.2.tar.gz; + sha256 = "0gbqzgn6xgpq6irz2sfr92qj3hjcwl45wy0inc4ps5r15nvq1l9h"; }; patches = [ ./camlp4.patch ]; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 0c73ff6521f..a018194a2ac 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: let - version = "2.4.6"; + version = "2.5.0"; inherit (stdenv.lib) optional getVersion versionAtLeast; ocaml_version = getVersion ocaml; in @@ -13,16 +13,15 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - sha256 = "0idci0zadpb8hmblszsrvg6yf36w5a9y6rsdwjc3jww71dgrw5d9"; + sha256 = "0jgg51aqbnia33l7bhgirnfpqybjwzpd85qzzd9znnc1a27gv8vr"; }; buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ]; propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; - configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" ] - ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ] - ++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel"; + configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"] + ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index a6361ce1237..a1bd7d16234 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -9,11 +9,11 @@ let mkpath = p: n: in stdenv.mkDerivation { - name = "ocsigenserver-2.5"; + name = "ocsigenserver-2.6"; src = fetchurl { - url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz; - sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r"; + url = https://github.com/ocsigen/ocsigenserver/archive/2.6.tar.gz; + sha256 = "0638xvlr0sssvjarmdwhgh7vbgdx8wiyjwq73w1bkjfwl7qm21zp"; }; buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index ef8ce098f3c..f80675f88d2 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -2,15 +2,16 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.4.7"; + version = "0.5.2"; in stdenv.mkDerivation { name = "ocaml-ssl-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/o/ocaml-ssl/ocaml-ssl_${version}.orig.tar.gz"; - sha256 = "0i0j89b10n3xmmawcq4qfwa42133pddw4x5nysmsnpd15srv5gp9"; + url = "http://downloads.sourceforge.net/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz"; + + sha256 = "0341rm8aqrckmhag1lrqfnl17v6n4ci8ibda62ahkkn5cxd58cpp"; }; buildInputs = [which ocaml findlib]; @@ -19,8 +20,6 @@ stdenv.mkDerivation { dontAddPrefix = true; - configureFlags = "--disable-ldconf"; - createFindlibDestdir = true; meta = { diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 4c46a9d13b4..6e6722a804f 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }: stdenv.mkDerivation rec { - version = "0.2.8-2015.08.08"; + version = "0.2.9-2016.01.14"; name = "pharo-launcher-${version}"; src = fetchurl { url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip"; - sha256 = "1cpjihdkywlqvjsvrpkkx7fx14wxi6yhymmayjbl0l7bpci0l7qm"; + sha256 = "0lzdnaw7l1rrzbrq53xsy38aiz6id5x7s78ds1dhb31vqc241yy8"; }; executable-name = "pharo-launcher"; diff --git a/pkgs/development/python-modules/4suite/default.nix b/pkgs/development/python-modules/4suite/default.nix deleted file mode 100644 index 94eec40d51f..00000000000 --- a/pkgs/development/python-modules/4suite/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, python}: - -stdenv.mkDerivation rec { - version = "1.0.2"; - name = "4suite-${version}"; - src = fetchurl { - url = "mirror://sourceforge/foursuite/4Suite-XML-${version}.tar.bz2"; - sha256 = "0g5cyqxhhiqnvqk457k8sb97r18pwgx6gff18q5296xd3zf4cias"; - }; - buildInputs = [python]; - buildPhase = "true"; - installPhase = "python ./setup.py install --prefix=$out"; - - # None of the tools installed to bin/ work. They all throw an exception - # similar to this: - # ImportError: No module named Ft.Xml.XPath._4xpath - meta.broken = true; -} diff --git a/pkgs/development/python-modules/numpy-no-large-files.patch b/pkgs/development/python-modules/numpy-no-large-files.patch deleted file mode 100644 index 0eb415606d3..00000000000 --- a/pkgs/development/python-modules/numpy-no-large-files.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- numpy/lib/tests/test_format.py 2015-08-11 12:03:43.000000000 -0500 -+++ numpy/lib/tests/test_format_no_large_files.py 2015-11-03 16:03:30.328084827 -0600 -@@ -810,32 +810,5 @@ - format.write_array_header_1_0(s, d) - assert_raises(ValueError, format.read_array_header_1_0, s) - -- --def test_large_file_support(): -- from nose import SkipTest -- if (sys.platform == 'win32' or sys.platform == 'cygwin'): -- raise SkipTest("Unknown if Windows has sparse filesystems") -- # try creating a large sparse file -- tf_name = os.path.join(tempdir, 'sparse_file') -- try: -- # seek past end would work too, but linux truncate somewhat -- # increases the chances that we have a sparse filesystem and can -- # avoid actually writing 5GB -- import subprocess as sp -- sp.check_call(["truncate", "-s", "5368709120", tf_name]) -- except: -- raise SkipTest("Could not create 5GB large file") -- # write a small array to the end -- with open(tf_name, "wb") as f: -- f.seek(5368709120) -- d = np.arange(5) -- np.save(f, d) -- # read it back -- with open(tf_name, "rb") as f: -- f.seek(5368709120) -- r = np.load(f) -- assert_array_equal(r, d) -- -- - if __name__ == "__main__": - run_module_suite() diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index c0647a6df4a..a5dde0a580b 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -6,8 +6,8 @@ with stdenv.lib; let - baseVersion = "3.5"; - revision = "1"; + baseVersion = "3.6"; + revision = "0"; version = "${baseVersion}.${revision}"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; - sha256 = "0r9ysq9hzig4ag9m8pcpw1jng2fqqns8zwp0jj893gh8ia0sq9ar"; + sha256 = "1v0x5asx9fj331jshial97gk7bwlb1a0k05h4zr22gh5cd4i0c5i"; }; buildInputs = [ makeWrapper qtbase qtscript qtquickcontrols qtdeclarative ]; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index c4e256d5873..dccb67efaf4 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchurl, fetchHex, erlang, tree, fetchFromGitHub }: +{ stdenv, writeText, callPackage, fetchurl, + fetchHex, erlang, rebar3-nix-bootstrap, tree, fetchFromGitHub }: let version = "3.0.0-beta.4"; - registrySnapshot = import ./registrySnapshot.nix { inherit fetchFromGitHub; }; - setupRegistry = '' - mkdir -p _build/default/{lib,plugins,packages}/ ./.cache/rebar3/hex/default/ - zcat ${registrySnapshot}/registry.ets.gz > .cache/rebar3/hex/default/registry - ''; + registrySnapshot = callPackage ./registrySnapshot.nix { }; + # TODO: all these below probably should go into nixpkgs.erlangModules.sources.* # {erlware_commons, "0.16.0"}, erlware_commons = fetchHex { @@ -73,6 +71,7 @@ let in stdenv.mkDerivation { name = "rebar3-${version}"; + inherit version; src = fetchurl { url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; @@ -81,14 +80,13 @@ stdenv.mkDerivation { patches = [ ./hermetic-bootstrap.patch ]; - buildInputs = [ erlang - tree - ]; - inherit setupRegistry; + buildInputs = [ erlang tree ]; + propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ]; postPatch = '' echo postPatch - ${setupRegistry} + rebar3-nix-bootstrap registry-only + echo "$ERL_LIBS" mkdir -p _build/default/lib/ cp --no-preserve=mode -R ${erlware_commons} _build/default/lib/erlware_commons cp --no-preserve=mode -R ${providers} _build/default/lib/providers diff --git a/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix b/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix index 8e9c2a292fd..378fb382f95 100644 --- a/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix +++ b/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix @@ -1,8 +1,23 @@ -{ fetchFromGitHub }: +{stdenv, writeText, fetchFromGitHub }: -fetchFromGitHub { - owner = "gleber"; - repo = "hex-pm-registry-snapshots"; - rev = "329ae2b"; - sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh"; +stdenv.mkDerivation rec { + name = "hex-registry"; + rev = "329ae2b"; + version = "0.0.0+build.${rev}"; + + src = fetchFromGitHub { + owner = "erlang-nix"; + repo = "hex-pm-registry-snapshots"; + inherit rev; + sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh"; + }; + + installPhase = '' + mkdir -p "$out/var/hex" + zcat "registry.ets.gz" > "$out/var/hex/registry.ets" + ''; + + setupHook = writeText "setupHook.sh" '' + export HEX_REGISTRY_SNAPSHOT="$1/var/hex/registry.ets" + ''; } diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix new file mode 100644 index 00000000000..8bb8f68e3a4 --- /dev/null +++ b/pkgs/development/tools/erlang/hex2nix/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons, getopt }: + +buildRebar3 rec { + name = "hex2nix"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "erlang-nix"; + repo = "hex2nix"; + rev = "${version}"; + sha256 = "18gkq5fkdiwq5zj98cz4kqxbpzjkpqcplpsw987drxwdbvq4hkwm"; + }; + + erlangDeps = [ ibrowse jsx erlware_commons getopt ]; + + DEBUG=1; + + installPhase = '' + runHook preInstall + make PREFIX=$out install + runHook postInstall + ''; + } diff --git a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix new file mode 100644 index 00000000000..b32d196272b --- /dev/null +++ b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromGitHub, erlang }: + +stdenv.mkDerivation rec { + name = "rebar3-nix-bootstrap"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "erlang-nix"; + repo = "rebar3-nix-bootstrap"; + rev = "${version}"; + sha256 = "0xyj7j59dmxyl5nhhsmb0r1pihmk0s4k02ga1rfgm30rij6n7431"; + }; + + buildInputs = [ erlang ]; + + installFlags = "PREFIX=$(out)"; + + meta = { + description = "Shim command to help bootstrap a rebar3 project on Nix"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/erl-nix/rebar3-nix-bootstrap"; + maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + }; +} diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 95ccdd89de1..0a62859d207 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -1,30 +1,28 @@ -{stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext}: +{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz }: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { name = "elfutils-${version}"; - version = "0.163"; + version = "0.165"; src = fetchurl { - urls = [ - "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "7c774f1eef329309f3b05e730bdac50013155d437518a2ec0e24871d312f2e23"; + url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2"; + sha256 = "0wp91hlh9n0ismikljf63558rzdwim8w1s271grsbaic35vr5z57"; }; - patches = [ - (fetchurl { - url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/elfutils-portability-${version}.patch"; - sha256 = "e4e82315dad2efaa4e4476503e7537e01b7c1b1f98a96de4ca1c7fa85f4f1045"; - }) ]; + patches = [ ./glibc-2.21.patch ]; # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. - nativeBuildInputs = [m4 bison flex gettext bzip2]; - buildInputs = [zlib bzip2]; + nativeBuildInputs = [ m4 bison flex gettext bzip2 ]; + buildInputs = [ zlib bzip2 xz ]; - configureFlags = "--disable-werror"; + configureFlags = + [ "--program-prefix=eu-" # prevent collisions with binutils + "--enable-deterministic-archives" + ]; + + enableParallelBuilding = true; crossAttrs = { @@ -67,9 +65,11 @@ stdenv.mkDerivation rec { ''; }; - dontAddDisableDepTrack = true; - meta = { homepage = https://fedorahosted.org/elfutils/; + description = "A set of utilities to handle ELF objects"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = lib.maintainers.eelco; }; } diff --git a/pkgs/development/tools/misc/elfutils/glibc-2.21.patch b/pkgs/development/tools/misc/elfutils/glibc-2.21.patch new file mode 100644 index 00000000000..f67632741e5 --- /dev/null +++ b/pkgs/development/tools/misc/elfutils/glibc-2.21.patch @@ -0,0 +1,164 @@ +From b9d70fb9fb0bd0bf84eb2302cba1691aea74c42e Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Wed, 13 Jan 2016 17:16:48 +0100 +Subject: [PATCH] libelf: Add ELF compression types and defines to libelf.h for + older glibc. + +Older glibc elf.h might not define the new ELF compression defines and +types. If not just define them in libelf.h directly to make the libelf +headers work on older glibc systems. + +Also include a testcase to check the libelf headers build against the +system elf.h. + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810885 + +Signed-off-by: Mark Wielaard +--- + libelf/ChangeLog | 5 +++++ + libelf/libelf.h | 28 ++++++++++++++++++++++++++++ + tests/ChangeLog | 8 ++++++++ + tests/Makefile.am | 9 +++++++-- + tests/system-elf-libelf-test.c | 35 +++++++++++++++++++++++++++++++++++ + 5 files changed, 83 insertions(+), 2 deletions(-) + create mode 100644 tests/system-elf-libelf-test.c + +diff --git a/libelf/ChangeLog b/libelf/ChangeLog +index 3a1fe91..aabf6f6 100644 +--- a/libelf/ChangeLog ++++ b/libelf/ChangeLog +@@ -1,3 +1,8 @@ ++2016-01-13 Mark Wielaard ++ ++ * libelf.h: Check SHF_COMPRESSED is defined. If not define it and the ++ associated ELF compression types/defines. ++ + 2015-11-26 Mark Wielaard + + * elf_compress.c (__libelf_decompress_elf): New function, extracted +diff --git a/libelf/libelf.h b/libelf/libelf.h +index 364e776..c0d6389 100644 +--- a/libelf/libelf.h ++++ b/libelf/libelf.h +@@ -35,6 +35,34 @@ + /* Get the ELF types. */ + #include + ++#ifndef SHF_COMPRESSED ++ /* Older glibc elf.h might not yet define the ELF compression types. */ ++ #define SHF_COMPRESSED (1 << 11) /* Section with compressed data. */ ++ ++ /* Section compression header. Used when SHF_COMPRESSED is set. */ ++ ++ typedef struct ++ { ++ Elf32_Word ch_type; /* Compression format. */ ++ Elf32_Word ch_size; /* Uncompressed data size. */ ++ Elf32_Word ch_addralign; /* Uncompressed data alignment. */ ++ } Elf32_Chdr; ++ ++ typedef struct ++ { ++ Elf64_Word ch_type; /* Compression format. */ ++ Elf64_Word ch_reserved; ++ Elf64_Xword ch_size; /* Uncompressed data size. */ ++ Elf64_Xword ch_addralign; /* Uncompressed data alignment. */ ++ } Elf64_Chdr; ++ ++ /* Legal values for ch_type (compression algorithm). */ ++ #define ELFCOMPRESS_ZLIB 1 /* ZLIB/DEFLATE algorithm. */ ++ #define ELFCOMPRESS_LOOS 0x60000000 /* Start of OS-specific. */ ++ #define ELFCOMPRESS_HIOS 0x6fffffff /* End of OS-specific. */ ++ #define ELFCOMPRESS_LOPROC 0x70000000 /* Start of processor-specific. */ ++ #define ELFCOMPRESS_HIPROC 0x7fffffff /* End of processor-specific. */ ++#endif + + /* Known translation types. */ + typedef enum +diff --git a/tests/ChangeLog b/tests/ChangeLog +index 366aea9..234ae56 100644 +--- a/tests/ChangeLog ++++ b/tests/ChangeLog +@@ -1,3 +1,11 @@ ++2016-01-13 Mark Wielaard ++ ++ * system-elf-libelf-test.c: New test. ++ * Makefile.am (TESTS): Add system-elf-libelf-test, if !STANDALONE. ++ (check_PROGRAMS): Likewise. ++ (system_elf_libelf_test_CPPFLAGS): New variable. ++ (system_elf_libelf_test_LDADD): Likewise. ++ + 2016-01-08 Mark Wielaard + + * elfputzdata.c (main): Fix parentheses in strncmp test. +diff --git a/tests/Makefile.am b/tests/Makefile.am +index d09a6d7..7b9e108 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -136,8 +136,8 @@ export ELFUTILS_DISABLE_DEMANGLE = 1 + endif + + if !STANDALONE +-check_PROGRAMS += msg_tst md5-sha1-test +-TESTS += msg_tst md5-sha1-test ++check_PROGRAMS += msg_tst md5-sha1-test system-elf-libelf-test ++TESTS += msg_tst md5-sha1-test system-elf-libelf-test + endif + + if LZMA +@@ -473,6 +473,11 @@ elfgetzdata_LDADD = $(libelf) + elfputzdata_LDADD = $(libelf) + zstrptr_LDADD = $(libelf) + ++# We want to test the libelf header against the system elf.h header. ++# Don't include any -I CPPFLAGS. ++system_elf_libelf_test_CPPFLAGS = ++system_elf_libelf_test_LDADD = $(libelf) ++ + if GCOV + check: check-am coverage + .PHONY: coverage +diff --git a/tests/system-elf-libelf-test.c b/tests/system-elf-libelf-test.c +new file mode 100644 +index 0000000..7dfe498 +--- /dev/null ++++ b/tests/system-elf-libelf-test.c +@@ -0,0 +1,35 @@ ++/* Explicit test compiling with system elf.h header plus libelf header. ++ ++ Copyright (C) 2016 Red Hat, Inc. ++ This file is part of elfutils. ++ ++ This file is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ elfutils is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#include ++#include ++#include "../libelf/libelf.h" ++ ++int ++main (void) ++{ ++ /* Trivial test, this is really a compile test anyway. */ ++ if (elf_version (EV_CURRENT) == EV_NONE) ++ return -1; ++ ++ /* This will obviously fail. It is just to check that Elf32_Chdr and ++ elf32_getchdr are available (both at compile time and runtime). */ ++ Elf32_Chdr *chdr = elf32_getchdr (NULL); ++ ++ return chdr == NULL ? 0 : -1; ++} +-- +1.8.3.1 + diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff index 0e3f55df6d2..e6fc96038ff 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff +++ b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff @@ -8,14 +8,3 @@ #### ---- old/Makefile 2014-09-30 16:40:37.000000000 +0200 -+++ new/Makefile 2015-10-14 10:28:41.366815864 +0200 -@@ -52,7 +52,7 @@ - install-bin: - install -d -m 755 $(BINDIR) - install $(BIN) $(BINDIR) -- install $(TOOLS) $(BINDIR) -+ install $(TOOLS) $(BINDIR) || true - - uninstall: uninstall-lib uninstall-bin - diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index eaabd50059d..ca5230d1e08 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,18 +1,24 @@ {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, - cmdliner, tyxml, reactivedata}: + cmdliner, tyxml, reactivedata, cppo, which, base64}: -stdenv.mkDerivation { - name = "js_of_ocaml-2.5"; - src = fetchurl { - url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz; - sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv"; +let camlp4_patch = fetchurl { + url = "https://github.com/FlorentBecker/js_of_ocaml/commit/3b511c5bb777d5049c49d7a04c01f142de7096b9.patch"; + sha256 = "c92eda8be504cd41eb242166fc815af496243b63d4d21b169f5b62ec5ace2d39"; }; - +in + +stdenv.mkDerivation { + name = "js_of_ocaml-2.6"; + src = fetchurl { + url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz; + sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61"; + }; + buildInputs = [ocaml findlib menhir ocsigen_deriving - cmdliner tyxml reactivedata]; + cmdliner tyxml reactivedata cppo which base64]; propagatedBuildInputs = [ ocaml_lwt camlp4 ]; - patches = [ ./Makefile.conf.diff ]; + patches = [ ./Makefile.conf.diff camlp4_patch ]; createFindlibDestdir = true; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 463f57f5e75..0f5caa40e73 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -4,15 +4,15 @@ with rustPlatform; buildRustPackage rec { name = "racer-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "phildawes"; repo = "racer"; rev = "v${version}"; - sha256 = "1b6829nqx0sqw1akcid61izw8mah1dfx2nxldkmmg4scnydhvw1l"; + sha256 = "1y6xzavxm5bnqcnnz0mbnf2491m2kksp36yx3kd5mxyly33482y7"; }; - depsSha256 = "1hfqr1kidl77lq3djbhfn37whvv6k0hg9g5gcnl6pgl6kn669hdc"; + depsSha256 = "1r2fxirkc0y6g7aas65n3yg1f2lf3kypnjr2v20p5np2lvla6djj"; buildInputs = [ makeWrapper ]; @@ -24,8 +24,6 @@ buildRustPackage rec { mkdir -p $out/bin cp -p target/release/racer $out/bin/ wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src" - install -d $out/share/emacs/site-lisp - install "editors/emacs/"*.el $out/share/emacs/site-lisp ''; meta = with stdenv.lib; { diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index ea9951e3339..f2f5a9e9b21 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz"; - sha256 = "0i5cf4n9qhzbi6hvw5lxapind24qpqfq6p5lrhx8gb25p670g95i"; + sha256 = "0f406ynz2fbg3hwavh52xh4f7kqm4mzhz59kkvb6dpsax5agalwk"; }; patchPhase = '' diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 7ffa44c1fe4..f9eb90f34f8 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, fetchurl, python27 , pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc -, openal, mesa, xproto, libX11, libXcursor, nspr, SDL +, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2 , gloox, nvidia-texture-tools , withEditor ? true, wxGTK ? null }: @@ -9,7 +9,7 @@ assert withEditor -> wxGTK != null; let - version = "0.0.18"; + version = "0.0.19"; releaseType = "alpha"; @@ -25,20 +25,22 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz"; - sha256 = "15q3mv5k3lqzf0wrby2r93fs194ym13790i68q8azscs4v9h8bxx"; + sha256 = "1cwvhg30i6axm7y5b62qyjwf1j8gwa5fgc13xsga3gzdphmjchrd"; }; buildInputs = [ zeroadData python27 pkgconfig spidermonkey_31 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet miniupnpc openal mesa xproto libX11 libXcursor nspr - SDL gloox nvidia-texture-tools + SDL SDL2 gloox nvidia-texture-tools ] ++ stdenv.lib.optional withEditor wxGTK; NIX_CFLAGS_COMPILE = [ "-I${xproto}/include/X11" "-I${libX11}/include/X11" "-I${libXcursor}/include/X11" + "-I${SDL}/include/SDL" + "-I${SDL2}/include/SDL2" ]; patchPhase = '' @@ -84,7 +86,7 @@ stdenv.mkDerivation rec { installPhase = '' # Copy executables. mkdir -p "$out"/bin - cp binaries/system/pyrogenesis "$out"/bin/ + cp binaries/system/pyrogenesis "$out"/bin/0ad ((${ toString withEditor })) && cp binaries/system/ActorEditor "$out"/bin/ # Copy l10n data. diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 97b6be9be2e..65fab09d04d 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,5 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig }: +{ stdenv, fetchurl, fetchzip, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig +, withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true +}: +let + opengfx = fetchzip { + url = "http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip"; + sha256 = "1sjzwl8wfdj0izlx2qdq15bqiy1vzq7gq7drydfwwryk173ig5sa"; + }; + + opensfx = fetchzip { + url = "http://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip"; + sha256 = "1bb167kszdd6dqbcdjrxxwab6b7y7jilhzi3qijdhprpm5gf1lp3"; + }; + + openmsx = fetchzip { + url = "http://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip"; + sha256 = "0qnmfzz0v8vxrrvxnm7szphrlrlvhkwn3y92b4iy0b4b6yam0yd4"; + }; + +in stdenv.mkDerivation rec { name = "openttd-${version}"; version = "1.5.3"; @@ -9,7 +28,9 @@ stdenv.mkDerivation rec { sha256 = "0qxss5rxzac94z5k16xv84ll0n163sphs88xkgv3z7vwramagffq"; }; - buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL libpng xz zlib freetype fontconfig ]; + prefixKey = "--prefix-dir="; configureFlags = [ @@ -21,6 +42,20 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/games/ $out/bin + + ${stdenv.lib.optionalString withOpenGFX '' + cp ${opengfx}/* $out/share/games/openttd/baseset + ''} + + mkdir -p $out/share/games/openttd/data + + ${stdenv.lib.optionalString withOpenSFX '' + cp ${opensfx}/*.{obs,cat} $out/share/games/openttd/data + ''} + + ${stdenv.lib.optionalString withOpenMSX '' + cp ${openmsx}/*.{obm,mid} $out/share/games/openttd/data + ''} ''; meta = { @@ -38,6 +73,6 @@ stdenv.mkDerivation rec { homepage = http://www.openttd.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny fpletz ]; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 14be330b79b..470c1960c7c 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -890,6 +890,8 @@ rec { buildPhase = '' patchShebangs . + substituteInPlace plugin/youcompleteme.vim \ + --replace "'ycm_path_to_python_interpreter', '''" "'ycm_path_to_python_interpreter', '${python}/bin/python'" mkdir build pushd build diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme index 625dfcb4f3e..e498eef8c0b 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme @@ -6,6 +6,8 @@ buildPhase = '' patchShebangs . + substituteInPlace plugin/youcompleteme.vim \ + --replace "'ycm_path_to_python_interpreter', '''" "'ycm_path_to_python_interpreter', '${python}/bin/python'" mkdir build pushd build diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 97eab37e4e1..8943f3276d7 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -61,13 +61,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "00vyrf72l54j3majqmn6vykqvvb15vygsaby644nsb5vpma6b1cn"; + sha256 = "0k93nqx8mxz2z84zzwpwfp7v7dwxwg1di1a2yb137lk7l157azw6"; }; postPatch = '' @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { --replace "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl" substituteInPlace doc/docs.xml \ --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" + substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)" ''; NIX_LDFLAGS = "-lgcc_s"; diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index 6961768e7d3..0a799775551 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "linuxconsoletools-${version}"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2"; - sha256 = "0spf9hx48cqx2i46pkz0gbrn7xrk68cw8iyrfbs2b3k0bxcsri13"; + sha256 = "0rwv2fxn12bblp096m9jy1lhngz26lv6g6zs4cgfg4frikwn977s"; }; buildInputs = [ SDL ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index b1878846eb8..d9efce840fa 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.13"; + version = "4.1.15"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04xhkqjpb1rfqkq6hxzfma5cr039p1fad2fgims5ns09nvalq6dr"; + sha256 = "18sr0dl5ax6pcx6nqp9drb4l6a38g07vxihiqpbwb231jv68h8j7"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 042c2225ff3..dc1697b9e9b 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,38 +1,34 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation rec { - name = "mdadm-3.3"; + name = "mdadm-3.3.4"; - # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING - # Do NOT update this if you're not ABSOLUTELY certain that it will work. - # Please check the update using the NixOS VM test, BEFORE pushing: - # nix-build nixos/release.nix -A tests.installer.swraid.x86_64-linux - # Discussion: - # https://github.com/NixOS/nixpkgs/commit/7719f7f - # https://github.com/NixOS/nixpkgs/commit/666cf99 - # https://github.com/NixOS/nixpkgs/pull/6006 - # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; - sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww"; + url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; + sha256 = "0s6a4bq7v7zxiqzv6wn06fv9f6g502dp047lj471jwxq0r9z9rca"; }; + # This is to avoid self-references, which causes the initrd to explode + # in size and in turn prevents mdraid systems from booting. + allowedReferences = [ stdenv.glibc ]; + + patches = [ ./no-self-references.patch ]; + + makeFlags = [ + "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" + "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" + ] ++ stdenv.lib.optionals (stdenv ? cross) [ + "CROSS_COMPILE=${stdenv.cross.config}-" + ]; + nativeBuildInputs = [ groff ]; # Attempt removing if building with gcc5 when updating NIX_CFLAGS_COMPILE = "-std=gnu89"; - preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile"; - - # Force mdadm to use /var/run/mdadm.map for its map file (or - # /dev/.mdadm/map as a fallback). - preBuild = - '' - makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man RUN_DIR=/dev/.mdadm) - if [[ -n "$crossConfig" ]]; then - makeFlagsArray+=(CROSS_COMPILE=$crossConfig-) - fi - ''; + preConfigure = '' + sed -e 's@/lib/udev@''${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile + ''; meta = { description = "Programs for managing RAID arrays under Linux"; diff --git a/pkgs/os-specific/linux/mdadm/no-self-references.patch b/pkgs/os-specific/linux/mdadm/no-self-references.patch new file mode 100644 index 00000000000..cf0366e52d1 --- /dev/null +++ b/pkgs/os-specific/linux/mdadm/no-self-references.patch @@ -0,0 +1,130 @@ +diff --git a/Makefile b/Makefile +index d82e30f..d231cf9 100644 +--- a/Makefile ++++ b/Makefile +@@ -51,6 +51,9 @@ endif + ifdef DEBIAN + CPPFLAGS += -DDEBIAN + endif ++ifdef NIXOS ++CPPFLAGS += -DNIXOS ++endif + ifdef DEFAULT_OLD_METADATA + CPPFLAGS += -DDEFAULT_OLD_METADATA + DEFAULT_METADATA=0.90 +@@ -105,6 +108,7 @@ endif + INSTALL = /usr/bin/install + DESTDIR = + BINDIR = /sbin ++INSTALL_BINDIR = ${BINDIR} + MANDIR = /usr/share/man + MAN4DIR = $(MANDIR)/man4 + MAN5DIR = $(MANDIR)/man5 +@@ -259,20 +263,20 @@ sha1.o : sha1.c sha1.h md5.h + $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c + + install : mdadm mdmon install-man install-udev +- $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm +- $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon ++ $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(INSTALL_BINDIR)/mdadm ++ $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(INSTALL_BINDIR)/mdmon + + install-static : mdadm.static install-man +- $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm ++ $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(INSTALL_BINDIR)/mdadm + + install-tcc : mdadm.tcc install-man +- $(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm ++ $(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(INSTALL_BINDIR)/mdadm + + install-uclibc : mdadm.uclibc install-man +- $(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm ++ $(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(INSTALL_BINDIR)/mdadm + + install-klibc : mdadm.klibc install-man +- $(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm ++ $(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(INSTALL_BINDIR)/mdadm + + install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8 + $(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8 +@@ -305,7 +309,7 @@ install-systemd: systemd/mdmon@.service + if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(SYSTEMD_DIR)/../scripts/mdadm_env.sh ;fi + + uninstall: +- rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm ++ rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(INSTALL_BINDIR)/mdadm + + test: mdadm mdmon test_stripe swap_super raid6check + @echo "Please run './test' as root" +diff --git a/policy.c b/policy.c +index 064d349..6b2f2b1 100644 +--- a/policy.c ++++ b/policy.c +@@ -796,12 +796,39 @@ char *find_rule(struct rule *rule, char *rule_type) + #define UDEV_RULE_FORMAT \ + "ACTION==\"add\", SUBSYSTEM==\"block\", " \ + "ENV{DEVTYPE}==\"%s\", ENV{ID_PATH}==\"%s\", " \ +-"RUN+=\"" BINDIR "/mdadm --incremental $env{DEVNAME}\"\n" ++"RUN+=\"%s/mdadm --incremental $env{DEVNAME}\"\n" + + #define UDEV_RULE_FORMAT_NOTYPE \ + "ACTION==\"add\", SUBSYSTEM==\"block\", " \ + "ENV{ID_PATH}==\"%s\", " \ +-"RUN+=\"" BINDIR "/mdadm --incremental $env{DEVNAME}\"\n" ++"RUN+=\"%s/mdadm --incremental $env{DEVNAME}\"\n" ++ ++#ifdef NIXOS ++const char *get_mdadm_bindir(void) ++{ ++ static char *bindir = NULL; ++ if (bindir != NULL) { ++ return bindir; ++ } else { ++ int len; ++ bindir = xmalloc(1025); ++ len = readlink("/proc/self/exe", bindir, 1024); ++ if (len > 0) { ++ char *basename; ++ if ((basename = strrchr(bindir, '/')) != NULL) ++ *basename = '\0'; ++ else ++ *(bindir + len) = '\0'; ++ } else { ++ *bindir = '\0'; ++ } ++ return bindir; ++ } ++} ++#define SELF get_mdadm_bindir() ++#else ++#define SELF BINDIR ++#endif + + /* Write rule in the rule file. Use format from UDEV_RULE_FORMAT */ + int write_rule(struct rule *rule, int fd, int force_part) +@@ -815,9 +842,9 @@ int write_rule(struct rule *rule, int fd, int force_part) + if (force_part) + typ = type_part; + if (typ) +- snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT, typ, pth); ++ snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT, typ, pth, SELF); + else +- snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT_NOTYPE, pth); ++ snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT_NOTYPE, pth, SELF); + return write(fd, line, strlen(line)) == (int)strlen(line); + } + +diff --git a/util.c b/util.c +index cc98d3b..1ada2f4 100644 +--- a/util.c ++++ b/util.c +@@ -1700,7 +1700,9 @@ int start_mdmon(char *devnm) + char pathbuf[1024]; + char *paths[4] = { + pathbuf, ++#ifndef NIXOS + BINDIR "/mdmon", ++#endif + "./mdmon", + NULL + }; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 00b3c6a9d6a..d0d587eb041 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -71,8 +71,8 @@ src = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.9.19"; - sha256 = "13h58rzdfhc5kc4xqwrd2p34rgnwim4hikq923cnfz1p2bvlddrf"; + rev = "v0.10.0"; + sha256 = "0isdqrnjhfy4zlydj4csf91i9184ykazyah3i63jfrmmarxr5li1"; }; inputs = [ pkgs.luajit ]; preConfigure = '' diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 141f58417fb..b9a42b4a5f6 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode }: +{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode, miniupnpc }: let - version = "0.2.6"; + version = "0.3"; in stdenv.mkDerivation { name = "pshs-${version}"; src = fetchurl { url = "https://www.bitbucket.org/mgorny/pshs/downloads/pshs-${version}.tar.bz2"; - sha256 = "0n8l5sjnwjqjmw0jzg3hb93n6npg2wahmdg1zrpsw8fyh9ggjg4g"; + sha256 = "0qvy1m9jmbjhbihs1qr9nasbaajl3n0x8bgz1vw9xvpkqymx5i63"; }; - buildInputs = [ pkgconfig libevent file qrencode ]; + buildInputs = [ pkgconfig libevent file qrencode miniupnpc ]; - # TODO: enable ssl once dependencies - # (libssl libcrypto libevent >= 2.1 libevent_openssl) can be met + # SSL requires libevent at 2.1 with ssl support configureFlags = "--disable-ssl"; meta = { diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix new file mode 100644 index 00000000000..45c62546628 --- /dev/null +++ b/pkgs/servers/mail/rmilter/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake, bison, flex, openssl, pcre, libmilter, opendkim }: + +stdenv.mkDerivation rec { + name = "rmilter-${version}"; + version = "1.6.7"; + src = fetchFromGitHub { + owner = "vstakhov"; + repo = "rmilter"; + rev = version; + sha256 = "1syviydlv4m1isl0r52sk4s0a75fyk788j1z3yvfzzf1hga333gn"; + }; + + nativeBuildInputs = [ bison cmake flex ]; + buildInputs = [ libmilter openssl pcre opendkim]; + + meta = with stdenv.lib; { + homepage = "https://github.com/vstakhov/rmilter"; + license = licenses.bsd2; + description = "server, used to integrate rspamd and milter compatible MTA, for example postfix or sendmail"; + maintainer = maintainers.avnik; + }; +} diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix new file mode 100644 index 00000000000..a3b20820a6e --- /dev/null +++ b/pkgs/servers/mail/rspamd/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, perl + ,file , glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite }: + +let libmagic = file; # libmagic provided buy file package ATM +in + +stdenv.mkDerivation rec { + name = "rspamd-${version}"; + version = "git-2016-01-16"; + src = fetchFromGitHub { + owner = "vstakhov"; + repo = "rspamd"; + rev = "04bfc92c1357c0f908ce9371ab303f8bf57657df"; + sha256 = "1zip1msjjy5q7jcsn4l0yyg92c3wdsf1v5jv1acglrih8dbfl7zj"; + }; + + nativeBuildInputs = [ cmake pkgconfig perl ]; + buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite]; + + postPatch = '' + substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local" "/etc/rspamd/rspamd.conf.local" + substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local.override" "/etc/rspamd/rspamd.conf.local.override" + ''; + + cmakeFlags = '' + -DDEBIAN_BUILD=ON + -DRUNDIR=/var/run/rspamd + -DDBDIR=/var/lib/rspamd + -DLOGDIR=/var/log/rspamd + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/vstakhov/rspamd"; + license = licenses.bsd2; + description = "advanced spam filtering system"; + maintainer = maintainers.avnik; + }; +} diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix new file mode 100644 index 00000000000..66d9e7258f4 --- /dev/null +++ b/pkgs/servers/matrix-synapse/default.nix @@ -0,0 +1,45 @@ +{ pkgs, stdenv, buildPythonPackage, pythonPackages, fetchurl, fetchFromGitHub }: +let + matrix-angular-sdk = buildPythonPackage rec { + name = "matrix-angular-sdk-${version}"; + version = "0.6.6"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/m/matrix-angular-sdk/matrix-angular-sdk-${version}.tar.gz"; + sha256 = "1vknhmibb8gh8lng50va2cdvng5xm7vqv9dl680m3gj38pg0bv8a"; + }; + }; +in +buildPythonPackage rec { + name = "matrix-synapse-${version}"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "synapse"; + rev = "f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38"; + sha256 = "0b0k1am9lh0qglagc06m91qs26ybv37k7wpbg5333x8jaf5d1si4"; + }; + + patches = [ ./matrix-synapse.patch ]; + + propagatedBuildInputs = with pythonPackages; [ + blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 + pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 + service-identity signedjson systemd twisted15 ujson unpaddedbase64 pyyaml + matrix-angular-sdk + ]; + + # Checks fail because of Tox. + doCheck = false; + + buildInputs = with pythonPackages; [ + mock setuptoolsTrial + ]; + + meta = { + homepage = https://matrix.org; + description = "Matrix reference homeserver"; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/servers/matrix-synapse/matrix-synapse.patch b/pkgs/servers/matrix-synapse/matrix-synapse.patch new file mode 100644 index 00000000000..a6a393ea56c --- /dev/null +++ b/pkgs/servers/matrix-synapse/matrix-synapse.patch @@ -0,0 +1,20 @@ +diff --git a/homeserver b/homeserver +new file mode 120000 +index 0000000..2f1d413 +--- /dev/null ++++ b/homeserver +@@ -0,0 +1 @@ ++synapse/app/homeserver.py +\ No newline at end of file +diff --git a/setup.py b/setup.py +index 9d24761..f3e6a00 100755 +--- a/setup.py ++++ b/setup.py +@@ -85,6 +85,6 @@ setup( + include_package_data=True, + zip_safe=False, + long_description=long_description, +- scripts=["synctl"] + glob.glob("scripts/*"), ++ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), + cmdclass={'test': Tox}, + ) diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix new file mode 100644 index 00000000000..7f8c372c335 --- /dev/null +++ b/pkgs/servers/rt/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "rt-4.2.12"; + + src = fetchurl { + url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; + + sha256 = "0r3jhgfwwhhk654zag42mrai85yrliw9sc0kgabwjvbh173204p2"; + }; + + patches = [ ./override-generated.patch ]; + + buildInputs = [ perl ]; + + buildPhase = "true"; + + installPhase = '' + mkdir $out + cp -a {bin,docs,etc,lib,sbin,share} $out + find $out -name '*.in' -exec rm '{}' \; + ''; +} diff --git a/pkgs/servers/rt/override-generated.patch b/pkgs/servers/rt/override-generated.patch new file mode 100644 index 00000000000..5727a9b50c5 --- /dev/null +++ b/pkgs/servers/rt/override-generated.patch @@ -0,0 +1,21 @@ +commit 7aec1e9478ef679227e759ab9537df7584c6a852 +Author: Shea Levy +Date: Fri Jan 15 09:09:18 2016 -0500 + + Make it possible to override hard-coded paths + +diff --git a/lib/RT/Generated.pm.in b/lib/RT/Generated.pm.in +index 9dcb80b..99b034b 100644 +--- a/lib/RT/Generated.pm.in ++++ b/lib/RT/Generated.pm.in +@@ -82,4 +82,10 @@ $MasonDataDir = '@MASON_DATA_PATH@'; + $MasonSessionDir = '@MASON_SESSION_PATH@'; + + ++if ( my $override_file = $ENV{RT_PATHS_OVERRIDE} ) ++{ ++ require "$override_file" || die "Couldn't load paths override file: $@"; ++} ++ ++ + 1; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d6e18254760..7bd179067cd 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -325,6 +325,10 @@ in wrapProgram $out/bin/Xephyr \ --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" + wrapProgram $out/bin/Xvfb \ + --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ + --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \ + --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" ''; passthru.version = version; # needed by virtualbox guest additions } else { diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f2a482e3db2..c0c19a64c3c 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -95,7 +95,7 @@ in rec { stdenvSandboxProfile = binShClosure + libSystemProfile; extraSandboxProfile = binShClosure + libSystemProfile; - extraAttrs = { inherit platform; }; + extraAttrs = { inherit platform; parent = last; }; overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; }; @@ -290,6 +290,7 @@ in rec { inherit platform bootstrapTools; libc = pkgs.darwin.Libsystem; shellPackage = pkgs.bash; + parent = stage4; }; allowedRequisites = (with pkgs; [ diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b1fdd96adb5..c5b8db591c4 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -33,10 +33,6 @@ buildPythonPackage rec { pillow pygtk pygobject ]; - postPatch = '' - sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py - ''; - preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" ''; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 04bcd119514..6e485dc0a05 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -33,10 +33,6 @@ buildPythonPackage rec { pygobject3 pycairo cython ]; - postPatch = '' - sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py - ''; - preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" ''; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 8e9d1530cdf..49638ced16a 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: let - version = "5.2.7"; + version = "5.3.9"; in stdenv.mkDerivation { name = "unrar-${version}"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "1b1ggrqn020pvvh2ia98alqxpl1q3x65cb6zzqwv91rpjiz7a57g"; + sha256 = "0nsxwg1zp3s34wyjznwmy2cc5929yk7m5smq11cqdb6hmql3fngz"; }; preBuild = '' diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 4b0531aa1ce..6b8de80ee70 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -11,11 +11,11 @@ # fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)"); stdenv.mkDerivation rec { - name = "fgallery-1.7"; + name = "fgallery-1.8"; src = fetchurl { url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; - sha256 = "1iix6p8viwnsq3zn9vg99sx20nmgk2p5als3j1lk914nz3anvai4"; + sha256 = "1n237sk7fm4yrpn69qaz9fwbjl6i94y664q7d16bhngrcil3bq1d"; }; buildInputs = [ unzip makeWrapper perl ImageExifTool JSON ]; diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index c9c526bc520..d8f53a032af 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "abduco-0.4"; + name = "abduco-0.5"; meta = { homepage = http://brain-dump.org/projects/abduco; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; - sha256 = "1fxwg2s5w183p0rwzsxizy9jdnilv5qqs647l3wl3khny6fp58xx"; + sha256 = "11phry5wnvwm9ckij5gxbrjfgdz3x38vpnm505q5ldc88im248mz"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); diff --git a/pkgs/tools/misc/mates/default.nix b/pkgs/tools/misc/mates/default.nix deleted file mode 100644 index 952bd1a2b7d..00000000000 --- a/pkgs/tools/misc/mates/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -with rustPlatform; - -buildRustPackage rec { - name = "mates-${version}"; - version = "0.1.0"; - - depsSha256 = "03mqw9zs3hbsgz8m3qbrbbcg2q47nldfx280dyv0ivfksnlc7lyc"; - - src = fetchFromGitHub { - owner = "untitaker"; - repo = "mates"; - rev = "${version}"; - sha256 = "00dpl7vh2byb4v94zxjbcqj7jnq65vcbrlpkxrrii0ip13dr69pw"; - }; - - meta = with stdenv.lib; { - description = "Very simple commandline addressbook"; - homepage = https://github.com/untitaker/mates.rs; - license = stdenv.lib.licenses.mit; - maintainers = [ maintainers.DamienCassou ]; - }; -} diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 376d0ea6ad5..f9512b09ce6 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -1,22 +1,25 @@ { stdenv, fetchurl, gettext }: -let version = "2.5.1"; in +let version = "2.5.2"; in stdenv.mkDerivation rec { name = "ms-sys-${version}"; src = fetchurl { url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; - sha256 = "1vw8yvcqb6iccs4x7rgk09mqrazkalmpxxxsxmvxn32jzdzl5b26"; + sha256 = "0c7ld5pglcacnrvy2gzzg1ny1jyknlj9iz1mvadq3hn8ai1d83px"; }; buildInputs = [ gettext ]; + enableParallelBuilding = true; + makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { inherit version; - homepage = http://ms-sys.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; description = "A program for writing Microsoft compatible boot records"; + homepage = http://ms-sys.sourceforge.net/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 49c2736095e..46dbc2a2a22 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,37 +1,37 @@ -{stdenv, clang, fetchurl, curl}: +{ stdenv, fetchFromGitHub, clang, curl, libzip, pkgconfig }: -with stdenv.lib; - -let version = "1.0"; in +let version = "1.1.0"; in stdenv.mkDerivation { name = "tldr-${version}"; - src = fetchurl { - url = "https://github.com/tldr-pages/tldr-cpp-client/archive/v${version}.tar.gz"; - sha256 = "11k2pc4vfhx9q3cfd1145sdwhis9g0zhw4qnrv7s7mqnslzrrkgw"; + src = fetchFromGitHub { + sha256 = "0hxkrzp5njhy7c19v8i3svcb148f1jni7dlv36gc1nmcrz5izsiz"; + rev = "v${version}"; + repo = "tldr-cpp-client"; + owner = "tldr-pages"; }; - meta = { - inherit version; - description = "Simplified and community-driven man pages"; - longDescription = '' - tldr pages gives common use cases for commands, so you don't need to hunt through a man page for the correct flags. - ''; - homepage = http://tldr-pages.github.io; - license = licenses.mit; - maintainers = [maintainers.taeer]; - platforms = platforms.linux; + buildInputs = [ curl clang libzip ]; + nativeBuildInputs = [ pkgconfig ]; - }; - - buildInputs = [curl clang]; - - preBuild = '' + preConfigure = '' cd src ''; installPhase = '' - install -d $prefix/bin - install tldr $prefix/bin + install -Dm755 {.,$out/bin}/tldr ''; + + meta = with stdenv.lib; { + inherit version; + description = "Simplified and community-driven man pages"; + longDescription = '' + tldr pages gives common use cases for commands, so you don't need to hunt + through a man page for the correct flags. + ''; + homepage = http://tldr-pages.github.io; + license = licenses.mit; + maintainers = with maintainers; [ taeer nckx ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 77226ae0be9..09e4531d925 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.19.2"; + version = "1.19.3"; src = fetchurl { url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz"; - sha256 = "0gnm1b7yp5q6fcajz1ln2f1rv64p6dv0nz9bcwpqrkcmsinlh19n"; + sha256 = "1qwr4al6wlh5f558r0mr1hvdnf7d8ss6qwqn2361k99phk1cdg3a"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 0d9ac7f6475..b63abf1ae33 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchFromGitHub, gnutls33, autoreconfHook }: +{ stdenv, fetchurl, gnutls33, autoreconfHook }: let - version = "1.99.13"; + version = "1.99.15"; in stdenv.mkDerivation { name = "inadyn-${version}"; - src = fetchFromGitHub { - repo = "inadyn"; - owner = "troglobit"; - rev = version; - sha256 = "19z8si66b2kwb7y29qpd8y45rhg5wrycwkdgjqqp98sg5yq8p7v0"; + src = fetchurl { + url = "https://github.com/troglobit/inadyn/releases/download/${version}/inadyn-${version}.tar.xz"; + sha256 = "05f7k9wpr0fn44y0pvdrv8xyilygmq3kjhvrwlj6dgg9ackdhkmm"; }; preConfigure = '' diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index bd580d28320..ef420961a1f 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { - name = "urlwatch-1.18"; + name = "urlwatch-2.0"; src = fetchurl { url = "http://thp.io/2008/urlwatch/${name}.tar.gz"; - sha256 = "090qfgx249ks7103sap6w47f8302ix2k46wxhfssxwsqcqdl25vb"; + sha256 = "0j38qzw4jxw41vnnpi6j851hqpv8d6p1cbni6cv8r2vqf5307s3b"; }; - patchPhase = '' - ./convert-to-python3.sh - ''; + propagatedBuildInputs = with python3Packages; [ + keyring + minidb + pyyaml + ]; postFixup = '' wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH" diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 831a815e787..62d3d2613cc 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,21 +1,19 @@ -{ stdenv, pythonPackages, fetchFromGitHub, makeWrapper, pandoc +{ stdenv, pythonPackages, fetchurl, makeWrapper, pandoc , coreutils, iptables, nettools, openssh, procps }: pythonPackages.buildPythonPackage rec { - version = "0.74"; + version = "0.76"; name = "sshuttle-${version}"; - src = fetchFromGitHub { - sha256 = "1mx440wb1clis97nvgx67am9qssa3v11nb9irjzhnx44ygadhfcp"; - rev = "v${version}"; - repo = "sshuttle"; - owner = "sshuttle"; + src = fetchurl { + sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b"; + url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz"; }; patches = [ ./sudo.patch ]; propagatedBuildInputs = with pythonPackages; [ PyXAPI mock pytest ]; - nativeBuildInputs = [ makeWrapper pandoc ]; + nativeBuildInputs = [ makeWrapper pandoc pythonPackages.setuptools_scm ]; buildInputs = [ coreutils openssh ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ]; @@ -29,7 +27,7 @@ pythonPackages.buildPythonPackage rec { meta = with stdenv.lib; { inherit version; - inherit (src.meta) homepage; + homepage = https://github.com/sshuttle/sshuttle/; description = "Transparent proxy server that works as a poor man's VPN"; longDescription = '' Forward connections over SSH, without requiring administrator access to the diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index f3fece1f177..d8db034f151 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -10,9 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 bison flex ]; - # https://github.com/rc0/mairix/issues/12 + # https://github.com/rc0/mairix/pull/19 patches = [ ./mmap.patch ]; - patchFlags = "-p2"; + + enableParallelBuilding = true; meta = { homepage = http://www.rc0.org.uk/mairix; diff --git a/pkgs/tools/text/mairix/mmap.patch b/pkgs/tools/text/mairix/mmap.patch index 0d43ac7ce7a..241083f2dde 100644 --- a/pkgs/tools/text/mairix/mmap.patch +++ b/pkgs/tools/text/mairix/mmap.patch @@ -1,25 +1,29 @@ -Fix "Cannot allocate memory" on mmap of files bigger than 2GiB. +Making mairix work with mbox files over 2GB. -https://github.com/rc0/mairix/issues/12 +https://github.com/rc0/mairix/pull/19 -diff -ruN t/mairix-0.22/mairix.h mairix/mairix-0.22/mairix.h ---- t/mairix-0.22/mairix.h 2010-06-05 14:41:10.000000000 -0700 -+++ mairix/mairix-0.22/mairix.h 2015-07-08 13:33:06.678718524 -0700 -@@ -327,8 +327,8 @@ +diff --git a/mairix.h b/mairix.h +index 2480492..cb25824 100644 +--- a/mairix.h ++++ b/mairix.h +@@ -327,9 +327,9 @@ enum data_to_rfc822_error { + DTR8_BAD_HEADERS, /* corrupt headers */ DTR8_BAD_ATTACHMENT /* corrupt attachment (e.g. no body part) */ }; - struct rfc822 *data_to_rfc822(struct msg_src *src, char *data, int length, enum data_to_rfc822_error *error); +-struct rfc822 *data_to_rfc822(struct msg_src *src, char *data, int length, enum data_to_rfc822_error *error); -void create_ro_mapping(const char *filename, unsigned char **data, int *len); -void free_ro_mapping(unsigned char *data, int len); ++struct rfc822 *data_to_rfc822(struct msg_src *src, char *data, size_t length, enum data_to_rfc822_error *error); +void create_ro_mapping(const char *filename, unsigned char **data, size_t *len); +void free_ro_mapping(unsigned char *data, size_t len); char *format_msg_src(struct msg_src *src); - + /* In tok.c */ -diff -ruN t/mairix-0.22/mbox.c mairix/mairix-0.22/mbox.c ---- t/mairix-0.22/mbox.c 2010-06-05 14:41:10.000000000 -0700 -+++ mairix/mairix-0.22/mbox.c 2015-07-08 13:32:45.126280861 -0700 -@@ -816,7 +816,7 @@ +diff --git a/mbox.c b/mbox.c +index ebbfa78..396e27d 100644 +--- a/mbox.c ++++ b/mbox.c +@@ -816,7 +816,7 @@ void build_mbox_lists(struct database *db, const char *folder_base, /*{{{*/ mb->n_old_msgs_valid = mb->n_msgs; } else { unsigned char *va; @@ -28,28 +32,65 @@ diff -ruN t/mairix-0.22/mbox.c mairix/mairix-0.22/mbox.c create_ro_mapping(mb->path, &va, &len); if (va) { rescan_mbox(mb, (char *) va, len); -@@ -852,7 +852,7 @@ +@@ -852,7 +852,7 @@ int add_mbox_messages(struct database *db)/*{{{*/ int any_new = 0; int N; unsigned char *va; - int valen; + size_t valen; enum data_to_rfc822_error error; - + for (i=0; in_mboxen; i++) { -diff -ruN t/mairix-0.22/rfc822.c mairix/mairix-0.22/rfc822.c ---- t/mairix-0.22/rfc822.c 2010-06-05 14:41:10.000000000 -0700 -+++ mairix/mairix-0.22/rfc822.c 2015-07-08 13:30:59.388133879 -0700 -@@ -1250,7 +1250,7 @@ +diff --git a/reader.c b/reader.c +index 71ac5bd..18f0108 100644 +--- a/reader.c ++++ b/reader.c +@@ -81,7 +81,8 @@ static void read_toktable2_db(char *data, struct toktable2_db *toktable, int sta + /*}}}*/ + struct read_db *open_db(char *filename)/*{{{*/ + { +- int fd, len; ++ int fd; ++ size_t len; + char *data; + struct stat sb; + struct read_db *result; +diff --git a/reader.h b/reader.h +index 9b5dfa3..d709cc4 100644 +--- a/reader.h ++++ b/reader.h +@@ -138,7 +138,7 @@ struct toktable2_db {/*{{{*/ + struct read_db {/*{{{*/ + /* Raw file parameters, needed later for munmap */ + char *data; +- int len; ++ size_t len; + + /* Pathname information */ + int n_msgs; +diff --git a/rfc822.c b/rfc822.c +index b411f85..9c8e1a4 100644 +--- a/rfc822.c ++++ b/rfc822.c +@@ -990,7 +990,7 @@ static void scan_status_flags(const char *s, struct headers *hdrs)/*{{{*/ + + /*{{{ data_to_rfc822() */ + struct rfc822 *data_to_rfc822(struct msg_src *src, +- char *data, int length, ++ char *data, size_t length, + enum data_to_rfc822_error *error) + { + struct rfc822 *result; +@@ -1265,7 +1265,7 @@ static struct ro_mapping *add_ro_cache(const char *filename, int fd, size_t len) } #endif /* USE_GZIP_MBOX || USE_BZIP_MBOX */ - + -void create_ro_mapping(const char *filename, unsigned char **data, int *len)/*{{{*/ +void create_ro_mapping(const char *filename, unsigned char **data, size_t *len)/*{{{*/ { struct stat sb; int fd; -@@ -1371,7 +1371,7 @@ +@@ -1386,7 +1386,7 @@ comp_error: data_alloc_type = ALLOC_MMAP; } /*}}}*/ @@ -57,8 +98,8 @@ diff -ruN t/mairix-0.22/rfc822.c mairix/mairix-0.22/rfc822.c +void free_ro_mapping(unsigned char *data, size_t len)/*{{{*/ { int r; - -@@ -1399,7 +1399,7 @@ + +@@ -1414,7 +1414,7 @@ static struct msg_src *setup_msg_src(char *filename)/*{{{*/ /*}}}*/ struct rfc822 *make_rfc822(char *filename)/*{{{*/ { @@ -66,11 +107,12 @@ diff -ruN t/mairix-0.22/rfc822.c mairix/mairix-0.22/rfc822.c + size_t len; unsigned char *data; struct rfc822 *result; - -diff -ruN t/mairix-0.22/search.c mairix/mairix-0.22/search.c ---- t/mairix-0.22/search.c 2010-06-05 14:41:10.000000000 -0700 -+++ mairix/mairix-0.22/search.c 2015-07-08 13:32:25.809888610 -0700 -@@ -667,7 +667,7 @@ + +diff --git a/search.c b/search.c +index 18b51ee..97967bc 100644 +--- a/search.c ++++ b/search.c +@@ -681,7 +681,7 @@ static void mbox_terminate(const unsigned char *data, int len, FILE *out)/*{{{*/ static void append_file_to_mbox(const char *path, FILE *out)/*{{{*/ { unsigned char *data; @@ -79,8 +121,8 @@ diff -ruN t/mairix-0.22/search.c mairix/mairix-0.22/search.c create_ro_mapping(path, &data, &len); if (data) { fprintf(out, "From mairix@mairix Mon Jan 1 12:34:56 1970\n"); -@@ -683,8 +683,8 @@ - +@@ -698,8 +698,8 @@ static int had_failed_checksum; + static void get_validated_mbox_msg(struct read_db *db, int msg_index,/*{{{*/ int *mbox_index, - unsigned char **mbox_data, int *mbox_len, @@ -90,16 +132,16 @@ diff -ruN t/mairix-0.22/search.c mairix/mairix-0.22/search.c { /* msg_data==NULL if checksum mismatches */ unsigned char *start; -@@ -715,7 +715,7 @@ +@@ -738,7 +738,7 @@ static void append_mboxmsg_to_mbox(struct read_db *db, int msg_index, FILE *out) { /* Need to common up code with try_copy_to_path */ unsigned char *mbox_start, *msg_start; - int mbox_len, msg_len; + size_t mbox_len, msg_len; int mbox_index; - + get_validated_mbox_msg(db, msg_index, &mbox_index, &mbox_start, &mbox_len, &msg_start, &msg_len); -@@ -735,7 +735,7 @@ +@@ -759,7 +759,7 @@ static void append_mboxmsg_to_mbox(struct read_db *db, int msg_index, FILE *out) static void try_copy_to_path(struct read_db *db, int msg_index, char *target_path)/*{{{*/ { unsigned char *data; @@ -108,3 +150,12 @@ diff -ruN t/mairix-0.22/search.c mairix/mairix-0.22/search.c int mbi; FILE *out; unsigned char *start; +@@ -1214,7 +1214,7 @@ static int do_search(struct read_db *db, char **args, char *output_path, int sho + unsigned int mbix, msgix; + int start, len, after_end; + unsigned char *mbox_start, *msg_start; +- int mbox_len, msg_len; ++ size_t mbox_len, msg_len; + int mbox_index; + + start = db->mtime_table[i]; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index 3343579bbab..600522d45a2 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "hevea-2.26"; + name = "hevea-2.28"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "173v6z2li12pah6315dfpwhqrdljkhsff82gj7sql812zwjkvd2f"; + sha256 = "14fns13wlnpiv9i05841kvi3cq4b9v2sw5x3ff6ziws28q701qnd"; }; buildInputs = [ ocaml ]; - configurePhase = '' - export makeFlags="PREFIX=$out"; - ''; + makeFlags = "PREFIX=$(out)"; meta = with stdenv.lib; { description = "A quite complete and fast LATEX to HTML translator"; diff --git a/pkgs/tools/virtualization/azure-cli/default.nix b/pkgs/tools/virtualization/azure-cli/default.nix index 10a40e8208c..049597256a4 100644 --- a/pkgs/tools/virtualization/azure-cli/default.nix +++ b/pkgs/tools/virtualization/azure-cli/default.nix @@ -1,4 +1,4 @@ -{ recurseIntoAttrs, callPackage, nodejs +{ recurseIntoAttrs, callPackage, nodejs, makeWrapper }: let @@ -7,7 +7,22 @@ let inherit nodejs self; generated = callPackage ./node-packages.nix { inherit self; }; overrides = { - "azure-cli" = { passthru.nodePackages = self; }; + + "azure-cli" = + let + streamline-streams = self.by-version."streamline-streams"."0.1.5"; + streamline = self.by-version."streamline"."0.10.17"; + node-uuid = self.by-version."node-uuid"."1.2.0"; + in { + passthru.nodePackages = self; + + buildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/azure" \ + --set NODE_PATH "${streamline-streams}/lib/node_modules:${streamline}/lib/node_modules:${node-uuid}/lib/node_modules" + ''; + }; "easy-table" = { dontMakeSourcesWritable = 1; postUnpack = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85780ec218b..b9962f495d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -475,10 +475,6 @@ let _9pfs = callPackage ../tools/filesystems/9pfs { }; - "3dfsb" = callPackage ../applications/misc/3dfsb { - glibc = glibc.override { debugSymbols = true; }; - }; - a2ps = callPackage ../tools/text/a2ps { }; abduco = callPackage ../tools/misc/abduco { }; @@ -2076,6 +2072,8 @@ let makebootfat = callPackage ../tools/misc/makebootfat { }; + matrix-synapse = callPackage ../servers/matrix-synapse { }; + memtester = callPackage ../tools/system/memtester { }; minidlna = callPackage ../tools/networking/minidlna { }; @@ -2246,8 +2244,6 @@ let man_db = callPackage ../tools/misc/man-db { }; - mates = callPackage ../tools/misc/mates { }; - mawk = callPackage ../tools/text/mawk { }; mbox = callPackage ../tools/security/mbox { }; @@ -2905,6 +2901,8 @@ let redmine = callPackage ../applications/version-management/redmine { }; + rt = callPackage ../servers/rt { }; + rtmpdump = callPackage ../tools/video/rtmpdump { }; rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; @@ -4967,6 +4965,12 @@ let tbb = callPackage ../development/libraries/tbb { }; + terra = callPackage ../development/compilers/terra { + llvm = llvmPackages_35.llvm.override { enableSharedLibraries = false; }; + clang = clang_35; + lua = lua5_1; + }; + teyjus = callPackage ../development/compilers/teyjus { omake = omake_rc1; }; @@ -5093,9 +5097,11 @@ let rebar = callPackage ../development/tools/build-managers/rebar { }; rebar3 = callPackage ../development/tools/build-managers/rebar3 { }; + rebar3-nix-bootstrap = callPackage ../development/tools/erlang/rebar3-nix-bootstrap { }; fetchHex = callPackage ../development/tools/build-managers/rebar3/fetch-hex.nix { }; erlangPackages = callPackage ../development/erlang-modules { }; + hex2nix = erlangPackages.callPackage ../development/tools/erlang/hex2nix { }; elixir = callPackage ../development/interpreters/elixir { }; @@ -5611,6 +5617,8 @@ let complexity = callPackage ../development/tools/misc/complexity { }; + cookiecutter = pythonPackages.cookiecutter; + ctags = callPackage ../development/tools/misc/ctags { }; ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix {}; @@ -6405,9 +6413,6 @@ let ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -9035,8 +9040,6 @@ let self = pypyPackages; }); - foursuite = pythonPackages.foursuite; - bsddb3 = pythonPackages.bsddb3; ecdsa = pythonPackages.ecdsa; @@ -9378,6 +9381,10 @@ let postsrsd = callPackage ../servers/mail/postsrsd { }; + rmilter = callPackage ../servers/mail/rmilter { }; + + rspamd = callPackage ../servers/mail/rspamd { }; + pshs = callPackage ../servers/http/pshs { }; libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; }; @@ -11108,9 +11115,7 @@ let audacious = callPackage ../applications/audio/audacious { }; - audacity = callPackage ../applications/audio/audacity { - ffmpeg = ffmpeg_2_2; - }; + audacity = callPackage ../applications/audio/audacity { }; audio-recorder = callPackage ../applications/audio/audio-recorder { }; @@ -11164,10 +11169,6 @@ let bandwidth = callPackage ../tools/misc/bandwidth { }; - bar = callPackage ../applications/window-managers/bar { }; - - bar-xft = callPackage ../applications/window-managers/bar/xft.nix { }; - baresip = callPackage ../applications/networking/instant-messengers/baresip { ffmpeg = ffmpeg_1; }; @@ -12351,6 +12352,10 @@ let inherit (gnome) libglade; }; + lemonbar = callPackage ../applications/window-managers/lemonbar { }; + + lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; + leo-editor = callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; @@ -15810,6 +15815,8 @@ aliases = with self; rec { adobeReader = adobe-reader; arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 + bar = lemonbar; # added 2015-01-16 + bar-xft = lemonbar-xft; # added 2015-01-16 bridge_utils = bridge-utils; # added 2015-02-20 buildbotSlave = buildbot-slave; # added 2014-12-09 cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2d61bcd11b7..1e8dfa91d2d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -180,6 +180,19 @@ let self = _self // overrides; _self = with self; { }; }; + ApacheSession = buildPerlPackage { + name = "Apache-Session-1.93"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz; + sha256 = "8e5a4882ac8ec657d1018d74d3ba37854e2688a41ddd0e1d73955ea59f276e8d"; + }; + buildInputs = [ TestDeep TestException ]; + meta = { + description = "A persistence framework for session data"; + license = "perl"; + }; + }; + ApacheTest = buildPerlPackage { name = "Apache-Test-1.38"; src = fetchurl { @@ -727,6 +740,18 @@ let self = _self // overrides; _self = with self; { }; }; + CacheSimpleTimedExpiry = buildPerlPackage { + name = "Cache-Simple-TimedExpiry-0.27"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-0.27.tar.gz; + sha256 = "4e78b7e4dd231b5571a48cd0ee1b63953f5e34790c9d020e1595a7c7d0abbe49"; + }; + meta = { + description = "A lightweight cache with timed expiration"; + license = "perl"; + }; + }; + Cairo = buildPerlPackage rec { name = "Cairo-1.106"; src = fetchurl { @@ -1412,6 +1437,21 @@ let self = _self // overrides; _self = with self; { }; }; + CGIEmulatePSGI = buildPerlPackage { + name = "CGI-Emulate-PSGI-0.21"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-Emulate-PSGI-0.21.tar.gz; + sha256 = "06b8f1864101de69b2264ad3c3a2b15333e428cf9f5d17a777cfc61f8c64093f"; + }; + buildInputs = [ TestRequires ]; + propagatedBuildInputs = [ HTTPMessage ]; + meta = { + homepage = https://github.com/tokuhirom/p5-cgi-emulate-psgi; + description = "PSGI adapter for CGI"; + license = "perl"; + }; + }; + CGIExpand = buildPerlPackage { name = "CGI-Expand-2.04"; src = fetchurl { @@ -1448,6 +1488,18 @@ let self = _self // overrides; _self = with self; { }; }; + CGIPSGI = buildPerlPackage { + name = "CGI-PSGI-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz; + sha256 = "c50dcb10bf8486a9843baed032ad89d879ff2f41c993342dead62f947a598d91"; + }; + meta = { + description = "Adapt CGI.pm to the PSGI protocol"; + license = "perl"; + }; + }; + CGISession = buildPerlPackage rec { name = "CGI-Session-4.48"; src = fetchurl { @@ -1545,6 +1597,18 @@ let self = _self // overrides; _self = with self; { }; }; + ClassAccessorLite = buildPerlPackage { + name = "Class-Accessor-Lite-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZUHO/Class-Accessor-Lite-0.08.tar.gz; + sha256 = "75b3b8ec8efe687677b63f0a10eef966e01f60735c56656ce75cbb44caba335a"; + }; + meta = { + description = "A minimalistic variant of Class::Accessor"; + license = "perl"; + }; + }; + ClassAutouse = buildPerlPackage { name = "Class-Autouse-1.99_02"; src = fetchurl { @@ -1731,6 +1795,19 @@ let self = _self // overrides; _self = with self; { ClassMOP = Moose; + ClassReturnValue = buildPerlPackage { + name = "Class-ReturnValue-0.55"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz; + sha256 = "ed3836885d78f734ccd7a98550ec422a616df7c31310c1b7b1f6459f5fb0e4bd"; + }; + propagatedBuildInputs = [ DevelStackTrace ]; + meta = { + description = "A smart return value object"; + license = "perl"; + }; + }; + ClassSingleton = buildPerlPackage rec { name = "Class-Singleton-1.5"; src = fetchurl { @@ -2052,6 +2129,20 @@ let self = _self // overrides; _self = with self; { }; }; + ConvertColor = buildPerlPackage { + name = "Convert-Color-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz; + sha256 = "b41217c72931034ba4417d7a9e1e2999f04580d4e6b31c70993fedccc2440d38"; + }; + buildInputs = [ TestNumberDelta ]; + propagatedBuildInputs = [ ListUtilsBy ModulePluggable ]; + meta = { + description = "Color space conversions and named lookups"; + license = "perl"; + }; + }; + constant = buildPerlPackage rec { name = "constant-1.33"; src = fetchurl { @@ -2461,6 +2552,20 @@ let self = _self // overrides; _self = with self; { buildInputs = [ Clone ]; }; + CSSSquish = buildPerlPackage { + name = "CSS-Squish-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz; + sha256 = "65fc0d69acd1fa33d9a4c3b09cce0fbd737d747b1fcc4e9d87ebd91050cbcb4e"; + }; + buildInputs = [ TestLongString ]; + propagatedBuildInputs = [ URI ]; + meta = { + description = "Compact many CSS files into one big file"; + license = "unknown"; + }; + }; + Curses = let version = "1.33"; in buildPerlPackage { name = "Curses-${version}"; src = fetchurl { @@ -2571,6 +2676,20 @@ let self = _self // overrides; _self = with self; { }; }; + DataGUID = buildPerlPackage { + name = "Data-GUID-0.048"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.048.tar.gz; + sha256 = "cb263b1e6eeecc5797de6f945d42ace2db26c156172883550b73fa2ecdab29dc"; + }; + propagatedBuildInputs = [ DataUUID SubExporter SubInstall ]; + meta = { + homepage = https://github.com/rjbs/Data-GUID; + description = "Globally unique identifiers"; + license = "perl"; + }; + }; + DataHierarchy = buildPerlPackage { name = "Data-Hierarchy-0.34"; src = fetchurl { @@ -2580,6 +2699,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [TestException]; }; + DataICal = buildPerlPackage { + name = "Data-ICal-0.22"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALEXMV/Data-ICal-0.22.tar.gz; + sha256 = "8ae9d20af244e5a6f606c7325e9d145dd0002676a178357af860a5e156925720"; + }; + buildInputs = [ TestLongString TestNoWarnings TestWarn ]; + propagatedBuildInputs = [ ClassAccessor ClassReturnValue TextvFileasData ]; + meta = { + description = "Generates iCalendar (RFC 2445) calendar files"; + license = "perl"; + }; + }; + DataInteger = buildPerlPackage rec { name = "Data-Integer-0.005"; src = fetchurl { @@ -2731,6 +2864,16 @@ let self = _self // overrides; _self = with self; { }; }; + DateExtract = buildPerlPackage { + name = "Date-Extract-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SH/SHARYANTO/Date-Extract-0.05.tar.gz; + sha256 = "ef866b4d596e976a6f4e4b266a6ad7fe4513fad9ae761d7a9ef66f672695fe6d"; + }; + buildInputs = [TestMockTime]; + propagatedBuildInputs = [DateTimeFormatNatural ClassDataInheritable]; + }; + DateManip = buildPerlPackage rec { name = "Date-Manip-6.51"; src = fetchurl { @@ -2874,6 +3017,19 @@ let self = _self // overrides; _self = with self; { }; }; + DateTimeFormatMail = buildPerlPackage { + name = "DateTime-Format-Mail-0.402"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.402.tar.gz; + sha256 = "d788c883969e1647ed0524cc130d897276de23eaa3261f3616458ddd3a4a88fb"; + }; + propagatedBuildInputs = [ DateTime ParamsValidate ]; + meta = { + description = "Convert between DateTime and RFC2822/822 formats"; + license = "perl"; + }; + }; + DateTimeFormatNatural = buildPerlPackage { name = "DateTime-Format-Natural-1.03"; src = fetchurl { @@ -2940,6 +3096,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; }; + DateTimeFormatW3CDTF = buildPerlPackage { + name = "DateTime-Format-W3CDTF-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.06.tar.gz; + sha256 = "b9a542bed9c52b0a89dd590a5184e38ee334c824bbe6bac842dd7dd1f88fbd7a"; + }; + propagatedBuildInputs = [ DateTime ]; + meta = { + homepage = http://search.cpan.org/dist/DateTime-Format-W3CDTF/; + description = "Parse and format W3CDTF datetime strings"; + license = "perl"; + }; + }; + DateTimeLocale = buildPerlPackage rec { name = "DateTime-Locale-0.92"; src = fetchurl { @@ -3268,6 +3438,19 @@ let self = _self // overrides; _self = with self; { }; }; + DBIxDBSchema = buildPerlPackage { + name = "DBIx-DBSchema-0.45"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz; + sha256 = "7a2a978fb6d9feaa3e4b109c71c963b26a008a2d130c5876ecf24c5a72338a1d"; + }; + propagatedBuildInputs = [ DBI ]; + meta = { + description = "Unknown"; + license = "unknown"; + }; + }; + DBIxHTMLViewLATEST = buildPerlPackage { name = "DBIx-HTMLView-LATEST"; src = fetchurl { @@ -3277,6 +3460,20 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + DBIxSearchBuilder = buildPerlPackage { + name = "DBIx-SearchBuilder-1.66"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALEXMV/DBIx-SearchBuilder-1.66.tar.gz; + sha256 = "e2703c3f4b38cf232dec48be98aeab6d2dbee077dcf059369b825629c4be702e"; + }; + buildInputs = [ DBDSQLite ]; + propagatedBuildInputs = [ CacheSimpleTimedExpiry ClassAccessor ClassReturnValue Clone DBI DBIxDBSchema Want ]; + meta = { + description = "Encapsulate SQL queries and rows in simple perl objects"; + license = "perl"; + }; + }; + DBIxSimple = buildPerlPackage { name = "DBIx-Simple-1.35"; src = fetchurl { @@ -3876,6 +4073,20 @@ let self = _self // overrides; _self = with self; { }; }; + EmailAddressList = buildPerlPackage { + name = "Email-Address-List-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALEXMV/Email-Address-List-0.05.tar.gz; + sha256 = "705c23fc2163c2347ba0aea998450259f7b10577a368c6d310bd4e98b427a033"; + }; + buildInputs = [ JSON ]; + propagatedBuildInputs = [ EmailAddress ]; + meta = { + description = "RFC close address list parsing"; + license = "perl"; + }; + }; + EmailDateFormat = buildPerlPackage rec { name = "Email-Date-Format-1.005"; src = fetchurl { @@ -4006,10 +4217,14 @@ let self = _self // overrides; _self = with self; { }; Encode = buildPerlPackage { - name = "Encode-2.63"; + name = "Encode-2.78"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.63.tar.gz; - sha256 = "1wrqm6c194l5yjaifc6nxx2b768sph2pv4n86fgh4blls0pvs6z4"; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.78.tar.gz; + sha256 = "1fc8d5c0e75ef85beeac71d1fe4a3bfcb8207755a46b32f783a3a6682672762a"; + }; + meta = { + description = "Unknown"; + license = "perl"; }; }; @@ -4775,6 +4990,18 @@ let self = _self // overrides; _self = with self; { }; }; + FileSlurper = buildPerlPackage { + name = "File-Slurper-0.008"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.008.tar.gz; + sha256 = "10f685140e2cebdd0381f24b010b028f9ca2574361a78f99f4dfe87af5d5d233"; + }; + meta = { + description = "A simple, sane and efficient module to slurp a file"; + license = "perl"; + }; + }; + FileSlurpTiny = buildPerlPackage rec { name = "File-Slurp-Tiny-0.004"; src = fetchurl { @@ -5232,6 +5459,47 @@ let self = _self // overrides; _self = with self; { }; }; + HTMLFormatter = buildPerlModule { + name = "HTML-Formatter-2.14"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.14.tar.gz; + sha256 = "d28eeeab48ab5f7bfcc73cc106b0f756073d98d48dfdb91ca2951f832f8e035e"; + }; + buildInputs = [ FileSlurper TestCPANMeta TestEOL TestNoTabs perl ]; + propagatedBuildInputs = [ FontAFM HTMLTree ]; + meta = { + homepage = https://metacpan.org/release/HTML-Formatter; + description = "Base class for HTML formatters"; + license = "perl"; + }; + }; + + HTMLFormatTextWithLinks = buildPerlPackage { + name = "HTML-FormatText-WithLinks-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz; + sha256 = "7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1"; + }; + propagatedBuildInputs = [ HTMLFormatter HTMLTree URI ]; + meta = { + description = "HTML to text conversion with links as footnotes"; + license = "perl"; + }; + }; + + HTMLFormatTextWithLinksAndTables = buildPerlPackage { + name = "HTML-FormatText-WithLinks-AndTables-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.06.tar.gz; + sha256 = "e5b23f0475fb81fd6fed688bb914295a39542b3e5b43c8517494226a52d868fa"; + }; + propagatedBuildInputs = [ HTMLFormatTextWithLinks HTMLFormatter HTMLTree ]; + meta = { + description = "Converts HTML to Text with tables intact"; + license = "perl"; + }; + }; + HTMLFormFu = buildPerlPackage rec { name = "HTML-FormFu-2.01"; src = fetchurl { @@ -5283,6 +5551,21 @@ let self = _self // overrides; _self = with self; { }; }; + HTMLMasonPSGIHandler = buildPerlPackage { + name = "HTML-Mason-PSGIHandler-0.53"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz; + sha256 = "eafd7c7655dfa8261df3446b931a283d30306877b83ac4671c49cff74ea7f00b"; + }; + buildInputs = [ Plack ]; + propagatedBuildInputs = [ CGIPSGI HTMLMason ]; + meta = { + homepage = http://search.cpan.org/dist/HTML-Mason-PSGIHandler/; + description = "PSGI handler for HTML::Mason"; + license = "perl"; + }; + }; + HTMLParser = buildPerlPackage { name = "HTML-Parser-3.71"; src = fetchurl { @@ -5296,6 +5579,32 @@ let self = _self // overrides; _self = with self; { }; }; + HTMLQuoted = buildPerlPackage { + name = "HTML-Quoted-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-Quoted-0.04.tar.gz; + sha256 = "8b41f313fdc1812f02f6f6c37d58f212c84fdcf7827f7fd4b030907f39dc650c"; + }; + propagatedBuildInputs = [ HTMLParser ]; + meta = { + description = "Extract structure of quoted HTML mail message"; + license = "perl"; + }; + }; + + HTMLRewriteAttributes = buildPerlPackage { + name = "HTML-RewriteAttributes-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz; + sha256 = "1808ec7cdf40d2708575fe6155a88f103b17fec77973a5831c2f24c250e7a58c"; + }; + propagatedBuildInputs = [ HTMLParser HTMLTagset URI ]; + meta = { + description = "Concise attribute rewriting"; + license = "perl"; + }; + }; + HTMLSelectorXPath = buildPerlPackage { name = "HTML-Selector-XPath-0.16"; src = fetchurl { @@ -6369,13 +6678,29 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [I18NLangTags]; }; - LocaleMaketextLexicon = buildPerlPackage { - name = "Locale-Maketext-Lexicon-0.66"; + LocaleMaketextFuzzy = buildPerlPackage { + name = "Locale-Maketext-Fuzzy-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Lexicon-0.66.tar.gz; - sha256 = "1cd2kbcrlyjcmlr7m8kf94mm1hlr7hpv1r80a596f4ljk81f2nvd"; + url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-0.11.tar.gz; + sha256 = "3785171ceb78cc7671319a3a6d8ced9b190e097dfcd9b2a9ebc804cd1a282f96"; + }; + meta = { + description = "Maketext from already interpolated strings"; + license = "unrestricted"; + }; + }; + + LocaleMaketextLexicon = buildPerlPackage { + name = "Locale-Maketext-Lexicon-1.00"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz; + sha256 = "b73f6b04a58d3f0e38ebf2115a4c1532f1a4eef6fac5c6a2a449e4e14c1ddc7c"; + }; + meta = { + homepage = http://search.cpan.org/dist/Locale-Maketext-Lexicon; + description = "Use other catalog formats in Maketext"; + license = "mit"; }; - propagatedBuildInputs = [LocaleMaketext]; }; LocaleMaketextSimple = buildPerlPackage { @@ -6937,6 +7262,20 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ProcWaitStat ]; }; + MIMEtools = buildPerlPackage { + name = "MIME-tools-5.507"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.507.tar.gz; + sha256 = "2f43683e1d5bed21179207d81c0caf1d5b5d480d018ac812f4ab950879fe7793"; + }; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ MailTools ]; + meta = { + description = "Tools to manipulate MIME messages"; + license = "perl"; + }; + }; + MIMETypes = buildPerlPackage { name = "MIME-Types-2.04"; src = fetchurl { @@ -7199,6 +7538,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [UNIVERSALrequire]; }; + ModuleRefresh = buildPerlPackage { + name = "Module-Refresh-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz; + sha256 = "6b30a6ceddc6512ab4490c16372ecf309a259f2ca147d622e478ac54e08511c3"; + }; + buildInputs = [ PathClass ]; + meta = { + description = "Refresh %INC files when updated on disk"; + license = "perl"; + }; + }; + ModuleRuntime = buildPerlPackage { name = "Module-Runtime-0.014"; src = fetchurl { @@ -7280,6 +7632,18 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleVersionsReport = buildPerlPackage { + name = "Module-Versions-Report-1.06"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JE/JESSE/Module-Versions-Report-1.06.tar.gz; + sha256 = "a3261d0d84b17678d8c4fd55eb0f892f5144d81ca53ea9a38d75d1a00ad9796a"; + }; + meta = { + description = "Report versions of all modules in memory"; + license = "perl"; + }; + }; + mod_perl2 = buildPerlPackage { name = "mod_perl-2.0.9"; src = fetchurl { @@ -8676,6 +9040,20 @@ let self = _self // overrides; _self = with self; { }; }; + ParallelPrefork = buildPerlPackage { + name = "Parallel-Prefork-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.17.tar.gz; + sha256 = "0d81de2632281091bd31297de1906e14cae4e845cf32200953b50406859e763b"; + }; + buildInputs = [ TestRequires TestSharedFork ]; + propagatedBuildInputs = [ ClassAccessorLite ListMoreUtils ProcWait3 ScopeGuard SignalMask ]; + meta = { + description = "A simple prefork server framework"; + license = "perl"; + }; + }; + ParamsClassify = buildPerlPackage rec { name = "Params-Classify-0.013"; src = fetchurl { @@ -9139,6 +9517,18 @@ let self = _self // overrides; _self = with self; { }; }; + ProcWait3 = buildPerlPackage { + name = "Proc-Wait3-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CT/CTILMES/Proc-Wait3-0.05.tar.gz; + sha256 = "1a907f5db6933dc2939bbfeffe19eeae7ed39ef1b97a2bc9b723f2f25f81caf3"; + }; + meta = { + description = "Perl extension for wait3 system call"; + license = "perl"; + }; + }; + ProcWaitStat = buildPerlPackage rec { name = "Proc-WaitStat-1.00"; src = fetchurl { @@ -9502,6 +9892,18 @@ let self = _self // overrides; _self = with self; { }; }; + RegexpCommonnetCIDR = buildPerlPackage { + name = "Regexp-Common-net-CIDR-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BP/BPS/Regexp-Common-net-CIDR-0.03.tar.gz; + sha256 = "39606a57aab20d4f4468300f2ec3fa2ab557fcc9cb7880ec7c6e07d80162da33"; + }; + propagatedBuildInputs = [ RegexpCommon ]; + meta = { + license = "perl"; + }; + }; + RegexpCopy = buildPerlPackage rec { name = "Regexp-Copy-0.06"; src = fetchurl { @@ -9510,6 +9912,17 @@ let self = _self // overrides; _self = with self; { }; }; + RegexpIPv6 = buildPerlPackage { + name = "Regexp-IPv6-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz; + sha256 = "d542d17d75ce93631de8ba2156da0e0b58a755c409cd4a0d27a3873a26712ce2"; + }; + meta = { + license = "unknown"; + }; + }; + RegexpParser = buildPerlPackage { name = "Regexp-Parser-0.21"; src = fetchurl { @@ -9557,6 +9970,18 @@ let self = _self // overrides; _self = with self; { }; }; + RoleBasic = buildPerlPackage { + name = "Role-Basic-0.13"; + src = fetchurl { + url = mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz; + sha256 = "38a0959ef9f193ff76e72c325a9e9211bc4868689bd0e2b005778f53f8b6f36a"; + }; + meta = { + description = "Just roles. Nothing else"; + license = "perl"; + }; + }; + RoleHasMessage = buildPerlPackage { name = "Role-HasMessage-0.006"; src = fetchurl { @@ -9716,6 +10141,20 @@ let self = _self // overrides; _self = with self; { }; }; + ServerStarter = buildPerlModule { + name = "Server-Starter-0.32"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.32.tar.gz; + sha256 = "a8ecc19f05f3c3b079e1c7f2c007a6df2b9a2912b9848a8fb51bd78c7b13ac1a"; + }; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; + meta = { + homepage = https://github.com/kazuho/p5-Server-Starter; + description = "A superdaemon for hot-deploying server programs"; + license = "perl"; + }; + }; + SetInfinite = buildPerlPackage { name = "Set-Infinite-0.65"; src = fetchurl { @@ -9756,6 +10195,19 @@ let self = _self // overrides; _self = with self; { }; }; + SignalMask = buildPerlPackage { + name = "Signal-Mask-0.008"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/Signal-Mask-0.008.tar.gz; + sha256 = "043d995b6b249d9ebc04c467db31bb7ddc2e55faa08e885bdb050b1f2336b73f"; + }; + propagatedBuildInputs = [ IPCSignal ]; + meta = { + description = "Signal masks made easy"; + license = "perl"; + }; + }; + SOAPLite = buildPerlPackage { name = "SOAP-Lite-1.11"; src = fetchurl { @@ -9920,6 +10372,20 @@ let self = _self // overrides; _self = with self; { }; }; + Starlet = buildPerlPackage { + name = "Starlet-0.28"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.28.tar.gz; + sha256 = "245f606cdc8acadbe12e7e56dfa0752a8e8daa9a094373394fc17a45f5dde850"; + }; + buildInputs = [ LWP TestTCP ]; + propagatedBuildInputs = [ ParallelPrefork Plack ServerStarter ]; + meta = { + description = "A simple, high-performance PSGI/Plack HTTP server"; + license = "perl"; + }; + }; + Starman = let version = "0.4014"; in buildPerlModule { name = "Starman-${version}"; src = fetchurl { @@ -10358,6 +10824,18 @@ let self = _self // overrides; _self = with self; { doCheck = false; # FIXME: 2/293 test failures }; + SymbolGlobalName = buildPerlPackage { + name = "Symbol-Global-Name-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALEXMV/Symbol-Global-Name-0.05.tar.gz; + sha256 = "0f7623e9d724760aa64040222da1d82f1188586791329261cc60dad1d60d6a92"; + }; + meta = { + description = "Finds name and type of a global variable"; + license = "perl"; + }; + }; + SymbolUtil = buildPerlPackage { name = "Symbol-Util-0.0203"; src = fetchurl { @@ -11752,6 +12230,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestManifest = buildPerlPackage { + name = "Test-Manifest-2.02"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.02.tar.gz; + sha256 = "064783ceaf7dd569a5724d40900a3f9d92168ee4c613f7a3cb99a99aa8283396"; + }; + meta = { + description = "Interact with a t/test_manifest file"; + license = "perl"; + }; + }; + TextMarkdown = buildPerlPackage rec { name = "Text-Markdown-1.000031"; src = fetchurl { @@ -11805,6 +12295,30 @@ let self = _self // overrides; _self = with self; { }; }; + TestNumberDelta = buildPerlPackage { + name = "Test-Number-Delta-1.06"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.06.tar.gz; + sha256 = "535430919e6fdf6ce55ff76e9892afccba3b7d4160db45f3ac43b0f92ffcd049"; + }; + meta = { + homepage = https://github.com/dagolden/Test-Number-Delta; + description = "Compare the difference between numbers against a given tolerance"; + license = "apache"; + }; + }; + + TextPasswordPronounceable = buildPerlPackage { + name = "Text-Password-Pronounceable-0.30"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz; + sha256 = "c186a50256e0bedfafb17e7ce157e7c52f19503bb79e18ebf06255911f6ead1a"; + }; + meta = { + license = "perl"; + }; + }; + TextPDF = buildPerlPackage rec { name = "Text-PDF-0.29a"; src = fetchurl { @@ -11814,6 +12328,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CompressZlib ]; }; + TextQuoted = buildPerlPackage { + name = "Text-Quoted-2.09"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALEXMV/Text-Quoted-2.09.tar.gz; + sha256 = "446c3e8da7e65f7988cd36e9da1159614eb0b337d6c4c0dec8f6df7673b96c5f"; + }; + propagatedBuildInputs = [ TextAutoformat ]; + meta = { + description = "Extract the structure of a quoted mail message"; + license = "perl"; + }; + }; + TextRecordParser = buildPerlPackage rec { name = "Text-RecordParser-1.6.5"; src = fetchurl { @@ -12003,6 +12530,19 @@ let self = _self // overrides; _self = with self; { }; }; + TextvFileasData = buildPerlPackage { + name = "Text-vFile-asData-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz; + sha256 = "b291ab5e0f987c5172560a692234711a75e4596d83475f72d01278369532f82a"; + }; + propagatedBuildInputs = [ ClassAccessorChained ]; + meta = { + description = "Parse vFile formatted files into data structures"; + license = "perl"; + }; + }; + TextWikiFormat = buildPerlPackage { name = "Text-WikiFormat-0.81"; src = fetchurl { @@ -12016,6 +12556,18 @@ let self = _self // overrides; _self = with self; { }; }; + TextWrapper = buildPerlPackage { + name = "Text-Wrapper-1.05"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CJ/CJM/Text-Wrapper-1.05.tar.gz; + sha256 = "64268e15983a9df47e1d9199a491f394e89f542e54afb33f4b78f3f318e09ab9"; + }; + meta = { + description = "Word wrap text by breaking long lines"; + license = "perl"; + }; + }; + threads = buildPerlPackage rec { name = "threads-2.02"; src = fetchurl { @@ -12199,6 +12751,19 @@ let self = _self // overrides; _self = with self; { }; }; + TimeParseDate = buildPerlPackage { + name = "Time-ParseDate-2015.103"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz; + sha256 = "2c1a06235bf811813caac9eaa9daa71af758667cdf7b082cb59863220fcaeed1"; + }; + doCheck = false; + meta = { + description = "Parse and format time values"; + license = "unknown"; + }; + }; + Tk = buildPerlPackage rec { name = "Tk-804.032_501"; src = fetchurl { @@ -12821,6 +13386,21 @@ let self = _self // overrides; _self = with self; { }; }; + XMLRSS = buildPerlPackage { + name = "XML-RSS-1.57"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.57.tar.gz; + sha256 = "c540a1aa7445bf611635537015590575c90c2b07c19529537677a4bcf3a4e6ae"; + }; + buildInputs = [ TestManifest ]; + propagatedBuildInputs = [ DateTime DateTimeFormatMail DateTimeFormatW3CDTF HTMLParser XMLParser ]; + meta = { + homepage = http://perl-rss.sourceforge.net/; + description = "Creates and updates RSS files"; + license = "perl"; + }; + }; + XMLSAX = buildPerlPackage { name = "XML-SAX-0.96"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec17d9434a0..88b0eda1a07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1923,6 +1923,27 @@ in modules // { }; + binaryornot = buildPythonPackage rec { + name = "binaryornot-${version}"; + version = "0.4.0"; + + src = pkgs.fetchurl { + url ="https://pypi.python.org/packages/source/b/binaryornot/${name}.tar.gz"; + sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb"; + }; + + buildInputs = with self; [ hypothesis sqlite3 ]; + + propagatedBuildInputs = with self; [ chardet ]; + + meta = { + homepage = https://github.com/audreyr/binaryornot; + description = "Ultra-lightweight pure Python package to check if a file is binary or text"; + license = licenses.bsd3; + }; + }; + + bitbucket_api = buildPythonPackage rec { name = "bitbucket-api-0.4.4"; @@ -3130,6 +3151,30 @@ in modules // { }; }; + cookiecutter = buildPythonPackage rec { + version = "1.3.0"; + name = "cookiecutter-${version}"; + + # dependency problems, next release of cookiecutter should unblock these + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "https://github.com/audreyr/cookiecutter/archive/${version}.tar.gz"; + sha256 = "1vchjvh7591nczz2zz55aghk9mhpm6kqgm62d05d4mjrx9xjkdcg"; + }; + + buildInputs = with self; [ itsdangerous ]; + propagatedBuildInputs = with self; [ + jinja2 future binaryornot click whichcraft ruamel_yaml ]; + + meta = { + homepage = https://github.com/audreyr/cookiecutter; + description = "A command-line utility that creates projects from project templates"; + license = licenses.bsd3; + maintainers = with maintainers; [ kragniz ]; + }; + }; + cookies = buildPythonPackage rec { name = "cookies-2.2.1"; @@ -3497,6 +3542,22 @@ in modules // { }; }; + minidb = buildPythonPackage rec { + name = "minidb-2.0.1"; + + src = pkgs.fetchurl { + url = "https://thp.io/2010/minidb/${name}.tar.gz"; + sha256 = "1x958zr9jc26vaqij451qb9m2l7apcpz34ir9fwfjg4fwv24z2dy"; + }; + + meta = { + description = "A simple SQLite3-based store for Python objects"; + homepage = https://thp.io/2010/minidb/; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.tv ]; + }; + }; + mixpanel = buildPythonPackage rec { version = "4.0.2"; name = "mixpanel-${version}"; @@ -5791,6 +5852,28 @@ in modules // { propagatedBuildInputs = with self; [ logilab_common ]; }; + lpod = buildPythonPackage rec { + version = "1.1.5"; + name = "python-lpod-${version}"; + # lpod library currently does not support Python 3.x + disabled = isPy3k; + + propagatedBuildInputs = with self; [ ]; + + src = pkgs.fetchFromGitHub { + owner = "lpod"; + repo = "lpod-python"; + rev = "v${version}"; + sha256 = "1g909li511jkpcl26j1dzg8gn1ipkc374sh8vv54dx30sl0xfqxf"; + }; + + meta = { + homepage = https://github.com/lpod/lpod-python/; + description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) "; + license = licenses.gpl3; + }; + }; + mailchimp = buildPythonPackage rec { version = "2.0.9"; name = "mailchimp-${version}"; @@ -6280,6 +6363,44 @@ in modules // { }; }; + python-axolotl = buildPythonPackage rec { + name = "python-axolotl-${version}"; + version = "0.1.7"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-axolotl/${name}.tar.gz"; + sha256 = "1i3id1mjl67n4sca31s5zwq96kswgsi6lga6np83ayb45rxggvhx"; + }; + + propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf pycrypto ]; + + meta = { + homepage = https://github.com/tgalal/python-axolotl; + description = "Python port of libaxolotl-android"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl3; + platform = platforms.all; + }; + }; + + python-axolotl-curve25519 = buildPythonPackage rec { + name = "python-axolotl-curve25519-${version}"; + version = "0.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-axolotl-curve25519/${name}.tar.gz"; + sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5"; + }; + + meta = { + homepage = https://github.com/tgalal/python-axolotl; + description = "Curve25519 with ed25519 signatures"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl3; + platform = platforms.all; + }; + }; + pypolicyd-spf = buildPythonPackage rec { name = "pypolicyd-spf-${version}"; majorVersion = "1.3"; @@ -6515,11 +6636,11 @@ in modules // { radicale = buildPythonPackage rec { name = "radicale-${version}"; namePrefix = ""; - version = "1.0.1"; + version = "1.1.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz"; - sha256 = "0q0vxqg32lp9bzbqn06x7igwq3a9hcmpspvj3icyf0rlg786i2p1"; + sha256 = "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2"; }; propagatedBuildInputs = with self; [ @@ -6528,7 +6649,7 @@ in modules // { sqlalchemy ]; - doCheck = false; + doCheck = true; meta = { homepage = http://www.radicale.org/; @@ -7201,15 +7322,15 @@ in modules // { }; chardet = buildPythonPackage rec { - name = "chardet-2.1.1"; + name = "chardet-2.3.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz"; - md5 = "295367fd210d20f3febda615a88e1ef0"; + md5 = "25274d664ccb5130adae08047416e1a8"; }; meta = { - homepage = https://github.com/erikrose/chardet; + homepage = https://github.com/chardet/chardet; description = "Universal encoding detector"; license = licenses.lgpl2; maintainers = with maintainers; [ iElectric ]; @@ -8437,8 +8558,6 @@ in modules // { }; }); - foursuite = callPackage ../development/python-modules/4suite {}; - fs = buildPythonPackage rec { name = "fs-0.5.0"; @@ -8506,12 +8625,12 @@ in modules // { }; future = buildPythonPackage rec { - version = "0.14.3"; + version = "0.15.2"; name = "future-${version}"; src = pkgs.fetchurl { url = "http://github.com/PythonCharmers/python-future/archive/v${version}.tar.gz"; - sha256 = "0hgp9kq7h4ipw8ax5xvvkyh3bkqw361d3rndvb9xix01h9j9mi3p"; + sha256 = "0vm61j5br6jiry6pgcxnwvxhki8ksnirp7k9mcbmxmgib3r60xd3"; }; propagatedBuildInputs = with self; optionals isPy26 [ importlib argparse ]; @@ -10553,6 +10672,8 @@ in modules // { sha256 = "1cd7d3dji8q4mvcnf9asxn8j109pd5g5d5shr6xvn0iwr35qprgi"; }; + disabled = isPyPy; + buildInputs = with self; [ pyflakes pep8 ]; propagatedBuildInputs = with self; [ django_1_6 filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 @@ -11159,6 +11280,25 @@ in modules // { }; }; + pygraphviz = buildPythonPackage rec { + version = "1.3"; + name = "pygraphviz-${version}"; + + src = pkgs.fetchurl { + url = "https://github.com/pygraphviz/pygraphviz/archive/${name}.tar.gz"; + sha256 = "1fhn123hy4qj0zmmmbx0q0r4hwikay13yirsp74niiw5d52y7ib8"; + }; + + propagatedBuildInputs = [ pkgs.graphviz pkgs.pkgconfig ]; + + meta = { + description = "Python interface to Graphviz graph drawing package"; + homepage = https://github.com/pygraphviz/pygraphviz; + license = licenses.bsd3; + maintainers = with maintainers; [ matthiasbeyer ]; + }; + }; + pymysql = buildPythonPackage rec { name = "pymysql-${version}"; version = "0.6.6"; @@ -11881,11 +12021,11 @@ in modules // { }; in buildPythonPackage ( rec { name = "numpy-${version}"; - version = "1.10.2"; + version = "1.10.4"; src = pkgs.fetchurl { - url = "mirror://sourceforge/numpy/${name}.tar.gz"; - sha256 = "23a3befdf955db4d616f8bb77b324680a80a323e0c42a7e8d7388ef578d8ffa9"; + url = "https://pypi.python.org/packages/source/n/numpy/${name}.tar.gz"; + sha256 = "7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b"; }; disabled = isPyPy; # WIP @@ -11899,10 +12039,15 @@ in modules // { buildInputs = [ pkgs.gfortran self.nose ]; propagatedBuildInputs = [ support.openblas ]; - # This patch removes the test of large file support, which takes forever + # Disable failing test_f2py test. + # f2py couldn't be found by test, + # even though it was used successfully to build numpy + + # The large file support test is disabled because it takes forever # and can cause the machine to run out of disk space when run. - patchPhase = '' - patch -p0 < ${../development/python-modules/numpy-no-large-files.patch} + prePatch = '' + sed -i 's/test_f2py/donttest/' numpy/tests/test_scripts.py + sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py ''; meta = { @@ -14696,24 +14841,18 @@ in modules // { }; }; - pyaudio = pkgs.stdenv.mkDerivation rec { + pyaudio = buildPythonPackage rec { name = "python-pyaudio-${version}"; - version = "0.2.4"; + version = "0.2.9"; src = pkgs.fetchurl { - url = "http://people.csail.mit.edu/hubert/pyaudio/packages/pyaudio-${version}.tar.gz"; - md5 = "623809778f3d70254a25492bae63b575"; + url = "https://pypi.python.org/packages/source/P/PyAudio/PyAudio-${version}.tar.gz"; + sha256 = "bfd694272b3d1efc51726d0c27650b3c3ba1345f7f8fdada7e86c9751ce0f2a1"; }; - buildInputs = with self; [ python pkgs.portaudio ]; + disabled = isPyPy; - buildPhase = if stdenv.isDarwin then '' - PORTAUDIO_PATH="${pkgs.portaudio}" ${python}/bin/${python.executable} setup.py build --static-link - '' else '' - ${python}/bin/${python.executable} setup.py build - ''; - - installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out"; + buildInputs = with self; [ pkgs.portaudio ]; meta = { description = "Python bindings for PortAudio"; @@ -15443,6 +15582,24 @@ in modules // { }; }; + pyshp = buildPythonPackage rec { + name = "pyshp-${version}"; + version = "1.2.3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyshp/pyshp-${version}.tar.gz"; + sha256 = "e18cc19659dadc5ddaa891eb780a6958094da0cf105a1efe0f67e75b4fa1cdf9"; + }; + + buildInputs = with self; [ setuptools ]; + + meta = { + description = "Pure Python read/write support for ESRI Shapefile format"; + homepage = https://github.com/GeospatialPython/pyshp; + license = licenses.mit; + }; + }; + pyx = buildPythonPackage rec { name = "pyx-${version}"; version = "0.14.1"; @@ -17482,6 +17639,57 @@ in modules // { }; }; + ruamel_base = buildPythonPackage rec { + name = "ruamel.base-${version}"; + version = "1.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/ruamel.base/${name}.tar.gz"; + sha256 = "1wswxrn4givsm917mfl39rafgadimf1sldpbjdjws00g1wx36hf0"; + }; + + meta = { + description = "common routines for ruamel packages"; + homepage = https://bitbucket.org/ruamel/base; + license = licenses.mit; + }; + }; + + ruamel_ordereddict = buildPythonPackage rec { + name = "ruamel.ordereddict-${version}"; + version = "0.4.9"; + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/ruamel.ordereddict/${name}.tar.gz"; + sha256 = "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h"; + }; + + meta = { + description = "a version of dict that keeps keys in insertion resp. sorted order"; + homepage = https://bitbucket.org/ruamel/ordereddict; + license = licenses.mit; + }; + }; + + ruamel_yaml = buildPythonPackage rec { + name = "ruamel.yaml-${version}"; + version = "0.10.13"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/ruamel.yaml/${name}.tar.gz"; + sha256 = "0r9mn5lm9dcxpy0wpn18cp7i5hkvjvknv3dxg8d9ca6km39m4asn"; + }; + + propagatedBuildInputs = with self; [ ruamel_base ruamel_ordereddict ]; + + meta = { + description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; + homepage = https://bitbucket.org/ruamel/yaml; + license = licenses.mit; + }; + }; + runsnakerun = buildPythonPackage rec { name = "runsnakerun-2.0.4"; @@ -17823,7 +18031,7 @@ in modules // { md5 = "f16f4237c9ee483a0cd13208849d96ad"; }; - propagatedBuildInputs = with self; [ twisted ]; + propagatedBuildInputs = with self; [ twisted15 ]; meta = { description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; @@ -17851,12 +18059,34 @@ in modules // { }; + shortuuid = buildPythonPackage rec { + name = "shortuuid-${version}"; + version = "0.4.2"; + + disabled = isPy26; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/shortuuid/${name}.tar.gz"; + md5 = "142e3ae4e7cd32d41a71deb359db4cfe"; + }; + + buildInputs = with self; [pep8]; + + meta = { + description = "A generator library for concise, unambiguous and URL-safe UUIDs."; + homepage = https://github.com/stochastic-technologies/shortuuid/; + license = licenses.bsd3; + maintainers = with maintainers; [ zagy ]; + }; + }; + + simplejson = buildPythonPackage (rec { - name = "simplejson-3.3.0"; + name = "simplejson-3.8.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz"; - md5 = "0e29b393bceac8081fa4e93ff9f6a001"; + sha256 = "14r4l4rcsyf87p2j4ycsbb017n4vzxfmv285rq2gny4w47rwi2j2"; }; meta = { @@ -18050,6 +18280,26 @@ in modules // { }; }; + sopel = buildPythonPackage rec { + name = "sopel-6.1.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/sopel/${name}.tar.gz"; + sha256 = "0nr2a88bkxg2593dd947qkh96g8j32q7pl7x9zvx4158h4bgx99y"; + }; + + propagatedBuildInputs = with self; [ praw xmltodict pytz pyenchant pygeoip ]; + + disabled = isPyPy || isPy26 || isPy27; + + meta = { + description = "Simple and extensible IRC bot"; + homepage = "http://sopel.chat"; + license = licenses.efl20; + maintainers = with maintainers; [ mog ]; + }; + }; + stevedore = buildPythonPackage rec { name = "stevedore-1.7.0"; @@ -19758,6 +20008,35 @@ in modules // { }; }; + twisted15 = buildPythonPackage rec { + disabled = isPy3k; + + name = "Twisted-15.5.0"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2"; + sha256 = "0zy18lcrris4aaslil5k12i13k56c32hzfdv6h10kbnzl026h158"; + }; + + propagatedBuildInputs = with self; [ zope_interface ]; + + # Generate Twisted's plug-in cache. Twited users must do it as well. See + # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 + # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for + # details. + postInstall = "$out/bin/twistd --help > /dev/null"; + + meta = { + homepage = http://twistedmatrix.com/; + description = "Twisted, an event-driven networking engine written in Python"; + longDescription = '' + Twisted is an event-driven networking engine written in Python + and licensed under the MIT license. + ''; + license = licenses.mit; + maintainers = [ ]; + }; + }; + tzlocal = buildPythonPackage rec { name = "tzlocal-1.1.1"; @@ -21625,6 +21904,24 @@ in modules // { }; }; + + whichcraft = buildPythonPackage rec { + name = "whichcraft-${version}"; + version = "0.1.1"; + + src = pkgs.fetchurl { + url = "https://github.com/pydanny/whichcraft/archive/${version}.tar.gz"; + sha256 = "1xqp66knzlb01k30qic40vzwl51jmlsb8r96iv60m2ca6623abbv"; + }; + + meta = { + homepage = https://github.com/pydanny/whichcraft; + description = "Cross-platform cross-python shutil.which functionality"; + license = licenses.bsd3; + }; + }; + + whisper = buildPythonPackage rec { name = "whisper-${version}"; version = "0.9.12"; @@ -22583,6 +22880,133 @@ in modules // { }; }; + blist = buildPythonPackage rec { + name = "blist-${version}"; + version = "1.3.6"; + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/blist/blist-${version}.tar.gz"; + sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is"; + }; + }; + + canonicaljson = buildPythonPackage rec { + name = "canonicaljson-${version}"; + version = "1.0.0"; + + src = pkgs.fetchgit { + url = "https://github.com/matrix-org/python-canonicaljson.git"; + rev = "refs/tags/v${version}"; + sha256 = "29802d0effacd26ca1d6eccc8d4c7e4f543a194754ba89263861e87f44a83f0c"; + }; + + propagatedBuildInputs = with self; [ + frozendict simplejson + ]; + }; + + daemonize = buildPythonPackage rec { + name = "daemonize-${version}"; + version = "2.4.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/daemonize/daemonize-${version}.tar.gz"; + sha256 = "0y139sq657bpzfv6k0aqm4071z4s40i6ybpni9qvngvdcz6r86n2"; + }; + }; + + frozendict = buildPythonPackage rec { + name = "frozendict-${version}"; + version = "0.5"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/frozendict/frozendict-0.5.tar.gz"; + sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n"; + }; + }; + + pydenticon = buildPythonPackage rec { + name = "pydenticon-${version}"; + version = "0.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pydenticon/pydenticon-0.2.tar.gz"; + sha256 = "035dawcspgjw2rksbnn863s7b0i9ac8cc1nshshvd1l837ir1czp"; + }; + propagatedBuildInputs = with self; [ + pillow mock + ]; + }; + + pymacaroons-pynacl = buildPythonPackage rec { + name = "pymacaroons-pynacl-${version}"; + version = "0.9.3"; + + src = pkgs.fetchgit { + url = "https://github.com/matrix-org/pymacaroons.git"; + rev = "refs/tags/v${version}"; + sha256 = "481a486520f5a3ad2761c3cd3954d2b08f456a94fb080aaa4ad1e68ddc705b52"; + }; + + propagatedBuildInputs = with self; [ pynacl six ]; + }; + + pynacl = buildPythonPackage rec { + name = "pynacl-${version}"; + version = "0.3.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyNaCl/PyNaCl-0.3.0.tar.gz"; + sha256 = "1hknxlp3a3f8njn19w92p8nhzl9jkfwzhv5fmxhmyq2m8hqrfj8j"; + }; + + propagatedBuildInputs = with self; [pkgs.libsodium six cffi pycparser pytest]; + }; + + service-identity = buildPythonPackage rec { + name = "service-identity-${version}"; + version = "14.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/service_identity/service_identity-${version}.tar.gz"; + sha256 = "0njg9bklkkp4rl2b9vsfh9aasxy3w2dmjkv9cq34jn65lwcs619i"; + }; + + propagatedBuildInputs = with self; [ + characteristic pyasn1 pyasn1-modules pyopenssl idna + ]; + + buildInputs = with self; [ + pytest + ]; + }; + + signedjson = buildPythonPackage rec { + name = "signedjson-${version}"; + version = "1.0.0"; + + src = pkgs.fetchgit { + url = "https://github.com/matrix-org/python-signedjson.git"; + rev = "refs/tags/v${version}"; + sha256 = "4ef1c89ea85846632d711a37a2e6aae1348c62b9d62ed0e80428b4a00642e9df"; + }; + + propagatedBuildInputs = with self; [ + canonicaljson unpaddedbase64 pynacl + ]; + }; + + unpaddedbase64 = buildPythonPackage rec { + name = "unpaddedbase64-${version}"; + version = "1.0.1"; + + src = pkgs.fetchgit { + url = "https://github.com/matrix-org/python-unpaddedbase64.git"; + rev = "refs/tags/v${version}"; + sha256 = "f221240a6d414c4244ab906b1dc8983c4d1114acb778cb857f6fc50d710be502"; + }; + }; thumbor = buildPythonPackage rec { diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index d19131dab83..1cc2692b9d5 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-01-10"; - rev = "d4120073882c5520f66ed56729b38af2063c2d28"; + version = "2016-01-17"; + rev = "4d434405cd956c3c5476171bdc7e6dbe5c8ff209"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "1xxsaz3inxpkn25afbi8ncwnhns2vpr2f845wk2vs3vv7qpyr0a4"; + sha256 = "12y6kbgx1kh04lhwxvxqs2jkhnfa9hkgdjxhzlqs3gjcybsdkdhj"; }; in