From af847a68bd49b1ae4a34ee91461eb15265fe819c Mon Sep 17 00:00:00 2001 From: Ben Doyle Date: Thu, 21 Jan 2016 06:57:06 -0500 Subject: [PATCH 001/210] google-cloud-sdk: Add various modules to PYTHONPATH This fixes a sequence of missing-module errors seen when calling `gcloud auth authenticate-service-acount`. --- pkgs/tools/admin/google-cloud-sdk/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 75860bc27d3..fa37681ac71 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, python27, python27Packages, makeWrapper}: +with python27Packages; + stdenv.mkDerivation rec { version = "0.9.82"; name = "google-cloud-sdk-${version}"; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { wrapper="$out/bin/$program" makeWrapper "$programPath" "$wrapper" \ --set CLOUDSDK_PYTHON "${python27}/bin/python" \ - --prefix PYTHONPATH : "$(toPythonPath ${python27Packages.crcmod})" + --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl}):$(toPythonPath ${crcmod})" done # install man pages From aa46904490cadc55817ec32695c484026ddf3e15 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Sat, 30 Jan 2016 23:00:39 +0100 Subject: [PATCH 002/210] containers: Add a hostbridge and ipv6 addresses This allows the containers to have their interface in a bridge on the host. Also this adds IPv6 addresses to the containers both with bridged and unbridged network. --- nixos/modules/virtualisation/containers.nix | 100 ++++++++++++++++---- 1 file changed, 81 insertions(+), 19 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 121ecbc9bf2..4c20ee27de2 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -28,14 +28,23 @@ let # Initialise the container side of the veth pair. if [ "$PRIVATE_NETWORK" = 1 ]; then + ip link set host0 name eth0 ip link set dev eth0 up + + if [ -n "$LOCAL_ADDRESS" ]; then + ip addr add $LOCAL_ADDRESS dev eth0 + fi + if [ -n "$LOCAL_ADDRESS6" ]; then + ip -6 addr add $LOCAL_ADDRESS6 dev eth0 + fi if [ -n "$HOST_ADDRESS" ]; then ip route add $HOST_ADDRESS dev eth0 ip route add default via $HOST_ADDRESS fi - if [ -n "$LOCAL_ADDRESS" ]; then - ip addr add $LOCAL_ADDRESS dev eth0 + if [ -n "$HOST_ADDRESS6" ]; then + ip -6 route add $HOST_ADDRESS6 dev eth0 + ip -6 route add default via $HOST_ADDRESS6 fi fi @@ -48,7 +57,7 @@ let system = config.nixpkgs.system; bindMountOpts = { name, config, ... }: { - + options = { mountPoint = mkOption { example = "/mnt/usb"; @@ -68,13 +77,13 @@ let description = "Determine whether the mounted path will be accessed in read-only mode."; }; }; - + config = { mountPoint = mkDefault name; }; - + }; - + mkBindFlag = d: let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind="; mountstr = if d.hostPath != null then "${d.hostPath}:${d.mountPoint}" else "${d.mountPoint}"; @@ -142,12 +151,33 @@ in ''; }; + hostBridge = mkOption { + type = types.nullOr types.string; + default = null; + example = "br0"; + description = '' + Put the host-side of the veth-pair into the named bridge. + Only one of hostAddress* or hostBridge can be given. + ''; + }; + hostAddress = mkOption { type = types.nullOr types.str; default = null; example = "10.231.136.1"; description = '' The IPv4 address assigned to the host interface. + (Not used when hostBridge is set.) + ''; + }; + + hostAddress6 = mkOption { + type = types.nullOr types.string; + default = null; + example = "fc00::1"; + description = '' + The IPv6 address assigned to the host interface. + (Not used when hostBridge is set.) ''; }; @@ -161,6 +191,16 @@ in ''; }; + localAddress6 = mkOption { + type = types.nullOr types.string; + default = null; + example = "fc00::2"; + description = '' + The IPv6 address assigned to eth0 + in the container. + ''; + }; + interfaces = mkOption { type = types.listOf types.string; default = []; @@ -185,7 +225,7 @@ in example = { "/home" = { hostPath = "/home/alice"; isReadOnly = false; }; }; - + description = '' An extra list of directories that is bound to the container. @@ -257,11 +297,7 @@ in if [ "$PRIVATE_NETWORK" = 1 ]; then ip link del dev "ve-$INSTANCE" 2> /dev/null || true - fi - - - if [ "$PRIVATE_NETWORK" = 1 ]; then - ip link del dev "ve-$INSTANCE" 2> /dev/null || true + ip link del dev "vb-$INSTANCE" 2> /dev/null || true fi ''; @@ -281,6 +317,9 @@ in if [ "$PRIVATE_NETWORK" = 1 ]; then extraFlags+=" --network-veth" + if [ -n "$HOST_BRIDGE" ]; then + extraFlags+=" --network-bridge=$HOST_BRIDGE" + fi fi for iface in $INTERFACES; do @@ -315,8 +354,11 @@ in --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \ --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \ --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \ + --setenv HOST_BRIDGE="$HOST_BRIDGE" \ --setenv HOST_ADDRESS="$HOST_ADDRESS" \ --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \ + --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ + --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ --setenv PATH="$PATH" \ ${containerInit} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" ''; @@ -324,13 +366,21 @@ in postStart = '' if [ "$PRIVATE_NETWORK" = 1 ]; then - ifaceHost=ve-$INSTANCE - ip link set dev $ifaceHost up - if [ -n "$HOST_ADDRESS" ]; then - ip addr add $HOST_ADDRESS dev $ifaceHost - fi - if [ -n "$LOCAL_ADDRESS" ]; then - ip route add $LOCAL_ADDRESS dev $ifaceHost + if [ -z "$HOST_BRIDGE" ]; then + ifaceHost=ve-$INSTANCE + ip link set dev $ifaceHost up + if [ -n "$HOST_ADDRESS" ]; then + ip addr add $HOST_ADDRESS dev $ifaceHost + fi + if [ -n "$HOST_ADDRESS6" ]; then + ip -6 addr add $HOST_ADDRESS6 dev $ifaceHost + fi + if [ -n "$LOCAL_ADDRESS" ]; then + ip route add $LOCAL_ADDRESS dev $ifaceHost + fi + if [ -n "$LOCAL_ADDRESS6" ]; then + ip -6 route add $LOCAL_ADDRESS6 dev $ifaceHost + fi fi fi @@ -353,6 +403,9 @@ in restartIfChanged = false; #reloadIfChanged = true; # FIXME + wants = [ "netwprk.target" ]; + after = [ "network.target" ]; + serviceConfig = { ExecReload = pkgs.writeScript "reload-container" '' @@ -396,12 +449,21 @@ in SYSTEM_PATH=${cfg.path} ${optionalString cfg.privateNetwork '' PRIVATE_NETWORK=1 + ${optionalString (cfg.hostBridge != null) '' + HOST_BRIDGE=${cfg.hostBridge} + ''} ${optionalString (cfg.hostAddress != null) '' HOST_ADDRESS=${cfg.hostAddress} ''} + ${optionalString (cfg.hostAddress6 != null) '' + HOST_ADDRESS6=${cfg.hostAddress6} + ''} ${optionalString (cfg.localAddress != null) '' LOCAL_ADDRESS=${cfg.localAddress} ''} + ${optionalString (cfg.localAddress6 != null) '' + LOCAL_ADDRESS6=${cfg.localAddress6} + ''} ''} INTERFACES="${toString cfg.interfaces}" ${optionalString cfg.autoStart '' From 3b31c52d4b2784de33280feb9949f2ab8241ac50 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Sun, 31 Jan 2016 21:45:05 +0100 Subject: [PATCH 003/210] containers: Add more tests for ipv6 and hostbridge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A testcase each for - declarative ipv6-only container Seems odd to define the container IPs with their prefix length attached. There should be a better way… - declarative bridged container Also fix the ping test by waiting for the container to start When the ping was executed, the container might not have finished starting. Or the host-side of the container wasn't finished with config. Waiting for 2 seconds in between fixes this. --- nixos/release.nix | 2 + nixos/tests/containers-bridge.nix | 81 +++++++++++++++++++++++++++++++ nixos/tests/containers-ipv6.nix | 61 +++++++++++++++++++++++ nixos/tests/containers.nix | 5 +- 4 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/containers-bridge.nix create mode 100644 nixos/tests/containers-ipv6.nix diff --git a/nixos/release.nix b/nixos/release.nix index 8a01b2685a7..2dc1b21daaf 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -200,6 +200,8 @@ in rec { tests.chromium = callSubTests tests/chromium.nix {}; tests.cjdns = callTest tests/cjdns.nix {}; tests.containers = callTest tests/containers.nix {}; + tests.containers-ipv6 = callTest tests/containers-ipv6.nix {}; + tests.containers-bridge = callTest tests/containers-bridge.nix {}; tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; }; diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix new file mode 100644 index 00000000000..8c3340b60a7 --- /dev/null +++ b/nixos/tests/containers-bridge.nix @@ -0,0 +1,81 @@ +# Test for NixOS' container support. + +let + hostIp = "192.168.0.1"; + containerIp = "192.168.0.100/24"; + hostIp6 = "fc00::1"; + containerIp6 = "fc00::2/7"; +in + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-bridge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aristid aszlig eelco chaoflow ]; + }; + + machine = + { config, pkgs, ... }: + { imports = [ ../modules/installer/cd-dvd/channel.nix ]; + virtualisation.writableStore = true; + virtualisation.memorySize = 768; + + networking.bridges = { + br0 = { + interfaces = []; + }; + }; + networking.interfaces = { + br0 = { + ip4 = [{ address = hostIp; prefixLength = 24; }]; + ip6 = [{ address = hostIp6; prefixLength = 7; }]; + }; + }; + + containers.webserver = + { + autoStart = true; + privateNetwork = true; + hostBridge = "br0"; + localAddress = containerIp; + localAddress6 = containerIp6; + config = + { services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.allowPing = true; + }; + }; + + virtualisation.pathsInNixDB = [ pkgs.stdenv ]; + }; + + testScript = + '' + $machine->waitForUnit("default.target"); + $machine->succeed("nixos-container list") =~ /webserver/ or die; + + # Start the webserver container. + $machine->succeed("nixos-container status webserver") =~ /up/ or die; + + "${containerIp}" =~ /([^\/]+)\/([0-9+])/; + my $ip = $1; + chomp $ip; + $machine->succeed("ping -n -c 1 $ip"); + $machine->succeed("curl --fail http://$ip/ > /dev/null"); + + "${containerIp6}" =~ /([^\/]+)\/([0-9+])/; + my $ip6 = $1; + chomp $ip6; + $machine->succeed("ping6 -n -c 1 $ip6"); + $machine->succeed("curl --fail http://[$ip6]/ > /dev/null"); + + # Stop the container. + $machine->succeed("nixos-container stop webserver"); + $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); + $machine->fail("curl --fail --connect-timeout 2 http://[$ip6]/ > /dev/null"); + + # Destroying a declarative container should fail. + $machine->fail("nixos-container destroy webserver"); + ''; + +}) diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix new file mode 100644 index 00000000000..0c1b8e88564 --- /dev/null +++ b/nixos/tests/containers-ipv6.nix @@ -0,0 +1,61 @@ +# Test for NixOS' container support. + +let + hostIp = "fc00::2"; + localIp = "fc00::1"; +in + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-ipv6"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aristid aszlig eelco chaoflow ]; + }; + + machine = + { config, pkgs, ... }: + { imports = [ ../modules/installer/cd-dvd/channel.nix ]; + virtualisation.writableStore = true; + virtualisation.memorySize = 768; + + containers.webserver = + { privateNetwork = true; + hostAddress6 = hostIp; + localAddress6 = localIp; + config = + { services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.allowPing = true; + }; + }; + + virtualisation.pathsInNixDB = [ pkgs.stdenv ]; + }; + + testScript = + '' + $machine->waitForUnit("default.target"); + $machine->succeed("nixos-container list") =~ /webserver/ or die; + + # Start the webserver container. + $machine->succeed("nixos-container start webserver"); + + # wait two seconds for the container to start and the network to be up + sleep 2; + + # Since "start" returns after the container has reached + # multi-user.target, we should now be able to access it. + my $ip = "${localIp}"; + chomp $ip; + $machine->succeed("ping6 -n -c 1 $ip"); + $machine->succeed("curl --fail http://[$ip]/ > /dev/null"); + + # Stop the container. + $machine->succeed("nixos-container stop webserver"); + $machine->fail("curl --fail --connect-timeout 2 http://[$ip]/ > /dev/null"); + + # Destroying a declarative container should fail. + $machine->fail("nixos-container destroy webserver"); + ''; + +}) diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix index ce36a7e0588..108feba0891 100644 --- a/nixos/tests/containers.nix +++ b/nixos/tests/containers.nix @@ -34,11 +34,14 @@ import ./make-test.nix ({ pkgs, ...} : { # Start the webserver container. $machine->succeed("nixos-container start webserver"); + # wait two seconds for the container to start and the network to be up + sleep 2; + # Since "start" returns after the container has reached # multi-user.target, we should now be able to access it. my $ip = $machine->succeed("nixos-container show-ip webserver"); chomp $ip; - #$machine->succeed("ping -c1 $ip"); # FIXME + $machine->succeed("ping -n -c1 $ip"); $machine->succeed("curl --fail http://$ip/ > /dev/null"); # Stop the container. From 2d6a2b41313464ba82297c4f6e86c7026c7d132e Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Fri, 18 Mar 2016 15:29:45 +0100 Subject: [PATCH 004/210] containers tests: Distinguish declarative and imperative containers --- nixos/release.nix | 3 +- ...ntainers.nix => containers-imperative.nix} | 37 +------------ nixos/tests/containers-ipv4.nix | 55 +++++++++++++++++++ 3 files changed, 58 insertions(+), 37 deletions(-) rename nixos/tests/{containers.nix => containers-imperative.nix} (68%) create mode 100644 nixos/tests/containers-ipv4.nix diff --git a/nixos/release.nix b/nixos/release.nix index 2dc1b21daaf..7ef4ca8f934 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -199,9 +199,10 @@ in rec { tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.chromium = callSubTests tests/chromium.nix {}; tests.cjdns = callTest tests/cjdns.nix {}; - tests.containers = callTest tests/containers.nix {}; + tests.containers-ipv4 = callTest tests/containers-ipv4.nix {}; tests.containers-ipv6 = callTest tests/containers-ipv6.nix {}; tests.containers-bridge = callTest tests/containers-bridge.nix {}; + tests.containers-imperative = callTest tests/containers-imperative.nix {}; tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; }; diff --git a/nixos/tests/containers.nix b/nixos/tests/containers-imperative.nix similarity index 68% rename from nixos/tests/containers.nix rename to nixos/tests/containers-imperative.nix index 108feba0891..8d100fedf78 100644 --- a/nixos/tests/containers.nix +++ b/nixos/tests/containers-imperative.nix @@ -1,7 +1,7 @@ # Test for NixOS' container support. import ./make-test.nix ({ pkgs, ...} : { - name = "containers"; + name = "containers-imperative"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ aristid aszlig eelco chaoflow ]; }; @@ -11,43 +11,11 @@ import ./make-test.nix ({ pkgs, ...} : { { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; - - containers.webserver = - { privateNetwork = true; - hostAddress = "10.231.136.1"; - localAddress = "10.231.136.2"; - config = - { services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall.allowedTCPPorts = [ 80 ]; - networking.firewall.allowPing = true; - }; - }; - virtualisation.pathsInNixDB = [ pkgs.stdenv ]; }; testScript = '' - $machine->succeed("nixos-container list") =~ /webserver/ or die; - - # Start the webserver container. - $machine->succeed("nixos-container start webserver"); - - # wait two seconds for the container to start and the network to be up - sleep 2; - - # Since "start" returns after the container has reached - # multi-user.target, we should now be able to access it. - my $ip = $machine->succeed("nixos-container show-ip webserver"); - chomp $ip; - $machine->succeed("ping -n -c1 $ip"); - $machine->succeed("curl --fail http://$ip/ > /dev/null"); - - # Stop the container. - $machine->succeed("nixos-container stop webserver"); - $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); - # Make sure we have a NixOS tree (required by ‘nixos-container create’). $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2"); @@ -114,9 +82,6 @@ import ./make-test.nix ({ pkgs, ...} : { # Ensure that the container path is gone "test ! -e /var/lib/containers/$id1" ); - - # Destroying a declarative container should fail. - $machine->fail("nixos-container destroy webserver"); ''; }) diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix new file mode 100644 index 00000000000..8f1ab40221a --- /dev/null +++ b/nixos/tests/containers-ipv4.nix @@ -0,0 +1,55 @@ +# Test for NixOS' container support. + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-ipv4"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aristid aszlig eelco chaoflow ]; + }; + + machine = + { config, pkgs, ... }: + { imports = [ ../modules/installer/cd-dvd/channel.nix ]; + virtualisation.writableStore = true; + virtualisation.memorySize = 768; + + containers.webserver = + { privateNetwork = true; + hostAddress = "10.231.136.1"; + localAddress = "10.231.136.2"; + config = + { services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.allowPing = true; + }; + }; + + virtualisation.pathsInNixDB = [ pkgs.stdenv ]; + }; + + testScript = + '' + $machine->succeed("nixos-container list") =~ /webserver/ or die; + + # Start the webserver container. + $machine->succeed("nixos-container start webserver"); + + # wait two seconds for the container to start and the network to be up + sleep 2; + + # Since "start" returns after the container has reached + # multi-user.target, we should now be able to access it. + my $ip = $machine->succeed("nixos-container show-ip webserver"); + chomp $ip; + $machine->succeed("ping -n -c1 $ip"); + $machine->succeed("curl --fail http://$ip/ > /dev/null"); + + # Stop the container. + $machine->succeed("nixos-container stop webserver"); + $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); + + # Destroying a declarative container should fail. + $machine->fail("nixos-container destroy webserver"); + ''; + +}) From 3c819f28f57ee1485f15faf917f2fc6a861a6883 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Sat, 2 Apr 2016 17:03:30 +0200 Subject: [PATCH 005/210] containers: Make declarative containers real systemd services Without the templating (which is still present for imperative containers), it will be possible to set individual dependencies. Like depending on the network only if the hostbridge or hardware interfaces are used. Ported from #3021 --- nixos/modules/virtualisation/containers.nix | 307 ++++++++++---------- 1 file changed, 147 insertions(+), 160 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 4c20ee27de2..fca21a8610b 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -278,167 +278,180 @@ in }; - config = mkIf (config.boot.enableContainers) { + config = mkIf (config.boot.enableContainers) (let - systemd.services."container@" = - { description = "Container '%i'"; + unit = { + description = "Container '%i'"; - unitConfig.RequiresMountsFor = [ "/var/lib/containers/%i" ]; + unitConfig.RequiresMountsFor = [ "/var/lib/containers/%i" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute ]; - environment.INSTANCE = "%i"; - environment.root = "/var/lib/containers/%i"; + environment.INSTANCE = "%i"; + environment.root = "/var/lib/containers/%i"; - preStart = - '' - # Clean up existing machined registration and interfaces. - machinectl terminate "$INSTANCE" 2> /dev/null || true + preStart = + '' + # Clean up existing machined registration and interfaces. + machinectl terminate "$INSTANCE" 2> /dev/null || true - if [ "$PRIVATE_NETWORK" = 1 ]; then - ip link del dev "ve-$INSTANCE" 2> /dev/null || true - ip link del dev "vb-$INSTANCE" 2> /dev/null || true + if [ "$PRIVATE_NETWORK" = 1 ]; then + ip link del dev "ve-$INSTANCE" 2> /dev/null || true + ip link del dev "vb-$INSTANCE" 2> /dev/null || true + fi + ''; + + script = + '' + mkdir -p -m 0755 "$root/etc" "$root/var/lib" + mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers + if ! [ -e "$root/etc/os-release" ]; then + touch "$root/etc/os-release" + fi + + mkdir -p -m 0755 \ + "/nix/var/nix/profiles/per-container/$INSTANCE" \ + "/nix/var/nix/gcroots/per-container/$INSTANCE" + + cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" + + if [ "$PRIVATE_NETWORK" = 1 ]; then + extraFlags+=" --network-veth" + if [ -n "$HOST_BRIDGE" ]; then + extraFlags+=" --network-bridge=$HOST_BRIDGE" fi - ''; + fi - script = - '' - mkdir -p -m 0755 "$root/etc" "$root/var/lib" - mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers - if ! [ -e "$root/etc/os-release" ]; then - touch "$root/etc/os-release" + for iface in $INTERFACES; do + extraFlags+=" --network-interface=$iface" + done + + for iface in $MACVLANS; do + extraFlags+=" --network-macvlan=$iface" + done + + # If the host is 64-bit and the container is 32-bit, add a + # --personality flag. + ${optionalString (config.nixpkgs.system == "x86_64-linux") '' + if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then + extraFlags+=" --personality=x86" fi + ''} - mkdir -p -m 0755 \ - "/nix/var/nix/profiles/per-container/$INSTANCE" \ - "/nix/var/nix/gcroots/per-container/$INSTANCE" - cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" - if [ "$PRIVATE_NETWORK" = 1 ]; then - extraFlags+=" --network-veth" - if [ -n "$HOST_BRIDGE" ]; then - extraFlags+=" --network-bridge=$HOST_BRIDGE" + # Run systemd-nspawn without startup notification (we'll + # wait for the container systemd to signal readiness). + EXIT_ON_REBOOT=1 NOTIFY_SOCKET= \ + exec ${config.systemd.package}/bin/systemd-nspawn \ + --keep-unit \ + -M "$INSTANCE" -D "$root" $extraFlags \ + $EXTRA_NSPAWN_FLAGS \ + --bind-ro=/nix/store \ + --bind-ro=/nix/var/nix/db \ + --bind-ro=/nix/var/nix/daemon-socket \ + --bind=/run/systemd/notify:/var/lib/private/host-notify \ + --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \ + --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \ + --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \ + --setenv HOST_BRIDGE="$HOST_BRIDGE" \ + --setenv HOST_ADDRESS="$HOST_ADDRESS" \ + --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \ + --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ + --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ + --setenv PATH="$PATH" \ + ${containerInit} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" + ''; + + postStart = + '' + if [ "$PRIVATE_NETWORK" = 1 ]; then + if [ -z "$HOST_BRIDGE" ]; then + ifaceHost=ve-$INSTANCE + ip link set dev $ifaceHost up + if [ -n "$HOST_ADDRESS" ]; then + ip addr add $HOST_ADDRESS dev $ifaceHost + fi + if [ -n "$HOST_ADDRESS6" ]; then + ip -6 addr add $HOST_ADDRESS6 dev $ifaceHost + fi + if [ -n "$LOCAL_ADDRESS" ]; then + ip route add $LOCAL_ADDRESS dev $ifaceHost + fi + if [ -n "$LOCAL_ADDRESS6" ]; then + ip -6 route add $LOCAL_ADDRESS6 dev $ifaceHost fi fi + fi - for iface in $INTERFACES; do - extraFlags+=" --network-interface=$iface" - done + # Get the leader PID so that we can signal it in + # preStop. We can't use machinectl there because D-Bus + # might be shutting down. FIXME: in systemd 219 we can + # just signal systemd-nspawn to do a clean shutdown. + machinectl show "$INSTANCE" | sed 's/Leader=\(.*\)/\1/;t;d' > "/run/containers/$INSTANCE.pid" + ''; - for iface in $MACVLANS; do - extraFlags+=" --network-macvlan=$iface" - done + preStop = + '' + pid="$(cat /run/containers/$INSTANCE.pid)" + if [ -n "$pid" ]; then + kill -RTMIN+4 "$pid" + fi + rm -f "/run/containers/$INSTANCE.pid" + ''; - # If the host is 64-bit and the container is 32-bit, add a - # --personality flag. - ${optionalString (config.nixpkgs.system == "x86_64-linux") '' - if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then - extraFlags+=" --personality=x86" - fi - ''} + restartIfChanged = false; - - - # Run systemd-nspawn without startup notification (we'll - # wait for the container systemd to signal readiness). - EXIT_ON_REBOOT=1 NOTIFY_SOCKET= \ - exec ${config.systemd.package}/bin/systemd-nspawn \ - --keep-unit \ - -M "$INSTANCE" -D "$root" $extraFlags \ - $EXTRA_NSPAWN_FLAGS \ - --bind-ro=/nix/store \ - --bind-ro=/nix/var/nix/db \ - --bind-ro=/nix/var/nix/daemon-socket \ - --bind=/run/systemd/notify:/var/lib/private/host-notify \ - --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \ - --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \ - --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \ - --setenv HOST_BRIDGE="$HOST_BRIDGE" \ - --setenv HOST_ADDRESS="$HOST_ADDRESS" \ - --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \ - --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ - --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ - --setenv PATH="$PATH" \ - ${containerInit} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" - ''; - - postStart = + serviceConfig = { + ExecReload = pkgs.writeScript "reload-container" '' - if [ "$PRIVATE_NETWORK" = 1 ]; then - if [ -z "$HOST_BRIDGE" ]; then - ifaceHost=ve-$INSTANCE - ip link set dev $ifaceHost up - if [ -n "$HOST_ADDRESS" ]; then - ip addr add $HOST_ADDRESS dev $ifaceHost - fi - if [ -n "$HOST_ADDRESS6" ]; then - ip -6 addr add $HOST_ADDRESS6 dev $ifaceHost - fi - if [ -n "$LOCAL_ADDRESS" ]; then - ip route add $LOCAL_ADDRESS dev $ifaceHost - fi - if [ -n "$LOCAL_ADDRESS6" ]; then - ip -6 route add $LOCAL_ADDRESS6 dev $ifaceHost - fi - fi - fi - - # Get the leader PID so that we can signal it in - # preStop. We can't use machinectl there because D-Bus - # might be shutting down. FIXME: in systemd 219 we can - # just signal systemd-nspawn to do a clean shutdown. - machinectl show "$INSTANCE" | sed 's/Leader=\(.*\)/\1/;t;d' > "/run/containers/$INSTANCE.pid" + #! ${pkgs.stdenv.shell} -e + ${nixos-container}/bin/nixos-container run "$INSTANCE" -- \ + bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test" ''; - preStop = - '' - pid="$(cat /run/containers/$INSTANCE.pid)" - if [ -n "$pid" ]; then - kill -RTMIN+4 "$pid" - fi - rm -f "/run/containers/$INSTANCE.pid" - ''; + SyslogIdentifier = "container %i"; - restartIfChanged = false; - #reloadIfChanged = true; # FIXME + EnvironmentFile = "-/etc/containers/%i.conf"; - wants = [ "netwprk.target" ]; - after = [ "network.target" ]; + Type = "notify"; - serviceConfig = { - ExecReload = pkgs.writeScript "reload-container" - '' - #! ${pkgs.stdenv.shell} -e - ${nixos-container}/bin/nixos-container run "$INSTANCE" -- \ - bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test" - ''; + NotifyAccess = "all"; - SyslogIdentifier = "container %i"; + # Note that on reboot, systemd-nspawn returns 133, so this + # unit will be restarted. On poweroff, it returns 0, so the + # unit won't be restarted. + RestartForceExitStatus = "133"; + SuccessExitStatus = "133"; - EnvironmentFile = "-/etc/containers/%i.conf"; + Restart = "on-failure"; - Type = "notify"; - - NotifyAccess = "all"; - - # Note that on reboot, systemd-nspawn returns 133, so this - # unit will be restarted. On poweroff, it returns 0, so the - # unit won't be restarted. - RestartForceExitStatus = "133"; - SuccessExitStatus = "133"; - - Restart = "on-failure"; - - # Hack: we don't want to kill systemd-nspawn, since we call - # "machinectl poweroff" in preStop to shut down the - # container cleanly. But systemd requires sending a signal - # (at least if we want remaining processes to be killed - # after the timeout). So send an ignored signal. - KillMode = "mixed"; - KillSignal = "WINCH"; - }; + # Hack: we don't want to kill systemd-nspawn, since we call + # "machinectl poweroff" in preStop to shut down the + # container cleanly. But systemd requires sending a signal + # (at least if we want remaining processes to be killed + # after the timeout). So send an ignored signal. + KillMode = "mixed"; + KillSignal = "WINCH"; }; + }; + in { + systemd.services = listToAttrs (filter (x: x.value != null) ( + # The generic container template used by imperative containers + [{ name = "container@"; value = unit; }] + # declarative containers + ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" ( + if cfg.autoStart then + unit // { + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" ]; + restartTriggers = [ cfg.path ]; + reloadIfChanged = true; + } + else null + )) config.containers) + )); # Generate a configuration file in /etc/containers for each # container so that container@.target can get the container @@ -482,31 +495,5 @@ in networking.dhcpcd.denyInterfaces = [ "ve-*" ]; environment.systemPackages = [ nixos-container ]; - - # Start containers at boot time. - systemd.services.all-containers = - { description = "All Containers"; - - wantedBy = [ "multi-user.target" ]; - - unitConfig.ConditionDirectoryNotEmpty = "/etc/containers"; - - serviceConfig.Type = "oneshot"; - - script = - '' - res=0 - shopt -s nullglob - for i in /etc/containers/*.conf; do - AUTO_START= - source "$i" - if [ "$AUTO_START" = 1 ]; then - systemctl start "container@$(basename "$i" .conf).service" || res=1 - fi - done - exit $res - ''; # */ - }; - - }; + }); } From d3ab51674ccc8a06d6bbd67b97eb104936986649 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 8 Apr 2016 12:49:37 +0200 Subject: [PATCH 006/210] beancount: init at 2016-04-10-b5721f1c6f01bd168a5781652e5e3167f7f8ceb3 --- .../applications/office/beancount/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/office/beancount/default.nix diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix new file mode 100644 index 00000000000..8811183dfc8 --- /dev/null +++ b/pkgs/applications/office/beancount/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchhg, pkgs, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + version = "2016-04-10-b5721f1c6f01bd168a5781652e5e3167f7f8ceb3"; + name = "beancount-${version}"; + namePrefix = ""; + + src = fetchhg { + url = "https://bitbucket.org/blais/beancount"; + rev = "b5721f1c6f01bd168a5781652e5e3167f7f8ceb3"; + sha256 = "10nv3p9cix7yp23a9hnq5163rpl8cfs3hv75h90ld57dc24nxzn2"; + }; + + buildInputs = with pythonPackages; [ nose ]; + + checkPhase = '' + nosetests $out + ''; + + propagatedBuildInputs = with pythonPackages; [ + beautifulsoup4 + bottle + chardet + dateutil + google_api_python_client + lxml + ply + python_magic + ]; + + meta = { + homepage = http://furius.ca/beancount/; + description = "double-entry bookkeeping computer language"; + longDescription = '' + A double-entry bookkeeping computer language that lets you define + financial transaction records in a text file, read them in memory, + generate a variety of reports from them, and provides a web interface. + ''; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfb1d258ba3..1464a93d23e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14585,6 +14585,10 @@ in bastet = callPackage ../games/bastet {}; + beancount = callPackage ../applications/office/beancount { + pythonPackages = python3Packages; + }; + beret = callPackage ../games/beret { }; bitsnbots = callPackage ../games/bitsnbots { From 52e699dcdfed6c839e6016d767b73c8587ec27fb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 11 Apr 2016 16:48:01 +0300 Subject: [PATCH 007/210] ogre: don't build with nvigia-cg and samples by default, add flags --- pkgs/development/libraries/ogre/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 89d694cc497..aba02827665 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,11 +1,12 @@ -{ fetchurl, stdenv +{ fetchurl, stdenv, lib , cmake, mesa , freetype, freeimage, zziplib, randrproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , xproto, libX11, libXmu, libSM, pkgconfig , libXxf86vm, xf86vidmodeproto, libICE , renderproto, libXrender -, nvidia_cg_toolkit }: +, withNvidiaCg ? false, nvidia_cg_toolkit +, withSamples ? false }: stdenv.mkDerivation { name = "ogre-1.9-hg-20160322"; @@ -15,10 +16,10 @@ stdenv.mkDerivation { sha256 = "0w3argjy1biaxwa3c80zxxgll67wjp8czd83p87awlcvwzdk5mz9"; }; - cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ] - ++ (map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") - [ "BSP" "CG" "OCTREE" "PCZ" "PFX" ]) - ++ (map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]); + cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] + ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") + ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") + ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; enableParallelBuilding = true; @@ -29,8 +30,7 @@ stdenv.mkDerivation { xproto libX11 libXmu libSM pkgconfig libXxf86vm xf86vidmodeproto libICE renderproto libXrender - nvidia_cg_toolkit - ]; + ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; meta = { description = "A 3D engine"; From 52fb00535e8e721784cb5103915697fd3e8abed1 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 14 Apr 2016 17:31:04 -0400 Subject: [PATCH 008/210] frameworks: GL is undefined The GLUT frameworks is currently a Nix evaluation error. --- pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 750adfe3cbf..3ecb3511422 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -48,7 +48,7 @@ with frameworks; with libs; { ForceFeedback = [ CF IOKit ]; Foundation = [ CF libobjc Security ApplicationServices SystemConfiguration ]; GLKit = [ CF ]; - GLUT = [ GL OpenGL ]; + GLUT = [ OpenGL ]; GSS = []; GameController = []; GameKit = [ Foundation ]; From 970d80b0ff5390e97ce72f0ff576cd088e57d9b0 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Fri, 11 Mar 2016 15:10:10 -0500 Subject: [PATCH 009/210] cf-private: fix CFLAGS surgery The previous version could produce unparseable flags. --- pkgs/os-specific/darwin/cf-private/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/cf-private/setup-hook.sh b/pkgs/os-specific/darwin/cf-private/setup-hook.sh index 7594c07977b..ae9ed5d1584 100644 --- a/pkgs/os-specific/darwin/cf-private/setup-hook.sh +++ b/pkgs/os-specific/darwin/cf-private/setup-hook.sh @@ -1,5 +1,5 @@ prependSearchPath() { - NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks ${NIX_CFLAGS_COMPILE/"-F@out@/Library/Frameworks"/}" + NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks ${NIX_CFLAGS_COMPILE}" } linkWithRealCF() { From ca1d46f98a71d3b21de0b9a30f759a7af2514f61 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Fri, 11 Mar 2016 15:11:02 -0500 Subject: [PATCH 010/210] ApplicationServices: add CoreGraphics child The AVFoundation framework uses a relative path that presumes that CoreGraphics is a child framework of ApplicationServices. It is not in the 10.9 SDK. This patch makes it one by tweaking the framework derivation generator with special support to address this problem. --- pkgs/os-specific/darwin/apple-sdk/default.nix | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index c18d3f6cc6d..c1e09c20111 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -66,7 +66,18 @@ let mkdir -p "$dest" pushd "$dest" >/dev/null - cp -R "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" . + # Keep track of if this is a child or a child rescue as with + # ApplicationServices in the 10.9 SDK + local isChild + + if [ -d "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" ]; then + isChild=1 + cp -R "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" . + else + isChild=0 + current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")" + cp -R "${sdk}/Library/Frameworks/$name.framework/Versions/$current/Headers" . + fi ln -s -L "/System/Library/Frameworks/$path/Versions/$current/$name" ln -s -L "/System/Library/Frameworks/$path/Versions/$current/Resources" @@ -74,8 +85,17 @@ let ln -s "/System/Library/Frameworks/$path/module.map" fi - pushd "${sdk}/Library/Frameworks/$path/Versions/$current" >/dev/null + if [ $isChild -eq 1 ]; then + pushd "${sdk}/Library/Frameworks/$path/Versions/$current" >/dev/null + else + pushd "${sdk}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null + fi local children=$(echo Frameworks/*.framework) + if [ "$name" == "ApplicationServices" ]; then + # Fixing up ApplicationServices which is missing + # CoreGraphics in the 10.9 SDK + children="$children Frameworks/CoreGraphics.framework" + fi popd >/dev/null for child in $children; do From 184a3957e6a476e6f81abee552856861118ce85b Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Fri, 11 Mar 2016 15:12:55 -0500 Subject: [PATCH 011/210] ffmpeg-full: avfoundation indev support on darwin Adds support for camera input devices on OS X. This required fixing links in output libraries and executables to pull in the system's CoreFoundation.framework rather than the open source CF one. --- .../libraries/ffmpeg-full/default.nix | 22 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 91974a31175..0f6ffe51d85 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -141,7 +141,7 @@ /* * Darwin frameworks */ -, Cocoa, CoreServices +, Cocoa, CoreServices, AVFoundation, MediaToolbox, VideoDecodeAcceleration, CF }: /* Maintainer notes: @@ -177,7 +177,7 @@ let inherit (stdenv) isCygwin isFreeBSD isLinux; - inherit (stdenv.lib) optional optionals enableFeature; + inherit (stdenv.lib) optional optionals optionalString enableFeature; in /* @@ -410,11 +410,25 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ faac fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] - ++ optionals stdenv.isDarwin [ Cocoa CoreServices ]; + ++ optionals stdenv.isDarwin [ Cocoa CoreServices AVFoundation MediaToolbox + VideoDecodeAcceleration ]; # Build qt-faststart executable buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; - postInstall = optional qtFaststartProgram ''cp -a tools/qt-faststart $out/bin/''; + + # Hacky framework patching technique borrowed from the phantomjs2 package + postInstall = optionalString qtFaststartProgram '' + cp -a tools/qt-faststart $out/bin/ + '' + optionalString stdenv.isDarwin '' + FILES=($(ls $out/bin/*)) + FILES+=($(ls $out/lib/*.dylib)) + for f in ''${FILES[@]}; do + if [ ! -h "$f" ]; then + install_name_tool -change ${CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" + fi + done + ''; + enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e44ac3e0bb..5cf8a5b7448 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6705,7 +6705,9 @@ in vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; xavs = if stdenv.isDarwin then null else xavs; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices; + inherit (darwin) CF; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices AVFoundation + MediaToolbox VideoDecodeAcceleration; }; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; From f3536f8ca0d6e609fb7a73c546d5f0d88a023759 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 19 Apr 2016 18:05:40 +0200 Subject: [PATCH 012/210] cairo: build cairo-xlib even on Darwin --- pkgs/development/libraries/cairo/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 2e4821b3073..f6f0a0d3af7 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { ]); propagatedBuildInputs = - with xorg; [ libXext fontconfig expat freetype pixman zlib libpng ] - ++ optional (!stdenv.isDarwin) libXrender + with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ] ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib ++ optional glSupport mesa_noglu From b301b00b89327393cc1830e3e9aca09b4a2fd49b Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Tue, 19 Apr 2016 22:39:53 -0700 Subject: [PATCH 013/210] libinput: v1.2.2 -> v1.2.3 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 18dbd2de38b..2c29482227a 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.2.2"; + name = "libinput-1.2.3"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0rzkp37dnn4qnkx7v3hckx5ryv3lr0vl234pnk6z2vfq40v5pb08"; + sha256 = "1wp937sn2dzqhrbl2bhapqb0pvybc80z8ynw7yfkm5ycl39skch9"; }; configureFlags = [ From fe901d1372cccd2dc04d5187c3366fabacc3f9c9 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:39:14 +0300 Subject: [PATCH 014/210] maintainers: add retrry to maintainers list --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 720824ee66e..1cdb3dd8d1a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -294,6 +294,7 @@ refnil = "Martin Lavoie "; relrod = "Ricky Elrod "; renzo = "Renzo Carbonara "; + retrry = "Tadas Barzdžius "; rick68 = "Wei-Ming Yang "; rickynils = "Rickard Nilsson "; rnhmjoj = "Michele Guerini Rocco "; From 9450a6826f68b4ba18618bbb25368b95fceeae2f Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:39:44 +0300 Subject: [PATCH 015/210] rustc: 1.7.0 -> 1.8.0 --- pkgs/development/compilers/rustc/default.nix | 16 ++++++++-------- pkgs/development/compilers/rustc/generic.nix | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix index 61346f1b4e2..38d6cb0b6e7 100644 --- a/pkgs/development/compilers/rustc/default.nix +++ b/pkgs/development/compilers/rustc/default.nix @@ -1,11 +1,11 @@ { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "1.7.0"; + shortVersion = "1.8.0"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcSha = "05f4v6sfmvkwsv6a7jp9sxsm84s0gdvqyf2wwdi1ilg9k8nxzgd4"; + srcSha = "1s03aymmhhrndq29sv9cs8s4p1sg8qvq8ds6lyp6s4ny8nyvdpzy"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. @@ -15,12 +15,12 @@ callPackage ./generic.nix { for the tagged release and not a snapshot in the current HEAD. */ - snapshotHashLinux686 = "a09c4a4036151d0cb28e265101669731600e01f2"; - snapshotHashLinux64 = "97e2a5eb8904962df8596e95d6e5d9b574d73bf4"; - snapshotHashDarwin686 = "ca52d2d3ba6497ed007705ee3401cf7efc136ca1"; - snapshotHashDarwin64 = "3c44ffa18f89567c2b81f8d695e711c86d81ffc7"; - snapshotDate = "2015-12-18"; - snapshotRev = "3391630"; + snapshotHashLinux686 = "5f194aa7628c0703f0fd48adc4ec7f3cc64b98c7"; + snapshotHashLinux64 = "d29b7607d13d64078b6324aec82926fb493f59ba"; + snapshotHashDarwin686 = "4c8e42dd649e247f3576bf9dfa273327b4907f9c"; + snapshotHashDarwin64 = "411a41363f922d1d93fa62ff2fedf5c35e9cccb2"; + snapshotDate = "2016-02-17"; + snapshotRev = "4d3eebf"; patches = [ ./patches/remove-uneeded-git.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index 3f640076947..976c1b932b5 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -62,7 +62,7 @@ let version = if isRelease then meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; }; @@ -164,7 +164,8 @@ with stdenv.lib; stdenv.mkDerivation { buildInputs = [ ncurses ] ++ optional (!forceBundledLLVM) llvmShared; - enableParallelBuilding = false; # missing files during linking, occasionally + # https://github.com/rust-lang/rust/issues/30181 + # enableParallelBuilding = false; # missing files during linking, occasionally outputs = [ "out" "doc" ]; setOutputFlags = false; From 0649edd4321181f9314dadd23db812615e936d55 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:40:59 +0300 Subject: [PATCH 016/210] Heatseeker: 1.3.0 -> 1.4.0 --- pkgs/tools/misc/heatseeker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 0d85554c347..9183f1290ea 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -4,17 +4,17 @@ with rustPlatform; buildRustPackage rec { name = "heatseeker-${version}"; - version = "1.3.0"; + version = "1.4.0"; - depsSha256 = "03jap7myf85xgx9270sws8x57nl04a1wx8szrk9qx24s9vnnjcnh"; + depsSha256 = "1acimdkl6ra9jlyiydzzd6ccdygr5is2xf9gw8i45xzh0xnsq226"; src = fetchFromGitHub { owner = "rschmitt"; repo = "heatseeker"; rev = "v${version}"; - sha256 = "1xdvwgmh9lwv82hv1qg82bjv2iplnvva6lzbg7dyhbszhv7rhkbl"; + sha256 = "1v2p6l4bdmvn9jggb12p0j5ajjvnbcdjsiavlcqiijz2w8wcdgs8"; }; - + # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of TRAVIS= "true"; From 94280ecf903d26c4cf1f8205ca0cc47b0d1cce38 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:41:37 +0300 Subject: [PATCH 017/210] exa: 2016-04-11 -> 2016-04-20 --- pkgs/tools/misc/exa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 4c20719fc51..39ba9bb2e50 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -4,15 +4,15 @@ with rustPlatform; buildRustPackage rec { name = "exa-${version}"; - version = "2016-04-11"; + version = "2016-04-20"; depsSha256 = "1rpynsni2r3gim10xc1qkj51wpbzafwsr99y61zh41v4vh047g1k"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; - rev = "9b87ef1da2231acef985bb08f7bd4a557167b652"; - sha256 = "1f71bqkpc6bf9jg1zxy21rzbyhzghwfmgbyyyb81ggxcri0kajwi"; + rev = "110a1c716bfc4a7f74f74b3c4f0a881c773fcd06"; + sha256 = "136yxi85m50vwmqinr1wnd0h29n5yjykqqqk9ibbcmmhx8sqhjzf"; }; nativeBuildInputs = [ cmake ]; From 7d661a4ab40a6296322bb7eced188a6d74dc6dc1 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:42:37 +0300 Subject: [PATCH 018/210] cargo: 0.8.0 -> 0.9.0. Enable Darwin --- .../tools/build-managers/cargo/common.nix | 4 ++-- .../tools/build-managers/cargo/default.nix | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index 110956ebf85..64966479319 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -31,8 +31,8 @@ meta = with stdenv.lib; { homepage = http://crates.io; description = "Downloads your Rust project's dependencies and builds your project"; - maintainers = with maintainers; [ wizeman ]; + maintainers = with maintainers; [ wizeman retrry ]; license = [ licenses.mit licenses.asl20 ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index e0094b4350a..c3e782a12ea 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl +{ stdenv, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl , cmake, zlib, makeWrapper }: with rustPlatform; with ((import ./common.nix) { inherit stdenv rustc; - version = "0.8.0"; + version = "0.9.0"; }); buildRustPackage rec { @@ -15,10 +15,10 @@ buildRustPackage rec { src = fetchgit { url = "git://github.com/rust-lang/cargo"; rev = "refs/tags/${version}"; - sha256 = "02z0b6hpygjjfbskg22ggrhdv2nasrgf8x1fd8y0qzg4krx2czlh"; + sha256 = "0d3n2jdhaz06yhilvmw3m2avxv501da1hdhljc9mwkz3l5bkv2jv"; }; - depsSha256 = "1gwc5ygs3h8jxs506xmbj1xzaqpb3kmg3pkxg9j9yqy616jw6rcn"; + depsSha256 = "1x2m7ww2z8nl5ic2nds85p7ma8x0zp654jg7ay905ia95daiabzg"; buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]; @@ -28,8 +28,15 @@ buildRustPackage rec { buildPhase = "make"; - # Disable check phase as there are lots of failures (some probably due to - # trying to access the network). + checkPhase = '' + # Export SSL_CERT_FILE as without it one test fails with SSL verification error + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + # Disable cross compilation tests + export CFG_DISABLE_CROSS_TESTS=1 + cargo test + ''; + + # Disable check phase as there are failures (author_prefers_cargo test fails) doCheck = false; installPhase = '' From 357a251bfb2449ee9d6c9b18b17d86fef7d4767c Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:43:00 +0300 Subject: [PATCH 019/210] rustfmt: 2016-03-22 -> 0.4.0 --- pkgs/development/tools/rust/rustfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 55e721306ce..0fad7290df3 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "rustfmt-${version}"; - version = "2016-03-22"; + version = "0.4"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustfmt"; - rev = "ca757183fedf8e89286372b91ca074c11d99c4f4"; - sha256 = "0ngg5m002hwwmsqy9wr50dj3l3zgwk39701wzszm3nrhz6x13dmj"; + rev = "19768da5c97c108a05e6f545b73ba4b76d1b1788"; + sha256 = "0f2m0gvlqlybcjl2xqwxlp5hjkhd30kx25dq56k5x0r3808ijksg"; }; - depsSha256 = "0mg4z197iiwjlgqs5izacld25cr11qi3bcrqq204f0jzrnj3y8ag"; + depsSha256 = "1lbcpvp7xhyl96w7jfd18w6py60nwllr93jna5j33zvnip61cpf5"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; From a2973df0334933aca215ceedf54e2642871a9a9e Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 15:08:12 +0300 Subject: [PATCH 020/210] pijul: use stable rustPlatform --- pkgs/applications/version-management/pijul/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 399e4cf3024..66dd63956d6 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchdarcs, rustUnstable, openssl, libssh }: +{ stdenv, fetchdarcs, rustPlatform, openssl, libssh }: -with rustUnstable; +with rustPlatform; buildRustPackage rec { name = "pijul-${version}"; From 713a069155416043a45f47eeee65546b1e94f8fe Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 20 Apr 2016 09:26:58 +0900 Subject: [PATCH 021/210] oraclejdk: 8u77 -> 8u91, 8u92 --- pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 8 ++------ pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 6 +++--- pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 6 +++--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 5ac7c417ba2..a18ffcbf3d4 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -119,12 +119,6 @@ let result = stdenv.mkDerivation rec { done fi - # construct the rpath - rpath= - for i in $libraries; do - rpath=$rpath''${rpath:+:}$i/lib:$i/lib64 - done - if test -z "$installjdk"; then jrePath=$out else @@ -176,6 +170,8 @@ let result = stdenv.mkDerivation rec { [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); + rpath = stdenv.lib.strings.makeLibraryPath libraries; + passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 554e3fc9838..0a9792f2b4a 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "77"; + patchVersion = "91"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "14hyniai5l9qpg0pbnxa4rhyhk90qgihszfkn8h3vziqhmvrp27j"; - sha256_x86_64 = "0hyzvvj4bf0r4jda8fv3k06d9bf37nji37qbq067mcjp5abc0zd4"; + sha256_i686 = "0lndni81vfpz2l6zb8zsshaavk0483q5jc8yzj4fdjv6wnshbkay"; + sha256_x86_64 = "0lkm3fz1vdi69f34sysavvh3abx603j1frc9hxvr08pwvmm536vg"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 554e3fc9838..d6d783b8a30 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "77"; + patchVersion = "92"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "14hyniai5l9qpg0pbnxa4rhyhk90qgihszfkn8h3vziqhmvrp27j"; - sha256_x86_64 = "0hyzvvj4bf0r4jda8fv3k06d9bf37nji37qbq067mcjp5abc0zd4"; + sha256_i686 = "095j2hh2xas05jajy4qdj9hxq3k460x4m12rcaxkaxw754imj0vj"; + sha256_x86_64 = "11wrqd3qbkhimbw9n4g9i0635pjhhnijwxyid7lvjv26kdgg58vr"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; From e6899cc80c3ceb7116d21d486b234bd8bd127a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 20 Apr 2016 16:11:34 +0100 Subject: [PATCH 022/210] add linuxPackages.dpdk: libs and drivers for fast packet processing --- pkgs/os-specific/linux/dpdk/default.nix | 40 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/dpdk/default.nix diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix new file mode 100644 index 00000000000..c93e0e80fa1 --- /dev/null +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, kernel, fetchurl }: + +assert lib.versionAtLeast kernel.version "3.18"; + +stdenv.mkDerivation rec { + name = "dpdk-${version}-${kernel.version}"; + version = "16.04"; + + src = fetchurl { + url = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${version}.tar.gz"; + sha256 = "0yrz3nnhv65v2jzz726bjswkn8ffqc1sr699qypc9m78qrdljcfn"; + }; + + RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + RTE_TARGET = "x86_64-native-linuxapp-gcc"; + + enableParallelBuilding = true; + outputs = [ "out" "examples" ]; + + buildPhase = '' + make T=x86_64-native-linuxapp-gcc config + make T=x86_64-native-linuxapp-gcc install + make T=x86_64-native-linuxapp-gcc examples + ''; + + installPhase = '' + cp -pr x86_64-native-linuxapp-gcc/{app,lib,include,kmod} $out/ + + mkdir $examples + cp -pr examples/* $examples/ + ''; + + meta = with stdenv.lib; { + description = "Set of libraries and drivers for fast packet processing"; + homepage = http://dpdk.org/; + license = with licenses; [ lgpl21 gpl2 bsd2 ]; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8132ccd5aa5..7aa7e40508f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10652,6 +10652,8 @@ in cpupower = callPackage ../os-specific/linux/cpupower { }; + dpdk = callPackage ../os-specific/linux/dpdk { }; + e1000e = callPackage ../os-specific/linux/e1000e {}; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; From 7cdf23a1f5dd8963b87f78d898bd42234cc4c631 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 20 Apr 2016 23:04:58 +0800 Subject: [PATCH 023/210] aucdtect: init at 0.8.2 A binary distribution of the TA Analyzer that verifies if audio files are in fact lossless. --- pkgs/tools/audio/aucdtect/default.nix | 32 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/audio/aucdtect/default.nix diff --git a/pkgs/tools/audio/aucdtect/default.nix b/pkgs/tools/audio/aucdtect/default.nix new file mode 100644 index 00000000000..244f7b40673 --- /dev/null +++ b/pkgs/tools/audio/aucdtect/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, lib, rpmextract }: + +assert stdenv.isLinux; + +with lib; + +stdenv.mkDerivation rec { + name = "aucdtext-${version}"; + version = "0.8-2"; + + src = fetchurl { + url = "http://www.true-audio.com/ftp/aucdtect-${version}.i586.rpm"; + sha256 = "1lp5f0rq5b5n5il0c64m00gcfskarvgqslpryms9443d200y6mmd"; + }; + + unpackCmd = "${rpmextract}/bin/rpmextract $src"; + + installPhase = '' + mkdir -p $out/bin + install -m755 local/bin/auCDtect $out/bin/aucdtect + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "Verify authenticity of lossless audio files"; + homepage = http://tausoft.org; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8132ccd5aa5..d9ad1b5d35e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16599,6 +16599,8 @@ in mg = callPackage ../applications/editors/mg { }; + aucdtect = callPackage ../tools/audio/aucdtect { }; + togglesg-download = callPackage ../tools/misc/togglesg-download { }; discord = callPackage ../applications/networking/instant-messengers/discord { }; From 0087d161204afc42355d1f867df5a9d51533bfae Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 19 Apr 2016 12:15:23 +0000 Subject: [PATCH 024/210] haskellPackages: clean up unnecessary overrides --- .../haskell-modules/configuration-common.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b824a06bd68..90cef5e92a0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -248,9 +248,6 @@ self: super: { webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; }; - # While waiting for https://github.com/jwiegley/gitlib/pull/53 to be merged - hlibgit2 = addBuildTool super.hlibgit2 pkgs.git; - # https://github.com/mvoidex/hsdev/issues/11 hsdev = dontHaddock super.hsdev; @@ -263,9 +260,6 @@ self: super: { # Upstream notified by e-mail. permutation = dontCheck super.permutation; - # https://github.com/vincenthz/hs-tls/issues/102 - tls = dontCheck super.tls; - # https://github.com/jputcu/serialport/issues/25 serialport = dontCheck super.serialport; @@ -275,9 +269,6 @@ self: super: { # Fails no apparent reason. Upstream has been notified by e-mail. assertions = dontCheck super.assertions; - # https://github.com/vincenthz/tasty-kat/issues/1 - tasty-kat = dontCheck super.tasty-kat; - # These packages try to execute non-existent external programs. cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw dbmigrations = dontCheck super.dbmigrations; @@ -302,7 +293,6 @@ self: super: { test-sandbox = dontCheck super.test-sandbox; users-postgresql-simple = dontCheck super.users-postgresql-simple; wai-middleware-hmac = dontCheck super.wai-middleware-hmac; - wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1 xkbcommon = dontCheck super.xkbcommon; xmlgen = dontCheck super.xmlgen; hapistrano = dontCheck super.hapistrano; From 25387a1bedefb391db9f8585cfa1d160fc3bacfe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 Apr 2016 20:53:24 +0200 Subject: [PATCH 025/210] nixos-checkout: Remove This command was useful when NixOS was spread across multiple repositories, but now it's pretty pointless (and obfuscates what happens, i.e. "git clone git://github.com/NixOS/nixpkgs.git"). --- nixos/doc/manual/development/sources.xml | 32 ++++------ .../cd-dvd/system-tarball-fuloong2f.nix | 3 +- .../cd-dvd/system-tarball-sheevaplug.nix | 3 +- .../installer/tools/nixos-checkout.nix | 60 ------------------- nixos/modules/module-list.nix | 1 - 5 files changed, 13 insertions(+), 86 deletions(-) delete mode 100644 nixos/modules/installer/tools/nixos-checkout.nix diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 879a31e32c5..fd0b0109b32 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -11,35 +11,25 @@ uses the NixOS and Nixpkgs sources provided by the nixos-unstable channel (kept in /nix/var/nix/profiles/per-user/root/channels/nixos). To modify NixOS, however, you should check out the latest sources from -Git. This is done using the following command: +Git. This is as follows: -$ nixos-checkout /my/sources - - -or - - -$ mkdir -p /my/sources -$ cd /my/sources -$ nix-env -i git $ git clone git://github.com/NixOS/nixpkgs.git $ cd nixpkgs $ git remote add channels git://github.com/NixOS/nixpkgs-channels.git $ git remote update channels -This will check out the latest NixOS sources to -/my/sources/nixpkgs/nixos -and the Nixpkgs sources to -/my/sources/nixpkgs. -(The NixOS source tree lives in a subdirectory of the Nixpkgs -repository.) The remote channels refers to a -read-only repository that tracks the Nixpkgs/NixOS channels (see for more information about channels). Thus, -the Git branch channels/nixos-14.12 will contain -the latest built and tested version available in the -nixos-14.12 channel. +This will check out the latest Nixpkgs sources to +./nixpkgs the NixOS sources to +./nixpkgs/nixos. (The NixOS source tree lives in +a subdirectory of the Nixpkgs repository.) The remote +channels refers to a read-only repository that +tracks the Nixpkgs/NixOS channels (see +for more information about channels). Thus, the Git branch +channels/nixos-14.12 will contain the latest built +and tested version available in the nixos-14.12 +channel. It’s often inconvenient to develop directly on the master branch, since if somebody has just committed (say) a change to GCC, diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index 6fe490b02bf..d984cb30717 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -52,8 +52,7 @@ in # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = - [ pkgs.subversion # for nixos-checkout - pkgs.w3m # needed for the manual anyway + [ pkgs.w3m # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.mssys # for writing Microsoft boot sectors / MBRs pkgs.parted diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 7badfcb8df2..9e733241993 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -49,8 +49,7 @@ in # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = - [ pkgs.subversion # for nixos-checkout - pkgs.w3m # needed for the manual anyway + [ pkgs.w3m # needed for the manual anyway pkgs.ddrescue pkgs.ccrypt pkgs.cryptsetup # needed for dm-crypt volumes diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix deleted file mode 100644 index 07274e139f7..00000000000 --- a/nixos/modules/installer/tools/nixos-checkout.nix +++ /dev/null @@ -1,60 +0,0 @@ -# This module generates the nixos-checkout script, which performs a -# checkout of the Nixpkgs Git repository. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - nixosCheckout = pkgs.substituteAll { - name = "nixos-checkout"; - dir = "bin"; - isExecutable = true; - src = pkgs.writeScript "nixos-checkout" - '' - #! ${pkgs.stdenv.shell} -e - - if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then - echo "Usage: `basename $0` [PREFIX]. See NixOS Manual for more info." - exit 0 - fi - - prefix="$1" - if [ -z "$prefix" ]; then prefix=/etc/nixos; fi - mkdir -p "$prefix" - cd "$prefix" - - if [ -z "$(type -P git)" ]; then - echo "installing Git..." - nix-env -iA nixos.git - fi - - # Move any old nixpkgs directories out of the way. - backupTimestamp=$(date "+%Y%m%d%H%M%S") - - if [ -e nixpkgs -a ! -e nixpkgs/.git ]; then - mv nixpkgs nixpkgs-$backupTimestamp - fi - - # Check out the Nixpkgs sources. - if ! [ -e nixpkgs/.git ]; then - echo "Creating repository in $prefix/nixpkgs..." - git init --quiet nixpkgs - else - echo "Updating repository in $prefix/nixpkgs..." - fi - cd nixpkgs - git remote add origin git://github.com/NixOS/nixpkgs.git || true - git remote add channels git://github.com/NixOS/nixpkgs-channels.git || true - git remote set-url origin --push git@github.com:NixOS/nixpkgs.git - git remote update - git checkout master - ''; - }; - -in - -{ - environment.systemPackages = [ nixosCheckout ]; -} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bb8fa48105a..e59ec07b8aa 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -47,7 +47,6 @@ ./i18n/input-method/nabi.nix ./i18n/input-method/uim.nix ./installer/tools/auto-upgrade.nix - ./installer/tools/nixos-checkout.nix ./installer/tools/tools.nix ./misc/assertions.nix ./misc/crashdump.nix From 2ddc17b930dd4446b259e18d2ef416c4d352fbea Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 20 Apr 2016 22:42:52 +0300 Subject: [PATCH 026/210] skype: fix rpath broken by closure-size merge --- .../networking/instant-messengers/skype/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 2f2dba18e49..5bb2121b1fd 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -38,13 +38,8 @@ stdenv.mkDerivation rec { mkdir -p $out/{libexec/skype/,bin} cp -r * $out/libexec/skype/ - fullPath= - for i in $nativeBuildInputs; do - fullPath=$fullPath''${fullPath:+:}$i/lib - done - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$fullPath" $out/libexec/skype/skype + --set-rpath "${lib.makeLibraryPath buildInputs}" $out/libexec/skype/skype cat > $out/bin/skype << EOF #!${stdenv.shell} From 1d6990db066f346432f9196ce2b209a52ff64768 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Wed, 20 Apr 2016 22:27:34 +0200 Subject: [PATCH 027/210] boot.loader.grub: fix variable name (#14855) --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 05322497a4b..289405f9319 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -499,7 +499,7 @@ in } ] ++ flip map args.devices (device: { assertion = device == "nodev" || hasPrefix "/" device; - message = "GRUB devices must be absolute paths, not ${dev} in ${args.path}"; + message = "GRUB devices must be absolute paths, not ${device} in ${args.path}"; })); }) From 9bc2daa9272213b7411613cdc0c356fb5d43fa7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Apr 2016 22:30:16 +0200 Subject: [PATCH 028/210] pcre: drop unused withCharSize function argument --- pkgs/development/libraries/pcre/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 8bce1512d13..91af6f4dadf 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl , windows ? null, variant ? null, pcre -, withCharSize ? 8 }: with stdenv.lib; From c9e300b4588b5b8b8ee2f39f742631f50df368f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Apr 2016 23:13:05 +0200 Subject: [PATCH 029/210] texlive (old): un-break syntax highlighting in Emacs (cosmetic) --- pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 48a5ae8d649..6baaf12b857 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -65,7 +65,7 @@ rec { mkdir -p $out/libexec/ mv $out/bin $out/libexec/$(uname -m) mkdir -p $out/bin - for i in "$out/libexec/"* "$out/libexec/"*/* ; do + for i in "$out/libexec/"* "$out/libexec/"*"/"* ; do test \( \! -d "$i" \) -a \( -x "$i" -o -L "$i" \) || continue if [ -x "$i" ]; then @@ -105,7 +105,7 @@ rec { PATH=$PATH:$out/bin mktexlsr $out/share/texmf* '' + stdenv.lib.optionalString stdenv.isDarwin '' - for prog in $out/bin/*; do + for prog in "$out/bin/"*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib" done '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"]; From 00ac3ac6ceb370fc234855b16fb38da401717f80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Apr 2016 23:13:40 +0200 Subject: [PATCH 030/210] texlive (old): mark build as broken Reported in https://github.com/NixOS/nixpkgs/issues/14807. It's probably about time to convert to the new texlive code, which is *much* nicer. See http://nixos.org/nixpkgs/manual/#sec-language-texlive for details. --- pkgs/tools/typesetting/tex/texlive/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 6baaf12b857..3a93c6445a7 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -156,5 +156,6 @@ rec { maintainers = with maintainers; [ lovek323 raskin jwiegley ]; platforms = platforms.unix; hydraPlatforms = []; + broken = true; # https://github.com/NixOS/nixpkgs/issues/14807 }; } From 85603d2166f0541487697a2d3310943a5f4795f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 20 Apr 2016 23:09:30 +0100 Subject: [PATCH 031/210] linuxPackages.dpdk: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit a56a9d1b590eb3dcadecf5b65ecabb46ae818d31) Signed-off-by: Domen Kožar --- pkgs/os-specific/linux/dpdk/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index c93e0e80fa1..486cd736c71 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' + mkdir $out cp -pr x86_64-native-linuxapp-gcc/{app,lib,include,kmod} $out/ mkdir $examples @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { description = "Set of libraries and drivers for fast packet processing"; homepage = http://dpdk.org/; license = with licenses; [ lgpl21 gpl2 bsd2 ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ];; maintainers = [ maintainers.iElectric ]; }; } From 8262cd0244fb8549571b983f4f688125c3b3b4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 20 Apr 2016 23:38:52 +0100 Subject: [PATCH 032/210] eval --- pkgs/os-specific/linux/dpdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 486cd736c71..7ca71a695e0 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Set of libraries and drivers for fast packet processing"; homepage = http://dpdk.org/; license = with licenses; [ lgpl21 gpl2 bsd2 ]; - platforms = [ "x86_64-linux" ];; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.iElectric ]; }; } From dbd88d8778266143813b2dc3c1a2145427235f82 Mon Sep 17 00:00:00 2001 From: Maarten Hoogendoorn Date: Thu, 21 Apr 2016 11:42:33 +0200 Subject: [PATCH 033/210] google-cloud-sdk: 0.9.82 -> 106.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 75860bc27d3..81bd6456103 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, python27, python27Packages, makeWrapper}: stdenv.mkDerivation rec { - version = "0.9.82"; + version = "106.0.0"; name = "google-cloud-sdk-${version}"; src = fetchurl { - url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20151008123015.tar.gz"; - sha256 = "11gnhgjj4y4dzi3wfdpnz918m7xraz1k3ady1d6y446hmc5q2512"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-106.0.0-linux-x86_64.tar.gz"; + sha256 = "00jhpx32sfxcgl404plmb8122bs0ijl2rv25h17mnjn067nhz7nn"; }; buildInputs = [python27 makeWrapper]; From 9445bb25fc77f8e53c5fd024c9609d8a3b8590cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 21 Apr 2016 12:18:16 +0200 Subject: [PATCH 034/210] gtksourceview-2: update 2.9.9 -> 2.10.5 It doesn't seem to help with mousepad problems #14862, but it shouldn't hurt. --- .../desktops/gnome-2/desktop/gtksourceview/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index aa1080012d5..c69ee82fa26 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,11 +1,13 @@ {stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk, pango, libxml2Python, perl, intltool, gettext}: -stdenv.mkDerivation { - name = "gtksourceview-2.9.9"; +stdenv.mkDerivation rec { + name = "gtksourceview-${version}"; + version = "2.10.5"; + src = fetchurl { - url = mirror://gnome/sources/gtksourceview/2.9/gtksourceview-2.9.9.tar.bz2; - sha256 = "0d0i586nj8jsqqfcjcvaj0yzc3sid3s1a4y62xr0qbddkbn1wllj"; + url = "mirror://gnome/sources/gtksourceview/2.10/${name}.tar.bz2"; + sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; buildInputs = [pkgconfig atk cairo glib gtk pango libxml2Python perl intltool gettext]; From c4ab7e2cd4f5ad39a2f1d590af2d2b72037fdfb2 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Wed, 20 Apr 2016 17:58:19 -0430 Subject: [PATCH 035/210] libxml2 : Have exec_prefix match the location of bin/xml2-config. --- pkgs/development/libraries/libxml2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index f7e175373e1..8eedf50c9ca 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib findXMLCatalogs ]; - configureFlags = "--with-python=${python}"; + configureFlags = "--with-python=${python} --exec_prefix=$dev"; enableParallelBuilding = true; From a74aa5bce790b4c334eee51213aba99bb9c03251 Mon Sep 17 00:00:00 2001 From: Ollie Charles Date: Tue, 19 Apr 2016 11:13:33 +0100 Subject: [PATCH 036/210] golden-cheetah: Fix evaluation For now, disable the Dropbox configuration. --- pkgs/applications/misc/golden-cheetah/default.nix | 13 +++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 82695bbdd7e..799746ee6bd 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -18,12 +18,13 @@ stdenv.mkDerivation rec { echo 'QMAKE_LRELEASE = ${qttools}/bin/lrelease' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local qmake PREFIX=$out build.pro - '' + ( - with (config.golden-cheetah); - stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) '' - echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >> src/gcconfig.pri - echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >> src/gcconfig.pri - ''); + ''; + # + ( + # with (config.golden-cheetah); + # stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) '' + # echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >> src/gcconfig.pri + # echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >> src/gcconfig.pri + # ''); installPhase = '' mkdir -p $out/bin cp src/GoldenCheetah $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 449a17137ae..ca64821e383 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16607,5 +16607,5 @@ in discord = callPackage ../applications/networking/instant-messengers/discord { }; - #golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {}; } From f2cee89b22eb572cfaa24d679a6a6cdf64c5d3d7 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Thu, 21 Apr 2016 11:09:53 -0300 Subject: [PATCH 037/210] factorio: add explict dependency on cacert for chroot build --- pkgs/games/factorio/fetch.nix | 4 ++-- pkgs/games/factorio/fetch.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix index 03dc786492a..78c7faf018c 100644 --- a/pkgs/games/factorio/fetch.nix +++ b/pkgs/games/factorio/fetch.nix @@ -1,4 +1,4 @@ -{ stdenv, curl +{ stdenv, curl, cacert # Begin download parameters , username ? "" , password ? "" @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ curl ]; - inherit url loginUrl username password; + inherit url loginUrl username password cacert; builder = ./fetch.sh; diff --git a/pkgs/games/factorio/fetch.sh b/pkgs/games/factorio/fetch.sh index ad976673686..d6549c0a676 100644 --- a/pkgs/games/factorio/fetch.sh +++ b/pkgs/games/factorio/fetch.sh @@ -8,7 +8,7 @@ source $stdenv/setup curl="curl \ --max-redirs 20 \ --retry 3 \ - --cacert /etc/ssl/certs/ca-bundle.crt \ + --cacert $cacert/etc/ssl/certs/ca-bundle.crt \ $curlOpts \ $NIX_CURL_FLAGS" From 4785ebc471efb4c8b0fb466221de0ca117841413 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 21 Apr 2016 17:12:47 +0300 Subject: [PATCH 038/210] mjpegtools: split, use minimal version by default --- pkgs/tools/video/mjpegtools/default.nix | 25 +++++++++++++++++++++++-- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 33b497fa3eb..4aee9064d72 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gtk, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx }: +{ stdenv, lib, fetchurl, gtk, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx +, withMinimal ? false +}: # TODO: # - make dependencies optional @@ -7,9 +9,28 @@ stdenv.mkDerivation rec { name = "mjpegtools-2.1.0"; + src = fetchurl { url = "mirror://sourceforge/mjpeg/${name}.tar.gz"; sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6"; }; - buildInputs = [ gtk libdv libjpeg libpng libX11 pkgconfig SDL SDL_gfx ]; + + buildInputs = [ libdv libjpeg libpng pkgconfig ] + ++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ]; + + postPatch = '' + sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure + ''; + + enableParallelBuilding = true; + + outputs = [ "out" "lib" ]; + + meta = with stdenv.lib; { + description = "A suite of programs for processing MPEG or MJPEG video"; + homepage = http://mjpeg.sourceforge.net/; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca64821e383..5ee6c190ad4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2378,7 +2378,11 @@ in minixml = callPackage ../development/libraries/minixml { }; - mjpegtools = callPackage ../tools/video/mjpegtools { }; + mjpegtoolsFull = callPackage ../tools/video/mjpegtools { }; + + mjpegtools = self.mjpegtoolsFull.override { + withMinimal = true; + }; mkcue = callPackage ../tools/cd-dvd/mkcue { }; From c6c85c0a58cea2df5f6a1b1ca9356034d9c566f2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 21 Apr 2016 17:13:05 +0300 Subject: [PATCH 039/210] gst_all_1.gst-plugins-bad: add mplex plugin --- pkgs/development/libraries/gstreamer/bad/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 4603b3e29db..330c1d8dfa4 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -4,7 +4,7 @@ , libmodplug, mpeg2dec, mpg123 , openjpeg, libopus, librsvg , wildmidi, fluidsynth, libvdpau, wayland -, libwebp, xvidcore, gnutls +, libwebp, xvidcore, gnutls, mjpegtools , mesa, libintlOrEmpty }: @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { openjpeg libopus librsvg fluidsynth libvdpau libwebp xvidcore gnutls mesa + mjpegtools ] ++ libintlOrEmpty ++ optional faacSupport faac From d713fd1f9f498fa02b07491d2cb16f0cdd4d9c73 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 21 Apr 2016 17:14:15 +0300 Subject: [PATCH 040/210] libdvdcss: 1.3.0 -> 1.4.0 --- pkgs/development/libraries/libdvdcss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index c5cdec0ae5f..ae3ae407a92 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdvdcss-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2"; - sha256 = "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw"; + sha256 = "0nl45ifc4xcb196snv9d6hinfw614cqpzcqp92dg43c0hickg290"; }; meta = with stdenv.lib; { From aad2f71eeec382bd6b261c02e6f5b650359dfd19 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 21 Apr 2016 17:15:47 +0300 Subject: [PATCH 041/210] brasero: 3.12.0 -> 3.12.1 --- pkgs/tools/cd-dvd/brasero/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 91a5440df3e..ff910ad2e49 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify +{ stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify , libcanberra_gtk3, intltool, makeWrapper, dvdauthor, cdrdao -, dvdplusrwtools, cdrtools, libdvdcss, wrapGAppsHook }: +, dvdplusrwtools, cdrtools, vcdimager, wrapGAppsHook }: + +# libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590 let major = "3.12"; - minor = "0"; - binpath = stdenv.lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools cdrtools ]; + minor = "1"; + binpath = lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools vcdimager cdrtools ]; in stdenv.mkDerivation rec { version = "${major}.${minor}"; @@ -13,12 +15,12 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz"; - sha256 = "68fef2699b772fa262d855dac682100dbfea05563a7e4056eff8fe6447aec2fc"; + sha256 = "09vi2hyhl0bz7imv3ky6h7x5m3d546n968wcghydwrkvwm9ylpls"; }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; - buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libdvdcss + buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ]; @@ -27,14 +29,15 @@ in stdenv.mkDerivation rec { # will obviously not work on nix patches = [ ./remove-symlink-check.patch ]; + enableParallelBuilding = true; + configureFlags = [ "--with-girdir=$out/share/gir-1.0" - "--with-typelibdir=$out/lib/girepository-1.0" ]; - - NIX_CFLAGS_LINK = [ "-ldvdcss" ]; + "--with-typelibdir=$out/lib/girepository-1.0" + ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${binpath}") + gappsWrapperArgs+=(--prefix PATH : "${binpath}" --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") ''; meta = with stdenv.lib; { From 456aa48d3847b350476a43da0f8f4879dab7a9db Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 21 Apr 2016 17:16:56 +0300 Subject: [PATCH 042/210] kde4.k3b: add needed binaries to PATH --- pkgs/applications/misc/k3b/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index f48912aeb1e..922dec11180 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,11 +1,17 @@ -{ stdenv, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig -, shared_mime_info, libvorbis, taglib , flac, libsamplerate +{ stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig +, shared_mime_info, libvorbis, taglib, flac, libsamplerate , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao -, cdrtools, dvdplusrwtools, vcdimager, cdparanoia , kdelibs +, cdrtools, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg , kdemultimedia, phonon, libkcddb ? null }: -stdenv.mkDerivation rec { +let + # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format, + # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild, + # vcdxminfo, and vcdxrip + binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager cdrtools ]; + +in stdenv.mkDerivation rec { name = "k3b-2.0.3a"; src = fetchurl { @@ -19,18 +25,16 @@ stdenv.mkDerivation rec { shared_mime_info libvorbis taglib flac libsamplerate libdvdread lame libsndfile libmad stdenv.cc.libc kdelibs kdemultimedia phonon libkcddb makeWrapper cdparanoia + libdvdcss ffmpeg ]; enableParallelBuilding = true; - # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format, - # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild, - # vcdxminfo, and vcdxrip - propagatedUserEnvPkgs = [ cdrdao cdrtools dvdplusrwtools transcode vcdimager ]; + NIX_CFLAGS_LINK = [ "-lcdda_interface" "-lcdda_paranoia" "-ldvdcss" ]; postInstall = '' wrapProgram $out/bin/k3b \ - --prefix LD_LIBRARY_PATH ":" "${cdparanoia}/lib" + --prefix PATH ":" "${binPath}" ''; meta = with stdenv.lib; { From 46ae49fbff86803f855e2c880a900caf9c5a9d44 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 21 Apr 2016 17:19:53 +0300 Subject: [PATCH 043/210] dvd-slideshow: use PATH --- pkgs/applications/video/dvd-slideshow/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 040a7a2e7a6..1506f6e23c9 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }: +{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }: let + binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; + wrapper = writeScript "dvd-slideshow.sh" '' #!/bin/bash # wrapper script for dvd-slideshow programs - export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg.bin}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbis-tools}/bin:$PATH + export PATH=${binPath}:$PATH dir=`dirname "$0"` exe=`basename "$0"` From f1492bf44c839f5d7ba9d809ea71b4e4fb3f08bc Mon Sep 17 00:00:00 2001 From: Robbin C Date: Thu, 21 Apr 2016 22:57:19 +0800 Subject: [PATCH 044/210] tinc-haskell: init at 20160419 --- pkgs/development/tools/misc/tinc/default.nix | 41 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/tools/misc/tinc/default.nix diff --git a/pkgs/development/tools/misc/tinc/default.nix b/pkgs/development/tools/misc/tinc/default.nix new file mode 100644 index 00000000000..44491fa0ef9 --- /dev/null +++ b/pkgs/development/tools/misc/tinc/default.nix @@ -0,0 +1,41 @@ +{ mkDerivation, aeson, base, bytestring, Cabal, containers +, directory, exceptions, filelock, filepath, gitrev, graph-wrapper +, hpack, hspec, HUnit, language-dot, mockery, parsec, process +, QuickCheck, safe, stdenv, temporary, time, transformers, unix +, unix-compat, with-location, yaml, fetchFromGitHub +, ghc, cabal2nix, cabal-install, makeWrapper +}: +mkDerivation { + pname = "tinc"; + version = "20160419"; + src = fetchFromGitHub { + owner = "sol"; + repo = "tinc"; + rev = "b9f7cc1076098b1f99f20655052c9fd34598d891"; + sha256 = "1f0k7a4vxdd2cd2h5qwska9hfw7ig6q2rx87d09fg2xlix96g81r"; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring Cabal containers directory exceptions + filelock filepath gitrev graph-wrapper hpack language-dot parsec + process temporary time transformers unix-compat with-location yaml + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers directory exceptions + filelock filepath gitrev graph-wrapper hpack hspec HUnit + language-dot mockery parsec process QuickCheck safe temporary time + transformers unix unix-compat with-location yaml + ]; + postInstall = '' + source ${makeWrapper}/nix-support/setup-hook + wrapProgram $out/bin/tinc \ + --prefix PATH : '${ghc}/bin' \ + --prefix PATH : '${cabal2nix}/bin' \ + --prefix PATH : '${cabal-install}/bin' + ''; + description = "A dependency manager for Haskell"; + homepage = "https://github.com/sol/tinc#readme"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.robbinch ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec6b5e83065..ffc88d1cf48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6302,6 +6302,8 @@ in texi2html = callPackage ../development/tools/misc/texi2html { }; + tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc { }; + travis = callPackage ../development/tools/misc/travis { }; tweak = callPackage ../applications/editors/tweak { }; From 11e252e5a08e27d189f4688b99b88a4e4859bcee Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Apr 2016 17:16:59 +0200 Subject: [PATCH 045/210] aws-sdk-cpp: 0.9.6 -> 0.10.6 --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 6a881e4245a..1848bd064f1 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "0.9.6"; + version = "0.10.6"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "022v7naa5vjvq3wfn4mcp99li61ffsk2fnc8qqi52cb1pyxz9sk1"; + sha256 = "1x3xam7vprlld6iqhqgdhgmqyclfy8dvzgy3375cijy9akhvv67i"; }; buildInputs = [ cmake curl ]; From 7e934fbf735a29a828d7c2d0b547b8821bbab645 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 21 Apr 2016 19:47:02 +0300 Subject: [PATCH 046/210] android-studio: 2.0.0.0 -> 2.0.0.20 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 5d20d0578ea..e93e5840b69 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -148,14 +148,14 @@ in android-studio = buildAndroidStudio rec { name = "android-studio-${version}"; - version = "2.0.0.0"; - build = "143.2443734"; + version = "2.0.0.20"; + build = "143.2739321"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${build}-linux.zip"; - sha256 = "0j6bi87hb5jxjwfhfya64s673vdkdslsqc6sqa4zl97sabvafk2w"; + sha256 = "14bb4ha868015wm8v8vivxfylfzm7gbvf01h82w4bhzdbzgn1zpr"; }; }; From 1e4ebcdf2db23881f9430b290f330d3963079999 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Thu, 21 Apr 2016 14:50:03 -0400 Subject: [PATCH 047/210] redis: enable Lua scripting support --- pkgs/servers/nosql/redis/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 04bb9fc2bbd..16a2ec21079 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lua }: stdenv.mkDerivation rec { version = "3.0.7"; @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { sha256 = "08vzfdr67gp3lvk770qpax2c5g2sx8hn6p64jn3jddrvxb2939xj"; }; + buildInputs = [ lua ]; makeFlags = "PREFIX=$(out)"; enableParallelBuilding = true; From ba08f0014de4456fbd2ae3bed4726d2f1121aa1b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 21 Apr 2016 23:03:46 +0200 Subject: [PATCH 048/210] libraw: 0.17.0 -> 0.17.1 --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 031886d3451..ee842b0c4bd 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.17.0"; + version = "0.17.1"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6"; + sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5"; }; buildInputs = [ lcms2 jasper ]; From e59151f3ef01911a5ba86782bed5cb72982811f0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 22 Apr 2016 00:54:31 +0200 Subject: [PATCH 049/210] nix-binary-cache: take into account Nix split (mulitple-outputs) --- pkgs/servers/http/nix-binary-cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 674557d74fc..33801c8cd32 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --replace @shell@ "${stdenv.shell}" \ --replace @coreutils@ "${coreutils}/bin" \ --replace @findutils@ "${findutils}/bin" \ - --replace @nix@ "${nix}/bin" \ + --replace @nix@ "${nix.out}/bin" \ --replace @xz@ "${xz.bin}/bin" \ --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --replace @shell@ "${stdenv.shell}" \ --replace @coreutils@ "${coreutils}/bin" \ --replace @findutils@ "${findutils}/bin" \ - --replace @nix@ "${nix}/bin" \ + --replace @nix@ "${nix.out}/bin" \ --replace @xz@ "${xz.bin}/bin" \ --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ From 38aa457f9a9cac462a9c952f459631b0ebf951a5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 22 Apr 2016 00:57:21 +0200 Subject: [PATCH 050/210] sgtpuzzles: add a .upstream file for autoupdating --- pkgs/games/sgt-puzzles/default.upstream | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 pkgs/games/sgt-puzzles/default.upstream diff --git a/pkgs/games/sgt-puzzles/default.upstream b/pkgs/games/sgt-puzzles/default.upstream new file mode 100644 index 00000000000..b6d048b68ae --- /dev/null +++ b/pkgs/games/sgt-puzzles/default.upstream @@ -0,0 +1,5 @@ +minimize_overwrite +url http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles.tar.gz +redirect +NEED_TO_CHOOSE_URL= +version '.*[-_.]([0-9]{8}[.][^.]+)[.]tar[.].*' '\1' From 0ddf8c7f6fd4241e26016327ec85c5b958bdc32c Mon Sep 17 00:00:00 2001 From: Andrew Burkett Date: Thu, 21 Apr 2016 15:01:44 -0700 Subject: [PATCH 051/210] scrapy: init at 1.0.5 --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 60 ++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 717d04e2031..1140362c16e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -102,6 +102,7 @@ dmalikov = "Dmitry Malikov "; dochang = "Desmond O. Chang "; doublec = "Chris Double "; + drewkett = "Andrew Burkett "; ebzzry = "Rommel Martinez "; ederoyd46 = "Matthew Brown "; eduarrrd = "Eduard Bachmakov "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d1e2026a82..77974dff752 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26423,4 +26423,64 @@ in modules // { }; }; + w3lib = buildPythonPackage rec { + name = "w3lib-${version}"; + version = "1.14.2"; + + buildInputs = with self ; [ six pytest ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/w3lib/${name}.tar.gz"; + sha256 = "bd87eae62d208eef70869951abf05e96a8ee559714074a485168de4c5b190004"; + }; + + meta = { + description = "A library of web-related functions"; + homepage = "https://github.com/scrapy/w3lib"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewkett ]; + }; + }; + + queuelib = buildPythonPackage rec { + name = "queuelib-${version}"; + version = "1.4.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/q/queuelib/${name}.tar.gz"; + sha256 = "a6829918157ed433fafa87b0bb1e93e3e63c885270166db5884a02c34c86f914"; + }; + + buildInputs = with self ; [ pytest ]; + + meta = { + description = "A collection of persistent (disk-based) queues for Python"; + homepage = "https://github.com/scrapy/queuelib"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewkett ]; + }; + }; + + scrapy = buildPythonPackage rec { + name = "Scrapy-${version}"; + version = "1.0.5"; + + disabled = isPy3k; + + buildInputs = with self ; [ pytest ]; + propagatedBuildInputs = with self ; [ six twisted w3lib lxml cssselect queuelib pyopenssl service-identity ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/S/Scrapy/${name}.tar.gz"; + sha256 = "0a51c785a310d65f6e70285a2da56d48ef7d049bd7fd60a08eef05c52328ca96"; + }; + + meta = { + description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; + homepage = "http://scrapy.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewkett ]; + platforms = platforms.linux; + }; + }; } From 9c0997a0ef62d178d6bc88aeacc2643481edef9e Mon Sep 17 00:00:00 2001 From: William Casarin Date: Tue, 12 Apr 2016 13:31:47 -0700 Subject: [PATCH 052/210] hoogle service: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/development/hoogle.nix | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 nixos/modules/services/development/hoogle.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e59ec07b8aa..41210e64851 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -158,6 +158,7 @@ ./services/desktops/gnome3/tracker.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix + ./services/development/hoogle.nix ./services/games/factorio.nix ./services/games/ghost-one.nix ./services/games/minecraft-server.nix diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix new file mode 100644 index 00000000000..27281774b6f --- /dev/null +++ b/nixos/modules/services/development/hoogle.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: + +# services.hoogle = { +# enable = true; +# packages = hp: with hp; [ text lens ]; +# haskellPackages = pkgs.haskellPackages; +# }; + +with lib; + +let + + cfg = config.services.hoogle; + ghcWithHoogle = pkgs.haskellPackages.ghcWithHoogle; + +in { + + options.services.hoogle = { + enable = mkEnableOption "Hoogle Documentation service"; + + port = mkOption { + type = types.int; + default = 8080; + description = '' + Port number Hoogle will be listening to. + ''; + }; + + packages = mkOption { + default = hp: []; + example = "hp: with hp; [ text lens ]"; + description = '' + A function that returns a list of Haskell packages to generate + documentation for. + + The argument will be a Haskell package set provided by the + haskellPackages config option. + ''; + }; + + haskellPackages = mkOption { + description = "Which haskell package set to use."; + example = "pkgs.haskellPackages"; + type = types.attrs; + }; + + }; + + config = mkIf cfg.enable { + systemd.services.hoogle = { + description = "Hoogle Haskell documentation search"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Restart = "always"; + ExecStart = + let env = cfg.haskellPackages.ghcWithHoogle cfg.packages; + hoogleEnv = pkgs.buildEnv { + name = "hoogleServiceEnv"; + paths = [env]; + }; + in '' + ${hoogleEnv}/bin/hoogle server --local -p ${toString cfg.port} + ''; + }; + }; + }; + +} From 2e7b0bbd2244d6314b83cdd4868cc30dfda96575 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 22 Apr 2016 02:28:29 +0200 Subject: [PATCH 053/210] hoogle service: fixups Basic hardening - Run as nobody:nogroup with a private /tmp, /home & /run/user - Create working directory under /run (hoogle insists on writing to cwd and otherwise returns "something went wrong" to every query) Option tweaks - Provide a default for the haskellPackage option - Set text values for defaults - Move hoogleEnv to the top-level & simplify it --- nixos/modules/services/development/hoogle.nix | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix index 27281774b6f..90aa04d2762 100644 --- a/nixos/modules/services/development/hoogle.nix +++ b/nixos/modules/services/development/hoogle.nix @@ -1,22 +1,20 @@ { config, lib, pkgs, ... }: -# services.hoogle = { -# enable = true; -# packages = hp: with hp; [ text lens ]; -# haskellPackages = pkgs.haskellPackages; -# }; - with lib; let cfg = config.services.hoogle; - ghcWithHoogle = pkgs.haskellPackages.ghcWithHoogle; + + hoogleEnv = pkgs.buildEnv { + name = "hoogle"; + paths = [ (cfg.haskellPackages.ghcWithHoogle cfg.packages) ]; + }; in { options.services.hoogle = { - enable = mkEnableOption "Hoogle Documentation service"; + enable = mkEnableOption "Haskell documentation server"; port = mkOption { type = types.int; @@ -28,39 +26,43 @@ in { packages = mkOption { default = hp: []; + defaultText = "hp: []"; example = "hp: with hp; [ text lens ]"; description = '' - A function that returns a list of Haskell packages to generate - documentation for. + The Haskell packages to generate documentation for. - The argument will be a Haskell package set provided by the - haskellPackages config option. + The option value is a function that takes the package set specified in + the haskellPackages option as its sole parameter and + returns a list of packages. ''; }; haskellPackages = mkOption { description = "Which haskell package set to use."; - example = "pkgs.haskellPackages"; - type = types.attrs; + default = pkgs.haskellPackages; + defaultText = "pkgs.haskellPackages"; }; }; config = mkIf cfg.enable { systemd.services.hoogle = { - description = "Hoogle Haskell documentation search"; + description = "Haskell documentation server"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { Restart = "always"; - ExecStart = - let env = cfg.haskellPackages.ghcWithHoogle cfg.packages; - hoogleEnv = pkgs.buildEnv { - name = "hoogleServiceEnv"; - paths = [env]; - }; - in '' - ${hoogleEnv}/bin/hoogle server --local -p ${toString cfg.port} - ''; + ExecStart = ''${hoogleEnv}/bin/hoogle server --local -p ${toString cfg.port}''; + + User = "nobody"; + Group = "nogroup"; + + PrivateTmp = true; + ProtectHome = true; + + RuntimeDirectory = "hoogle"; + WorkingDirectory = "%t/hoogle"; }; }; }; From 672efb940f343ad0947b2d7fb125a6df38a5b079 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 22 Apr 2016 04:08:21 +0200 Subject: [PATCH 054/210] torbrowser: fix torEnv after multiple-outputs --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index ef00a8538a9..75cc832f85b 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -6,9 +6,9 @@ let torEnv = buildEnv { name = "tor-env"; paths = [ - stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype - fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext - xorg.libXt + stdenv.cc.cc.lib zlib glib alsaLib dbus.lib dbus_glib gtk atk pango.out + freetype fontconfig.lib gdk_pixbuf cairo xorg.libXrender xorg.libX11 + xorg.libXext xorg.libXt ]; }; From f3fd0dcd90dfe9738627be31a9f1e64717545b53 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 21 Apr 2016 19:10:10 -0700 Subject: [PATCH 055/210] plex: plexpass: 0.9.16.4.1911 -> 0.9.16.5.1966 --- pkgs/servers/plex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 22a5c852e15..50fc85d48b3 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -5,9 +5,9 @@ let plexpkg = if enablePlexPass then { - version = "0.9.16.4.1911"; - vsnHash = "ee6e505"; - sha256 = "0lq0lcynmc09d0whynb0x2zgd39dp7z7k86ndgm2clay3zbzqpfd"; + version = "0.9.16.5.1966"; + vsnHash = "81a3bf0"; + sha256 = "1sgdd3r067j9ysfp90wjx6zi01s00wzgzs27l8xdlsbnvjr8zmf8"; } else { version = "0.9.16.4.1911"; vsnHash = "ee6e505"; From 008d47131f41248bd0917424871ac6dd126a3b09 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 22 Apr 2016 04:14:21 +0200 Subject: [PATCH 056/210] Revert "torbrowser: fix torEnv after multiple-outputs" This reverts commit 672efb940f343ad0947b2d7fb125a6df38a5b079. This is a terrible fix, use buildEnv's extraOutputsToInstall instead. --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 75cc832f85b..ef00a8538a9 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -6,9 +6,9 @@ let torEnv = buildEnv { name = "tor-env"; paths = [ - stdenv.cc.cc.lib zlib glib alsaLib dbus.lib dbus_glib gtk atk pango.out - freetype fontconfig.lib gdk_pixbuf cairo xorg.libXrender xorg.libX11 - xorg.libXext xorg.libXt + stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype + fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext + xorg.libXt ]; }; From 0122cbfd5905d228a43c2e176836c9e577c33bb7 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 22 Apr 2016 04:19:11 +0200 Subject: [PATCH 057/210] torbrowser: also install lib and out into the torEnv --- pkgs/tools/security/tor/torbrowser.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index ef00a8538a9..c320e7e58b6 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -10,6 +10,7 @@ let fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext xorg.libXt ]; + extraOutputsToInstall = [ "lib" "out" ]; }; ldLibraryPath = ''${torEnv}/lib${stdenv.lib.optionalString stdenv.is64bit ":${torEnv}/lib64"}''; From 390abc547b709eceb333d80d4478baf091c4303d Mon Sep 17 00:00:00 2001 From: Micxjo Funkcio Date: Thu, 21 Apr 2016 20:31:58 -0700 Subject: [PATCH 058/210] gnuplot: 5.0.0 -> 5.0.3 --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 2b78f1fba40..5c70d0e7d0a 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.0.0"; + name = "gnuplot-5.0.3"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1bqg6zbsin9w9m53rbf6adzv0j2gs66z2p5pkd060jlipk2lnza1"; + sha256 = "05f7p21d2b0r3h0af8i75bh2inx9pws1k4crx5c400927xgy6vjz"; }; buildInputs = From 50d6c3ba3874c5b79750868786ca0de9982390b4 Mon Sep 17 00:00:00 2001 From: Sheena Artrip Date: Fri, 22 Apr 2016 02:39:42 -0400 Subject: [PATCH 059/210] virtualbox: obey NIX_BUILD_CORES for make invocation --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f09480ba394..371acbed5e6 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -33,7 +33,7 @@ let "$mod/Module.symvers" fi INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ - make -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \ + make -j $NIX_BUILD_CORES -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \ "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action} done ''; @@ -144,7 +144,7 @@ in stdenv.mkDerivation { buildPhase = '' source env.sh - kmk BUILD_TYPE="${buildType}" + kmk -j $NIX_BUILD_CORES BUILD_TYPE="${buildType}" ${forEachModule "modules"} ''; From f1675d9137f97d125a0bfbc5977b1b4778b78629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 22 Apr 2016 09:29:39 +0200 Subject: [PATCH 060/210] tsocks: use musl instead of glibc --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ee6c190ad4..61f714c3ad9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8953,7 +8953,11 @@ in unicap = callPackage ../development/libraries/unicap {}; - tsocks = callPackage ../development/libraries/tsocks { }; + tsocks = callPackage ../development/libraries/tsocks { + stdenv = overrideCC stdenv ( + wrapCCWith (callPackage ../build-support/cc-wrapper) + musl "" gcc.cc); + }; unixODBC = callPackage ../development/libraries/unixODBC { }; From 01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 22 Apr 2016 10:40:57 +0300 Subject: [PATCH 061/210] treewide: Replace module_init_tools -> kmod The former is deprecated and doesn't handle compressed kernel modules, so all current usages of it are broken. --- .../hardware/video/webcam/facetimehd.nix | 4 +-- .../openafs-client/default.nix | 4 +-- nixos/modules/virtualisation/qemu-vm.nix | 10 +++---- pkgs/build-support/vm/default.nix | 28 +++++++++---------- .../os-specific/linux/pcmciautils/default.nix | 6 ++-- pkgs/os-specific/linux/pm-utils/default.nix | 4 +-- pkgs/tools/X11/bumblebee/default.nix | 6 ++-- pkgs/tools/misc/tlp/default.nix | 4 +-- .../network-manager/openconnect.nix | 4 +-- .../networking/network-manager/openvpn.nix | 4 +-- .../tools/networking/network-manager/vpnc.nix | 4 +-- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix index b35709763b9..309cedca48b 100644 --- a/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -31,13 +31,13 @@ in # unload module during suspend/hibernate as it crashes the whole system powerManagement.powerDownCommands = '' - ${pkgs.module_init_tools}/bin/rmmod -f facetimehd + ${pkgs.kmod}/bin/rmmod -f facetimehd ''; # and load it back on resume powerManagement.resumeCommands = '' export MODULE_DIR=/run/current-system/kernel-modules/lib/modules - ${pkgs.module_init_tools}/bin/modprobe -v facetimehd + ${pkgs.kmod}/bin/modprobe -v facetimehd ''; }; diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 7a44fc1ea5e..61c66bb8835 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -80,7 +80,7 @@ in preStart = '' mkdir -p -m 0755 /afs mkdir -m 0700 -p ${cfg.cacheDirectory} - ${pkgs.module_init_tools}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true + ${pkgs.kmod}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} ''; @@ -92,7 +92,7 @@ in preStop = '' ${pkgs.utillinux}/bin/umount /afs ${openafsPkgs}/sbin/afsd -shutdown - ${pkgs.module_init_tools}/sbin/rmmod libafs + ${pkgs.kmod}/sbin/rmmod libafs ''; }; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 7dfbc38efee..7269fae5194 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -149,11 +149,11 @@ let ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot # Mount /boot; load necessary modules first. - ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko || true - ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko || true - ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko || true - ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko || true - ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko || true mkdir /boot mount /dev/vda2 /boot diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index e670e1ef225..2d33a197346 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -329,14 +329,14 @@ rec { buildInputs = [ utillinux ]; buildCommand = '' ln -s ${linux}/lib /lib - ${module_init_tools}/bin/modprobe loop - ${module_init_tools}/bin/modprobe ext4 - ${module_init_tools}/bin/modprobe hfs - ${module_init_tools}/bin/modprobe hfsplus - ${module_init_tools}/bin/modprobe squashfs - ${module_init_tools}/bin/modprobe iso9660 - ${module_init_tools}/bin/modprobe ufs - ${module_init_tools}/bin/modprobe cramfs + ${kmod}/bin/modprobe loop + ${kmod}/bin/modprobe ext4 + ${kmod}/bin/modprobe hfs + ${kmod}/bin/modprobe hfsplus + ${kmod}/bin/modprobe squashfs + ${kmod}/bin/modprobe iso9660 + ${kmod}/bin/modprobe ufs + ${kmod}/bin/modprobe cramfs mknod /dev/loop0 b 7 0 mkdir -p $out @@ -355,12 +355,12 @@ rec { buildInputs = [ utillinux mtdutils ]; buildCommand = '' ln -s ${linux}/lib /lib - ${module_init_tools}/bin/modprobe mtd - ${module_init_tools}/bin/modprobe mtdram total_size=131072 - ${module_init_tools}/bin/modprobe mtdchar - ${module_init_tools}/bin/modprobe mtdblock - ${module_init_tools}/bin/modprobe jffs2 - ${module_init_tools}/bin/modprobe zlib + ${kmod}/bin/modprobe mtd + ${kmod}/bin/modprobe mtdram total_size=131072 + ${kmod}/bin/modprobe mtdchar + ${kmod}/bin/modprobe mtdblock + ${kmod}/bin/modprobe jffs2 + ${kmod}/bin/modprobe zlib mknod /dev/mtd0 c 90 0 mknod /dev/mtdblock0 b 31 0 diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index ce5814965ef..3e41df9465f 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , yacc, flex -, sysfsutils, module_init_tools, udev +, sysfsutils, kmod, udev , firmware # Special pcmcia cards. , config # Special hardware (map memory & port & irq) , lib # used to generate postInstall script. @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { sha256 = "5d8e2efad8a7f692129610603da232f2144851753d8d49a70eeb8eb1be6f6bc3"; }; - buildInputs = [udev yacc sysfsutils module_init_tools flex]; + buildInputs = [udev yacc sysfsutils kmod flex]; patchPhase = '' sed -i " - s,/sbin/modprobe,${module_init_tools}&,; + s,/sbin/modprobe,${kmod}&,; s,/lib/udev/,$out/sbin/,; " udev/* # fix-color */ sed -i " diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 19315ec2d0b..cb74dc204a3 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, coreutils, gnugrep, utillinux, module_init_tools +{ stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod , procps, kbd, dbus_tools }: let binPath = stdenv.lib.makeBinPath - [ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ]; + [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ]; sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"] [ procps ]; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index d1f2318d6d4..803fd0dd850 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -18,7 +18,7 @@ { stdenv, lib, fetchurl, pkgconfig, help2man, makeWrapper , glib, libbsd -, libX11, libXext, xorgserver, xkbcomp, module_init_tools, xkeyboard_config, xf86videonouveau +, libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau , nvidia_x11, virtualgl, primusLib # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. @@ -43,7 +43,7 @@ let nvidiaLibs = lib.makeLibraryPath nvidia_x11s; - bbdPath = lib.makeBinPath [ module_init_tools xorgserver ]; + bbdPath = lib.makeBinPath [ kmod xorgserver ]; bbdLibs = lib.makeLibraryPath [ libX11 libXext ]; xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { # be in PATH, and thus no action for them is required. substituteInPlace src/module.c \ - --replace "/sbin/modinfo" "${module_init_tools}/sbin/modinfo" + --replace "/sbin/modinfo" "${kmod}/sbin/modinfo" # Don't use a special group, just reuse wheel. substituteInPlace configure \ diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index e20dc850008..d290c9f9a5a 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils -, module_init_tools, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils +, kmod, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils , enableRDW ? false, networkmanager }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation { buildInputs = [ perl ]; paths = lib.makeBinPath - ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools + ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools x86_energy_perf_policy gawk gnugrep coreutils ] ++ lib.optional enableRDW networkmanager diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 0009aaf6b44..6a93100fa10 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-openconnect-service.c" \ --replace "/usr/sbin/openconnect" "${openconnect}/sbin/openconnect" \ - --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; postConfigure = '' diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index be026457195..4b98600611e 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-openvpn-service.c" \ --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" \ - --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" substituteInPlace "properties/auth-helpers.c" \ --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" ''; diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 5f3ab00ebc4..64de5408c7e 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-vpnc-service.c" \ --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \ - --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; postConfigure = '' From d0c127487fd607c9c66cb0a1a4d1eb9782632ae1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 22 Apr 2016 10:42:31 +0300 Subject: [PATCH 062/210] qemu-img: Fix module paths They are compressed nowadays. Not sure if these are really needed since nobody noticed they were broken, but anyway... --- nixos/modules/virtualisation/qemu-vm.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 7269fae5194..d9b866d2e55 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -149,11 +149,11 @@ let ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot # Mount /boot; load necessary modules first. - ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko || true - ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko || true - ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko || true - ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko || true - ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true mkdir /boot mount /dev/vda2 /boot From 0f8a49bb4511b29985d426d3e1b0e83c9d3eb763 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 22 Apr 2016 10:44:55 +0300 Subject: [PATCH 063/210] module_init_tools: Remove It is deprecated doesn't handle compressed modules, unlike its modern counterpart kmod. Add a compatibility alias to kmod for now in case someone is depending on this in their scripts. --- .../linux/module-init-tools/default.nix | 38 ----- .../linux/module-init-tools/docbook2man.patch | 12 -- .../linux/module-init-tools/module-dir.patch | 161 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/release-small.nix | 1 - 6 files changed, 1 insertion(+), 214 deletions(-) delete mode 100644 pkgs/os-specific/linux/module-init-tools/default.nix delete mode 100644 pkgs/os-specific/linux/module-init-tools/docbook2man.patch delete mode 100644 pkgs/os-specific/linux/module-init-tools/module-dir.patch diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix deleted file mode 100644 index ded6e77e43b..00000000000 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }: - -assert (stdenv.lib.elem stdenv.system stdenv.lib.platforms.linux); - -stdenv.mkDerivation { - name = "module-init-tools-3.16"; - - src = [ - (fetchurl { - url = http://ftp.be.debian.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2; - sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1"; - }) - - # Upstream forgot to include the generated manpages. Thankfully - # the Gentoo people fixed this for us :-) - (fetchurl { - urls = [ - mirror://gentoo/distfiles/module-init-tools-3.16-man.tar.bz2 - http://mirror.meleeweb.net/pub/linux/gentoo/distfiles/module-init-tools-3.16-man.tar.bz2 - ]; - sha256 = "1j1nzi87kgsh4scl645fhwhjvljxj83cmdasa4n4p5krhasgw358"; - }) - ]; - - buildInputs = [ stdenv.glibc.dev stdenv.glibc.static ]; - - SGML_CATALOG_FILES = "${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat"; - - patches = [ ./module-dir.patch ./docbook2man.patch ]; - - postInstall = "rm $out/sbin/insmod.static"; # don't need it - - meta = { - homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/; - description = "Tools for loading and managing Linux kernel modules"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/module-init-tools/docbook2man.patch b/pkgs/os-specific/linux/module-init-tools/docbook2man.patch deleted file mode 100644 index 4de07b658a9..00000000000 --- a/pkgs/os-specific/linux/module-init-tools/docbook2man.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur module-init-tools-3.16-orig/Makefile.in module-init-tools-3.16/Makefile.in ---- module-init-tools-3.16-orig/Makefile.in 2011-06-02 13:56:45.000000000 -0400 -+++ module-init-tools-3.16/Makefile.in 2011-10-01 23:59:30.584443193 -0400 -@@ -174,7 +174,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DOCBOOKTOMAN = @DOCBOOKTOMAN@ -+DOCBOOKTOMAN = @DOCBOOKTOMAN@ --sgml - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ diff --git a/pkgs/os-specific/linux/module-init-tools/module-dir.patch b/pkgs/os-specific/linux/module-init-tools/module-dir.patch deleted file mode 100644 index 95c7559604d..00000000000 --- a/pkgs/os-specific/linux/module-init-tools/module-dir.patch +++ /dev/null @@ -1,161 +0,0 @@ -commit cf2c95edb7918bc658f6cae93793c1949fc9cb6e -Author: David Guibert -Date: Fri Aug 5 14:20:12 2011 +0200 - - introduce module-dir - -diff --git a/depmod.c b/depmod.c -index a1d2f8c..9362a35 100644 ---- a/depmod.c -+++ b/depmod.c -@@ -48,9 +48,6 @@ - - #include "testing.h" - --#ifndef MODULE_DIR --#define MODULE_DIR "/lib/modules/" --#endif - - #ifndef MODULE_BUILTIN_KEY - #define MODULE_BUILTIN_KEY "built-in" -@@ -1516,6 +1513,7 @@ static int parse_config_file(const char *filename, - char *line; - unsigned int linenum = 0; - FILE *cfile; -+ char *module_dir; - - cfile = fopen(filename, "r"); - if (!cfile) { -@@ -1525,6 +1523,10 @@ static int parse_config_file(const char *filename, - return 0; - } - -+ if((module_dir = getenv("MODULE_DIR")) == NULL) { -+ module_dir = "/lib/modules/"; -+ } -+ - while ((line = getline_wrapped(cfile, &linenum)) != NULL) { - char *ptr = line; - char *cmd, *modname; -@@ -1550,7 +1552,7 @@ static int parse_config_file(const char *filename, - continue; - } - nofail_asprintf(&dirname, "%s%s%s/%s", basedir, -- MODULE_DIR, kernelversion, search_path); -+ module_dir, kernelversion, search_path); - len = strlen(dirname); - *search = add_search(dirname, len, *search); - free(dirname); -@@ -1565,7 +1567,7 @@ static int parse_config_file(const char *filename, - continue; - - nofail_asprintf(&pathname, "%s%s%s/%s/%s.ko", basedir, -- MODULE_DIR, kernelversion, subdir, modname); -+ module_dir, kernelversion, subdir, modname); - - *overrides = add_override(pathname, *overrides); - free(pathname); -@@ -1737,6 +1739,7 @@ int main(int argc, char *argv[]) - char *basedir = "", *dirname, *version; - char *system_map = NULL, *module_symvers = NULL; - int i; -+ char *module_dir; - const char *config = NULL; - - if (native_endianness() == 0) -@@ -1832,7 +1835,11 @@ int main(int argc, char *argv[]) - if (optind == argc) - all = 1; - -- nofail_asprintf(&dirname, "%s%s%s", basedir, MODULE_DIR, version); -+ if((module_dir = getenv("MODULE_DIR")) == NULL) { -+ module_dir = "/lib/modules/"; -+ } -+ -+ nofail_asprintf(&dirname, "%s%s%s", basedir, module_dir, version); - - if (maybe_all) { - if (!doing_stdout && !depfile_out_of_date(dirname)) -@@ -1850,7 +1857,7 @@ int main(int argc, char *argv[]) - size_t len; - - nofail_asprintf(&dirname, "%s%s%s/updates", basedir, -- MODULE_DIR, version); -+ module_dir, version); - len = strlen(dirname); - search = add_search(dirname, len, search); - } -diff --git a/modinfo.c b/modinfo.c -index 1dd8469..67b1041 100644 ---- a/modinfo.c -+++ b/modinfo.c -@@ -19,9 +19,6 @@ - #include "zlibsupport.h" - #include "testing.h" - --#ifndef MODULE_DIR --#define MODULE_DIR "/lib/modules" --#endif - - struct param - { -@@ -193,6 +190,11 @@ static struct elf_file *grab_module(const char *name, - struct utsname buf; - char *depname, *p, *moddir; - struct elf_file *module; -+ char *module_dir; -+ -+ if((module_dir = getenv("MODULE_DIR")) == NULL) { -+ module_dir = "/lib/modules/"; -+ } - - if (strchr(name, '.') || strchr(name, '/')) { - module = grab_elf_file(name); -@@ -207,9 +209,9 @@ static struct elf_file *grab_module(const char *name, - kernel = buf.release; - } - if (strlen(basedir)) -- nofail_asprintf(&moddir, "%s/%s/%s", basedir, MODULE_DIR, kernel); -+ nofail_asprintf(&moddir, "%s/%s/%s", basedir, module_dir, kernel); - else -- nofail_asprintf(&moddir, "%s/%s", MODULE_DIR, kernel); -+ nofail_asprintf(&moddir, "%s/%s", module_dir, kernel); - - /* Search for it in modules.dep. */ - nofail_asprintf(&depname, "%s/%s", moddir, "modules.dep"); -diff --git a/modprobe.c b/modprobe.c -index 5464f45..d9fbf9d 100644 ---- a/modprobe.c -+++ b/modprobe.c -@@ -86,10 +86,6 @@ typedef enum - - } modprobe_flags_t; - --#ifndef MODULE_DIR --#define MODULE_DIR "/lib/modules" --#endif -- - /** - * print_usage - output the prefered program usage - * -@@ -2136,6 +2132,7 @@ int main(int argc, char *argv[]) - struct modprobe_conf conf = {}; - - recursion_depth = 0; -+ char *module_dir = NULL; - - /* Prepend options from environment. */ - argv = merge_args(getenv("MODPROBE_OPTIONS"), argv, &argc); -@@ -2233,7 +2230,11 @@ int main(int argc, char *argv[]) - if (argc < optind + 1 && !dump_config && !list_only) - print_usage(argv[0]); - -- nofail_asprintf(&dirname, "%s%s/%s", basedir, MODULE_DIR, buf.release); -+ if((module_dir = getenv("MODULE_DIR")) == NULL) { -+ module_dir = "/lib/modules"; -+ } -+ -+ nofail_asprintf(&dirname, "%s%s/%s", basedir, module_dir, buf.release); - - /* Old-style -t xxx wildcard? Only with -l. */ - if (list_only) { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 23e05eb6c9e..40083d8bf4f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -59,6 +59,7 @@ doNotDisplayTwice rec { manpages = man-pages; # added 2015-12-06 midoriWrapper = midori; # added 2015-01 mlt-qt5 = qt5.mlt; # added 2015-12-19 + module_init_tools = kmod; # added 2016-04-22 mssys = ms-sys; # added 2015-12-13 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6beb15d2ba..7d069d01f95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10870,8 +10870,6 @@ in mmc-utils = callPackage ../os-specific/linux/mmc-utils { }; - module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; - aggregateModules = modules: callPackage ../os-specific/linux/kmod/aggregator.nix { inherit modules; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index bd2223b4b04..0ccb160e4f6 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -105,7 +105,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; mingetty = linux; mk = linux; mktemp = all; - module_init_tools = linux; mono = linux; monotone = linux; mpg321 = linux; From 3148c7e45bdaa786ec776d8a49cef6a84d719b03 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 16 Apr 2016 14:22:59 +0200 Subject: [PATCH 064/210] pcapfix: init at 1.1.0 --- pkgs/tools/networking/pcapfix/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/networking/pcapfix/default.nix diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix new file mode 100644 index 00000000000..0c5035f2d39 --- /dev/null +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pcapfix-1.1.0"; + + src = fetchurl { + url = "https://f00l.de/pcapfix/${name}.tar.gz"; + sha256 = "025jpsqav9wg9lql7jfpd67z1113j8gzmjc5nqf5q07b01nnpfgj"; + }; + + postPatch = ''sed -i "s|/usr|$out|" Makefile''; + + meta = with stdenv.lib; + { homepage = "https://f00l.de/pcapfix/"; + description = "Repair your broken pcap and pcapng files"; + license = licenses.gpl3; + maintainers = [ maintainers.ehmry ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61f714c3ad9..b8a73642055 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2783,6 +2783,8 @@ in patchage = callPackage ../applications/audio/patchage { }; + pcapfix = callPackage ../tools/networking/pcapfix { }; + pbzip2 = callPackage ../tools/compression/pbzip2 { }; pciutils = callPackage ../tools/system/pciutils { }; From 71e0ce571b6fcd9a1a702c4198c9892b22b50fe7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Apr 2016 11:52:15 +0200 Subject: [PATCH 065/210] csdp: fix build on Darwin When the `INSTALL` file is present, `make` claims that the `install` target is up-to-date. --- pkgs/applications/science/math/csdp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index 64fa4579949..67a0834c00d 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { ''; preInstall = '' + rm -f INSTALL mkdir -p $out/bin ''; From a05ba7375d6b6f31b36d3cf36006bdcdadde06b7 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 12 Apr 2016 12:05:03 +0300 Subject: [PATCH 066/210] quassel: use qt4 version of the daemon because as of now qt5 version fails to use proxies(connection refused) --- nixos/modules/services/networking/quassel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 52c7ac8e689..99269c49e8f 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -3,7 +3,7 @@ with lib; let - quassel = pkgs.quasselDaemon_qt5; + quassel = pkgs.kde4.quasselDaemon; cfg = config.services.quassel; user = if cfg.user != null then cfg.user else "quassel"; in From 594416b210722ccfc653fe58c1d9c9cad8fefb35 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Fri, 22 Apr 2016 12:31:09 +0200 Subject: [PATCH 067/210] nodejs: 5.10.1 -> 5.11.0 --- pkgs/development/web/nodejs/v5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix index 5cb87ecc076..d051b4850c1 100644 --- a/pkgs/development/web/nodejs/v5.nix +++ b/pkgs/development/web/nodejs/v5.nix @@ -6,7 +6,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "5.10.1"; + version = "5.11.0"; deps = { inherit openssl zlib libuv; @@ -30,7 +30,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1kdaahq3h89c7mz2qbqx43qdigsswl1i8ll5vw6j8g5m2av7iqn6"; + sha256 = "14ayv5rgagc6lj7fil0bdbzwj2qxj5picw802rfmmpj9kqdb0hgg"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; From a63aa838753dc8650e335ab555949df9b2603da1 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 22 Apr 2016 14:35:49 +0300 Subject: [PATCH 068/210] qtcreator: fix build --- pkgs/development/qtcreator/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index a5dde0a580b..a5005932103 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -25,8 +25,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = '' + configurePhase = '' + runHook preConfigure qmake -spec linux-g++ qtcreator.pro + runHook postConfigure ''; buildFlags = optionalString withDocumentation " docs"; From 6185f74531b1610fb0e71a4f057e6dbeeb116616 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 22 Apr 2016 13:51:11 +0300 Subject: [PATCH 069/210] atom, electron, vscode: split dependencies to atomEnv fixes #14890 --- pkgs/applications/editors/atom/default.nix | 34 ++++++-------------- pkgs/applications/editors/atom/env.nix | 19 +++++++++++ pkgs/applications/editors/vscode/default.nix | 27 ++++++---------- pkgs/development/tools/electron/default.nix | 30 ++++++----------- pkgs/development/tools/electron/env-atom.nix | 17 ---------- pkgs/top-level/all-packages.nix | 13 +++----- 6 files changed, 52 insertions(+), 88 deletions(-) create mode 100644 pkgs/applications/editors/atom/env.nix delete mode 100644 pkgs/development/tools/electron/env-atom.nix diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 9f8f6f5fd0c..5cad049ba32 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,20 +1,6 @@ -{ stdenv, fetchurl, lib, makeDesktopItem, makeWrapper, zlib, glib, alsaLib -, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, gvfs, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd -}: +{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv }: -let - atomPkgs = [ - stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 - fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor libcap systemd - ]; - atomLib = lib.makeLibraryPath atomPkgs; - atomLib64 = lib.makeSearchPathOutputs "lib64" ["lib"] atomPkgs; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "atom-${version}"; version = "1.6.2"; @@ -26,25 +12,23 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" "fixupPhase" ]; - - installPhase = '' - mkdir -p $out + buildCommand = '' + mkdir -p $out/usr/ ar p $src data.tar.gz | tar -C $out -xz ./usr substituteInPlace $out/usr/share/applications/atom.desktop \ --replace /usr/share/atom $out/bin mv $out/usr/* $out/ rm -r $out/share/lintian rm -r $out/usr/ + wrapProgram $out/bin/atom \ + --prefix "PATH" : "${gvfs}/bin" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:$out/share/atom" \ $out/share/atom/atom patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}" \ $out/share/atom/resources/app/apm/bin/node - wrapProgram $out/bin/atom \ - --prefix "LD_LIBRARY_PATH" : "${atomLib}:${atomLib64}" \ - --prefix "PATH" : "${gvfs}/bin" - wrapProgram $out/bin/apm \ - --prefix "LD_LIBRARY_PATH" : "${atomLib}:${atomLib64}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix new file mode 100644 index 00000000000..d91d8a4ecbe --- /dev/null +++ b/pkgs/applications/editors/atom/env.nix @@ -0,0 +1,19 @@ +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk, atk, pango, freetype, fontconfig +, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, gconf, nss, xorg, libcap, systemd, libnotify +}: + +let + packages = [ + stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd libnotify + ]; + + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutputs "lib64" ["lib"] packages; + libPath = "${libPathNative}:${libPath64}"; + +in { inherit packages libPath; } diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 0d9572ebc22..5e8a39bb101 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,10 +1,6 @@ -{ stdenv, callPackage, fetchurl, unzip -, ... -} @ args: +{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }: let - atomEnv = callPackage ../../../development/tools/electron/env-atom.nix (args); - version = "0.10.10"; rev = "5b5f4db87c10345b9d5c8d0bed745bcad4533135"; sha256 = if stdenv.system == "i686-linux" then "1mmgq4fxi2h4hvz7yxgzzyvlznkb42qwr8i1g2b1akdlgnrvvpby" @@ -30,21 +26,16 @@ in buildInputs = [ unzip ]; installPhase = '' - mkdir -p $out/bin - cp -r ./* $out/bin - - ${if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/code - '' else ""} + mkdir -p $out/lib/vscode $out/bin + cp -r ./* $out/lib/vscode + ln -s $out/lib/vscode/code $out/bin ''; - postFixup = '' - ${if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then '' - patchelf \ - --set-rpath "${atomEnv}/lib:${atomEnv}/lib64:$out/bin:$(patchelf --print-rpath $out/bin/code)" \ - $out/bin/code - '' else ""} + fixupPhase = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \ + $out/lib/vscode/code ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index d7d338f7f60..74adbb3f153 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,10 +1,6 @@ -{ stdenv, callPackage, fetchurl, unzip -, ... -} @ args: +{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }: -let - atomEnv = callPackage ./env-atom.nix (args); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "electron-${version}"; version = "0.36.2"; @@ -14,23 +10,17 @@ in stdenv.mkDerivation rec { name = "${name}.zip"; }; - buildInputs = [ atomEnv unzip ]; + buildInputs = [ unzip ]; - phases = [ "installPhase" "fixupPhase" ]; + buildCommand = '' + mkdir -p $out/lib/electron $out/bin + unzip -d $out/lib/electron $src + ln -s $out/lib/electron/electron $out/bin - unpackCmd = "unzip"; - - installPhase = '' - mkdir -p $out/bin - unzip -d $out/bin $src - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/electron - ''; - - postFixup = '' patchelf \ - --set-rpath "${atomEnv}/lib:${atomEnv}/lib64:$out/bin:$(patchelf --print-rpath $out/bin/electron)" \ - $out/bin/electron + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:$out/lib/electron" \ + $out/lib/electron/electron ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/electron/env-atom.nix b/pkgs/development/tools/electron/env-atom.nix deleted file mode 100644 index 6c69b2e52cc..00000000000 --- a/pkgs/development/tools/electron/env-atom.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, buildEnv, zlib, glib, alsaLib -, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap -, systemd, libnotify -, ... -}: - -buildEnv { - name = "env-atom"; - paths = [ - stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 - fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor libcap systemd libnotify - ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8a73642055..bba0883c923 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5700,10 +5700,7 @@ in astyle = callPackage ../development/tools/misc/astyle { }; - electron = callPackage ../development/tools/electron { - gconf = pkgs.gnome.GConf; - }; - + electron = callPackage ../development/tools/electron { }; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -11647,10 +11644,12 @@ in artha = callPackage ../applications/misc/artha { }; - atom = callPackage ../applications/editors/atom { + atomEnv = callPackage ../applications/editors/atom/env.nix { gconf = gnome.GConf; }; + atom = callPackage ../applications/editors/atom { }; + aseprite = callPackage ../applications/editors/aseprite { giflib = giflib_4_1; }; @@ -14253,9 +14252,7 @@ in vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; - vscode = callPackage ../applications/editors/vscode { - gconf = pkgs.gnome.GConf; - }; + vscode = callPackage ../applications/editors/vscode { }; vue = callPackage ../applications/misc/vue { }; From 935493a3610ca1830a22c92685eb58622fa2366a Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Fri, 22 Apr 2016 12:27:38 +0200 Subject: [PATCH 070/210] vscode: add desktop file --- pkgs/applications/editors/vscode/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 5e8a39bb101..f5b204b074e 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }: +{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem }: + let version = "0.10.10"; @@ -23,12 +24,28 @@ in inherit sha256; }; + desktopItem = makeDesktopItem { + name = "code"; + exec = "code"; + icon = "code"; + comment = "Visual Studio Code is a code editor redefined and optimized for building and debugging modern web and cloud applications"; + desktopName = "Visual Studio Code"; + genericName = "Text Editor"; + categories = "GNOME;GTK;Utility;TextEditor;Development;"; + }; + buildInputs = [ unzip ]; installPhase = '' mkdir -p $out/lib/vscode $out/bin cp -r ./* $out/lib/vscode ln -s $out/lib/vscode/code $out/bin + + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications + + mkdir -p $out/share/pixmaps + cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png ''; fixupPhase = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' From 0b8d8b5ca8fd11a1c784d13cbb2082b0d7faa538 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Fri, 22 Apr 2016 13:23:24 +0200 Subject: [PATCH 071/210] vscode: 0.10.10 -> 1.0.0 --- pkgs/applications/editors/vscode/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index f5b204b074e..134dc397e06 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,19 +1,18 @@ { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem }: - let - version = "0.10.10"; - rev = "5b5f4db87c10345b9d5c8d0bed745bcad4533135"; - sha256 = if stdenv.system == "i686-linux" then "1mmgq4fxi2h4hvz7yxgzzyvlznkb42qwr8i1g2b1akdlgnrvvpby" - else if stdenv.system == "x86_64-linux" then "1zjb6mys5qs9mb21rpgpnbgq4gpnw6gsgfn5imf7ca7myk1bxnvk" - else if stdenv.system == "x86_64-darwin" then "0y1as2s6nhicyvdfszphhqp76iv9wcygglrl2f0jamm98g9qp66p" + version = "1.0.0"; + rev = "fa6d0f03813dfb9df4589c30121e9fcffa8a8ec8"; + + sha256 = if stdenv.system == "i686-linux" then "1nnsvr51k8cmq8rccksylam4ww40pdn9dnhnp9096z5ccrf4qa1b" + else if stdenv.system == "x86_64-linux" then "0p408pp2il6kawfsql8n5dvl75kmf2n2p0r266mjnww6vprmq4gw" + else if stdenv.system == "x86_64-darwin" then "06k41ljfvgyxbl364jlkdjk8lkwr6bpq2r051vin93cnqfxridkq" else throw "Unsupported system: ${stdenv.system}"; urlMod = if stdenv.system == "i686-linux" then "linux-ia32" else if stdenv.system == "x86_64-linux" then "linux-x64" else if stdenv.system == "x86_64-darwin" then "darwin" else throw "Unsupported system: ${stdenv.system}"; - in stdenv.mkDerivation rec { name = "vscode-${version}"; From 253b84a1eb2609ea7d71a236040515dc7c131b1b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 22 Apr 2016 17:44:30 +0300 Subject: [PATCH 072/210] vscode, electron, atom: run fixup phases --- pkgs/applications/editors/atom/default.nix | 2 ++ pkgs/applications/editors/vscode/default.nix | 2 +- pkgs/development/tools/electron/default.nix | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 5cad049ba32..9a392b90dc1 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/atom \ --prefix "PATH" : "${gvfs}/bin" + fixupPhase + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:$out/share/atom" \ $out/share/atom/atom diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 134dc397e06..b372dda1bf8 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -47,7 +47,7 @@ in cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png ''; - fixupPhase = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' + postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \ diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 74adbb3f153..a3afc235a6c 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { unzip -d $out/lib/electron $src ln -s $out/lib/electron/electron $out/bin + fixupPhase + patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:$out/lib/electron" \ From 05a7c34d476db6c5996f8a98b97cc12f79dd56d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Apr 2016 19:50:57 +0200 Subject: [PATCH 073/210] sane-backends-git -> 2016-04-20 --- pkgs/applications/graphics/sane/backends/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix index ae1526990f2..d7d512d8def 100644 --- a/pkgs/applications/graphics/sane/backends/git.nix +++ b/pkgs/applications/graphics/sane/backends/git.nix @@ -1,10 +1,10 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // { - version = "2016-04-14"; + version = "2016-04-20"; src = fetchgit { - sha256 = "414fa7753043f8f3775d926eede01a9dbccf6255b2b2b961a3c48b4fa76a4952"; - rev = "19c128a23e27c1ab5a030fa6ff74da1b740629bb"; + sha256 = "f4a20eb41d72ff5961484ef164df44805a987523153107cc6f45acfb3d0208e2"; + rev = "4b2f171a13248a8e3d79379e368c54fb71ed97e2"; url = "git://alioth.debian.org/git/sane/sane-backends.git"; }; }) From 5a6cac7ca4deb6fd6566f1650496bae9096744ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Apr 2016 22:01:31 +0200 Subject: [PATCH 074/210] miniupnpd: 1.9.20160222 -> 2.0 --- pkgs/tools/networking/miniupnpd/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index d2bc7b4e772..6003471bed9 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-1.9.20160222"; + name = "miniupnpd-2.0"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0q694dla4v36qsc0x50xqg2jjhwdi9pl7r2gl10yvhkahxqx1ng7"; + sha256 = "1dxzhvkylrnbkd5srb9rb2g4f9ydd1zbjg5sdf190m0g1sha6snr"; name = "${name}.tar.gz"; }; @@ -16,13 +16,14 @@ stdenv.mkDerivation rec { makefile = "Makefile.linux"; - buildFlags = "miniupnpd genuuid"; + buildFlags = [ "miniupnpd" "genuuid" ]; - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { homepage = http://miniupnp.free.fr/; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; }; } From 8db6b7615a91322f0ccea77cfdea89e395619fdb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Apr 2016 13:57:32 +0200 Subject: [PATCH 075/210] debian-devscripts: 2.16.2 -> 2.16.3 --- pkgs/tools/misc/debian-devscripts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 617cd5f5548..edc527484c6 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.16.2"; + version = "2.16.3"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "0qlzciiyfhq11j5wf0x6jsa18bmmf2z7f2x5psq2wkkccfi0fxc4"; + sha256 = "0w030zdvcwaxpashdd6zvqgmy89h107p7gvd3lqx9vdy9zv0agd2"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile From e7f0a2ce00224535556a203c396f9e02a66f571d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Apr 2016 20:38:45 +0200 Subject: [PATCH 076/210] pythonPackages.gandi-cli: init at 0.18 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c59bec38d3b..a180eb6cf02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5698,6 +5698,25 @@ in modules // { }; }; + gandi-cli = buildPythonPackage rec { + name = "gandi-cli-${version}"; + version = "0.18"; + src = pkgs.fetchFromGitHub { + sha256 = "045gnz345nfbi1g7j3gcyzrxrx3hcidaxzr05cb49rcr8nmqh1s3"; + rev = version; + repo = "gandi.cli"; + owner = "Gandi"; + }; + propagatedBuildInputs = with self; [ click ipy pyyaml requests ]; + doCheck = false; # Tests try to contact the actual remote API + meta = { + homepage = http://cli.gandi.net/; + description = "Command-line interface to the public Gandi.net API"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ nckx ]; + }; + }; + gateone = buildPythonPackage rec { name = "gateone-1.2-0d57c3"; disabled = ! isPy27; From 3fdf40bca0c869268de0c8731f78f1f15af181c9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Apr 2016 16:18:42 +0200 Subject: [PATCH 077/210] eid-mw: 4.1.14 -> 4.1.16 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 85409fae85b..b6a7b2fedbe 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.1.14"; + version = "4.1.16"; src = fetchFromGitHub { - sha256 = "1gj08dylcwdfjmdci1ja853n9xqkhgxy0x8m30bks81qwbnd12lp"; + sha256 = "14b17aa45l0pyqd87c17mgfmpgq1qmybnl6hq9mc29rxw6jdb1ka"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; From 42d5aa8c23dbb2e46b46789bc007774b58b55541 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 22 Apr 2016 17:34:41 +0200 Subject: [PATCH 078/210] libreoffice: libreoffice-still: init at 5.0.5.2 (the current stable release) --- .../libreoffice/libreoffice-srcs-still.nix | 523 ++++++++++++++++++ .../applications/office/libreoffice/still.nix | 255 +++++++++ pkgs/top-level/all-packages.nix | 20 + 3 files changed, 798 insertions(+) create mode 100644 pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix create mode 100644 pkgs/applications/office/libreoffice/still.nix diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix new file mode 100644 index 00000000000..a70d5a7c77c --- /dev/null +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -0,0 +1,523 @@ +[ +{ + name = "libabw-0.1.1.tar.bz2"; + md5 = "7a3815b506d064313ba309617b6f5a0b"; + brief = true; +} +{ + name = "commons-codec-1.6-src.tar.gz"; + md5 = "2e482c7567908d334785ce7d69ddfff7"; + brief = false; +} +{ + name = "commons-httpclient-3.1-src.tar.gz"; + md5 = "2c9b0f83ed5890af02c0df1c1776f39b"; + brief = false; +} +{ + name = "commons-lang-2.4-src.tar.gz"; + md5 = "625ff5f2f968dd908bca43c9469d6e6b"; + brief = false; +} +{ + name = "commons-logging-1.2-src.tar.gz"; + md5 = "ce977548f1cbf46918e93cd38ac35163"; + brief = true; +} +{ + name = "apr-1.4.8.tar.gz"; + md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; + brief = true; +} +{ + name = "apr-util-1.5.3.tar.gz"; + md5 = "71a11d037240b292f824ba1eb537b4e3"; + brief = true; +} +{ + name = "boost_1_55_0.tar.bz2"; + md5 = "d6eef4b4cacb2183f2bf265a5a03a354"; + brief = false; +} +{ + name = "bsh-2.0b5-src.zip"; + md5 = "ec1941a74d3ef513c4ce57a9092b74e1"; + brief = false; +} +{ + name = "cairo-1.10.2.tar.gz"; + md5 = "f101a9e88b783337b20b2e26dfd26d5f"; + brief = false; +} +{ + name = "libcdr-0.1.1.tar.bz2"; + md5 = "b33fd0be3befdd1b37777e08ce058bd9"; + brief = true; +} +{ + name = "clucene-core-2.3.3.4.tar.gz"; + md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; + brief = false; +} +{ + name = "libcmis-0.5.0.tar.gz"; + md5 = "5821b806a98e6c38370970e682ce76e8"; + brief = false; +} +{ + name = "CoinMP-1.7.6.tgz"; + md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; + brief = true; +} +{ + name = "collada2gltf-master-cb1d97788a.tar.bz2"; + md5 = "4b87018f7fff1d054939d19920b751a0"; + brief = false; +} +{ + name = "cppunit-1.13.2.tar.gz"; + md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; + brief = true; +} +{ + name = "converttexttonumber-1-5-0.oxt"; + md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; + brief = false; +} +{ + name = "curl-7.43.0.tar.bz2"; + md5 = "11bddbb452a8b766b932f859aaeeed39"; + brief = true; +} +{ + name = "libe-book-0.1.2.tar.bz2"; + md5 = "6b48eda57914e6343efebc9381027b78"; + brief = true; +} +{ + name = "epm-3.7.tar.gz"; + md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; + brief = false; +} +{ + name = "libetonyek-0.1.3.tar.bz2"; + md5 = "e5947373dd7834f27e93f1636faa419f"; + brief = true; +} +{ + name = "expat-2.1.0.tar.gz"; + md5 = "dd7dab7a5fea97d2a6a43f511449b7cd"; + brief = false; +} +{ + name = "Firebird-2.5.2.26540-0.tar.bz2"; + md5 = "21154d2004e025c8a3666625b0357bb5"; + brief = true; +} +{ + name = "fontconfig-2.8.0.tar.gz"; + md5 = "77e15a92006ddc2adbb06f840d591c0e"; + brief = false; +} +{ + name = "crosextrafonts-20130214.tar.gz"; + md5 = "368f114c078f94214a308a74c7e991bc"; + brief = false; +} +{ + name = "crosextrafonts-carlito-20130920.tar.gz"; + md5 = "c74b7223abe75949b4af367942d96c7a"; + brief = false; +} +{ + name = "dejavu-fonts-ttf-2.34.zip"; + md5 = "a4e565e220b5de082c23995e256e3c12"; + brief = false; +} +{ + name = "gentiumbasic-fonts-1.10.zip"; + md5 = "35efabc239af896dfb79be7ebdd6e6b9"; + brief = false; +} +{ + name = "liberation-fonts-ttf-1.07.4.tar.gz"; + md5 = "134d8262145fc793c6af494dcace3e71"; + brief = false; +} +{ + name = "liberation-fonts-ttf-2.00.1.tar.gz"; + md5 = "5c781723a0d9ed6188960defba8e91cf"; + brief = false; +} +{ + name = "LinLibertineG-20120116.zip"; + md5 = "e7a384790b13c29113e22e596ade9687"; + brief = false; +} +{ + name = "open-sans-font-ttf-1.10.tar.gz"; + md5 = "7a15edea7d415ac5150ea403e27401fd"; + brief = false; +} +{ + name = "pt-serif-font-1.0000W.tar.gz"; + md5 = "c3c1a8ba7452950636e871d25020ce0d"; + brief = false; +} +{ + name = "source-code-font-1.009.tar.gz"; + md5 = "0279a21fab6f245e85a6f85fea54f511"; + brief = false; +} +{ + name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + md5 = "edc4d741888bc0d38e32dbaa17149596"; + brief = false; +} +{ + name = "libfreehand-0.1.1.tar.bz2"; + md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; + brief = true; +} +{ + name = "freetype-2.4.8.tar.bz2"; + md5 = "dbf2caca1d3afd410a29217a9809d397"; + brief = false; +} +{ + name = "glew-1.10.0.zip"; + md5 = "594eb47b4b1210e25438d51825404d5a"; + brief = false; +} +{ + name = "glm-0.9.4.6-libreoffice.zip"; + md5 = "bae83fa5dc7f081768daace6e199adc3"; + brief = false; +} +{ + name = "graphite2-1.2.4.tgz"; + md5 = "2ef839348fe28e3b923bf8cced440227"; + brief = true; +} +{ + name = "harfbuzz-0.9.40.tar.bz2"; + md5 = "0e27e531f4c4acff601ebff0957755c2"; + brief = true; +} +{ + name = "hsqldb_1_8_0.zip"; + md5 = "17410483b5b5f267aa18b7e00b65e6e0"; + brief = false; +} +{ + name = "hunspell-1.3.3.tar.gz"; + md5 = "4967da60b23413604c9e563beacc63b4"; + brief = false; +} +{ + name = "hyphen-2.8.8.tar.gz"; + md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; + brief = false; +} +{ + name = "icu4c-54_1-src.tgz"; + md5 = "e844caed8f2ca24c088505b0d6271bc0"; + brief = false; +} +{ + name = "flow-engine-0.9.4.zip"; + md5 = "ba2930200c9f019c2d93a8c88c651a0f"; + brief = false; +} +{ + name = "flute-1.1.6.zip"; + md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; + brief = false; +} +{ + name = "libbase-1.1.6.zip"; + md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; + brief = false; +} +{ + name = "libfonts-1.1.6.zip"; + md5 = "3bdf40c0d199af31923e900d082ca2dd"; + brief = false; +} +{ + name = "libformula-1.1.7.zip"; + md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; + brief = false; +} +{ + name = "liblayout-0.2.10.zip"; + md5 = "db60e4fde8dd6d6807523deb71ee34dc"; + brief = false; +} +{ + name = "libloader-1.1.6.zip"; + md5 = "97b2d4dba862397f446b217e2b623e71"; + brief = false; +} +{ + name = "librepository-1.1.6.zip"; + md5 = "8ce2fcd72becf06c41f7201d15373ed9"; + brief = false; +} +{ + name = "libserializer-1.1.6.zip"; + md5 = "f94d9870737518e3b597f9265f4e9803"; + brief = false; +} +{ + name = "libxml-1.1.7.zip"; + md5 = "ace6ab49184e329db254e454a010f56d"; + brief = false; +} +{ + name = "sacjava-1.3.zip"; + md5 = "39bb3fcea1514f1369fcfc87542390fd"; + brief = false; +} +{ + name = "jpegsrc.v9a.tar.gz"; + md5 = "3353992aecaee1805ef4109aadd433e7"; + brief = true; +} +{ + name = "libjpeg-turbo-1.3.1.tar.gz"; + md5 = "2c3a68129dac443a72815ff5bb374b05"; + brief = true; +} +{ + name = "language-subtag-registry-2015-08-04.tar.bz2"; + md5 = "bf5986dbfa1c9a0f26cf1b00ed369484"; + brief = true; +} +{ + name = "JLanguageTool-1.7.0.tar.bz2"; + md5 = "b63e6340a02ff1cacfeadb2c42286161"; + brief = false; +} +{ + name = "lcms2-2.6.tar.gz"; + md5 = "f4c08d38ceade4a664ebff7228910a33"; + brief = true; +} +{ + name = "libatomic_ops-7_2d.zip"; + md5 = "c0b86562d5aa40761a87134f83e6adcf"; + brief = true; +} +{ + name = "libeot-0.01.tar.bz2"; + md5 = "aa24f5dd2a2992f4a116aa72af817548"; + brief = true; +} +{ + name = "libexttextcat-3.4.4.tar.bz2"; + md5 = "10d61fbaa6a06348823651b1bd7940fe"; + brief = false; +} +{ + name = "libgltf-0.0.2.tar.bz2"; + md5 = "d63a9f47ab048f5009d90693d6aa6424"; + brief = true; + subDir = "libgltf/"; +} +{ + name = "liblangtag-0.5.1.tar.bz2"; + md5 = "36271d3fa0d9dec1632029b6d7aac925"; + brief = false; +} +{ + name = "xmlsec1-1.2.14.tar.gz"; + md5 = "1f24ab1d39f4a51faf22244c94a6203f"; + brief = false; +} +{ + name = "libxml2-2.9.3.tar.gz"; + md5 = "daece17e045f1c107610e137ab50c179"; + brief = false; +} +{ + name = "libxslt-1.1.28.tar.gz"; + md5 = "9667bf6f9310b957254fdcf6596600b7"; + brief = false; +} +{ + name = "lp_solve_5.5.tar.gz"; + md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; + brief = false; +} +{ + name = "mariadb_client-2.0.0-src.tar.gz"; + md5 = "a233181e03d3c307668b4c722d881661"; + brief = false; +} +{ + name = "mdds_0.12.1.tar.bz2"; + md5 = "ef2560ed5416652a7fe195305b14cebe"; + brief = true; +} +{ + name = "libmspub-0.1.2.tar.bz2"; + md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; + brief = true; +} +{ + name = "libmwaw-0.3.5.tar.bz2"; + md5 = "bdc58bbf89aaaf6d29b3516d96830a06"; + brief = true; +} +{ + name = "mysql-connector-c++-1.1.4.tar.gz"; + md5 = "7239a4430efd4d0189c4f24df67f08e5"; + brief = false; +} +{ + name = "mythes-1.2.4.tar.gz"; + md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; + brief = false; +} +{ + name = "neon-0.29.5.tar.gz"; + md5 = "ff369e69ef0f0143beb5626164e87ae2"; + brief = false; +} +{ + name = "nss-3.19.4-with-nspr-4.10.10.tar.gz"; + md5 = "478e0e90ebc4a90159549e77021021fd"; + brief = false; +} +{ + name = "libodfgen-0.1.4.tar.bz2"; + md5 = "8716be5c22ae8353f9aaa380d74840dc"; + brief = true; +} +{ + name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; + md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; + brief = true; +} +{ + name = "openldap-2.4.31.tgz"; + md5 = "804c6cb5698db30b75ad0ff1c25baefd"; + brief = false; +} +{ + name = "openssl-1.0.2a.tar.gz"; + md5 = "a06c547dac9044161a477211049f60ef"; + brief = true; +} +{ + name = "liborcus-0.7.0.tar.bz2"; + md5 = "7681383be6ce489d84c1c74f4e7f9643"; + brief = false; +} +{ + name = "libpagemaker-0.0.2.tar.bz2"; + md5 = "795cc7a59ace4db2b12586971d668671"; + brief = true; +} +{ + name = "pixman-0.24.4.tar.bz2"; + md5 = "c63f411b3ad147db2bcce1bf262a0e02"; + brief = false; +} +{ + name = "libpng-1.5.24.tar.gz"; + md5 = "6652e428d1d3fc3c6cb1362159b1cf3b"; + brief = true; +} +{ + name = "poppler-0.26.4.tar.gz"; + md5 = "35c0660065d023365e9854c13e289d12"; + brief = true; +} +{ + name = "postgresql-9.2.1.tar.bz2"; + md5 = "c0b4799ea9850eae3ead14f0a60e9418"; + brief = false; +} +{ + name = "Python-3.3.5.tgz"; + md5 = "803a75927f8f241ca78633890c798021"; + brief = true; +} +{ + name = "raptor2-2.0.9.tar.gz"; + md5 = "4ceb9316488b0ea01acf011023cf7fff"; + brief = false; +} +{ + name = "rasqal-0.9.30.tar.gz"; + md5 = "b12c5f9cfdb6b04efce5a4a186b8416b"; + brief = false; +} +{ + name = "redland-1.0.16.tar.gz"; + md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; + brief = false; +} +{ + name = "librevenge-0.0.2.tar.bz2"; + md5 = "2d4183bf17aea1a71842468a71a68c47"; + brief = true; +} +{ + name = "rhino1_5R5.zip"; + md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; + brief = false; +} +{ + name = "serf-1.2.1.tar.bz2"; + md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; + brief = true; +} +{ + name = "swingExSrc.zip"; + md5 = "35c94d2df8893241173de1d16b6034c0"; + brief = false; +} +{ + name = "ucpp-1.3.2.tar.gz"; + md5 = "0168229624cfac409e766913506961a8"; + brief = false; +} +{ + name = "vigra1.6.0.tar.gz"; + md5 = "d62650a6f908e85643e557a236ea989c"; + brief = false; +} +{ + name = "libvisio-0.1.1.tar.bz2"; + md5 = "726c1f5be65eb7d649e0d48b63d920e7"; + brief = true; +} +{ + name = "libwpd-0.10.0.tar.bz2"; + md5 = "0773d79a1f240ef9f4f20242b13c5bb7"; + brief = true; +} +{ + name = "libwpg-0.3.0.tar.bz2"; + md5 = "17da9770cb8b317b7633f9807b32b71a"; + brief = true; +} +{ + name = "libwps-0.4.0.tar.bz2"; + md5 = "e9162d2566421d9d71b3ad2377a68fd5"; + brief = true; +} +{ + name = "xsltml_2.1.2.zip"; + md5 = "a7983f859eafb2677d7ff386a023bc40"; + brief = false; +} +{ + name = "zlib-1.2.8.tar.gz"; + md5 = "44d667c142d7cda120332623eab69f40"; + brief = true; +} +] diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix new file mode 100644 index 00000000000..0e4d2d79762 --- /dev/null +++ b/pkgs/applications/office/libreoffice/still.nix @@ -0,0 +1,255 @@ +{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip +, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd +, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon +, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which +, icu, boost, jdk, ant, cups, xorg, libcmis +, openssl, gperf, cppunit, GConf, ORBit2, poppler +, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw +, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr +, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra +, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio +, fontsConf, pkgconfig, libzip, bluez5, libtool, maven +, libatomic_ops, graphite2, harfbuzz, libodfgen +, librevenge, libe-book, libmwaw, glm, glew, gst_all_1 +, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas +, defaultIconTheme, glib, ncurses +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] +, withHelp ? true +, kdeIntegration ? false +}: + +let + lib = stdenv.lib; + langsSpaces = lib.concatStringsSep " " langs; + major = "5"; + minor = "0"; + patch = "5"; + tweak = "2"; + subdir = "${major}.${minor}.${patch}"; + version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; + + fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { + inherit name md5; + url = if brief then + "http://dev-www.libreoffice.org/src/${subDir}${name}" + else + "http://dev-www.libreoffice.org/src/${subDir}${md5}-${name}"; + }; + + fetchSrc = {name, sha256}: fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; + inherit sha256; + }; + + srcs = { + third_party = [ (fetchurl rec { + url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; + md5 = "185d60944ea767075d27247c3162b3bc"; + name = "unowinreg.dll"; + }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs-still.nix)); + + translations = fetchSrc { + name = "translations"; + sha256 = "13cbfiqaycy8cxji5jfwfbgar8l4fzhg3aaggavsrwsmbvrqpbb7"; + }; + + # TODO: dictionaries + + help = fetchSrc { + name = "help"; + sha256 = "0an081aj63hfhxv0k8h92vly0rnglbcpqax2pinybryk4dnljr36"; + }; + + }; +in stdenv.mkDerivation rec { + name = "libreoffice-${version}"; + + src = fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "120vcxpxzs0za76fyfry281ysv6d1ianb37d1yq8py8chkdjkrqy"; + }; + + # Openoffice will open libcups dynamically, so we link it directly + # to make its dlopen work. + # It also seems not to mention libdl explicitly in some places. + NIX_LDFLAGS = "-lcups -ldl"; + + # For some reason librdf_redland sometimes refers to rasqal.h instead + # of rasqal/rasqal.h + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; + + # If we call 'configure', 'make' will then call configure again without parameters. + # It's their system. + configureScript = "./autogen.sh"; + dontUseCmakeConfigure = true; + + postUnpack = '' + mkdir -v $sourceRoot/src + '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + + '' + ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} + ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} + ''; + + QT4DIR = qt4; + + # Fix boost 1.59 compat + # Try removing in the next version + CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + + preConfigure = '' + configureFlagsArray=( + "--with-parallelism=$NIX_BUILD_CORES" + "--with-lang=${langsSpaces}" + ); + + chmod a+x ./bin/unpack-sources + patchShebangs . + # It is used only as an indicator of the proper current directory + touch solenv/inc/target.mk + + # BLFS patch for Glibc 2.23 renaming isnan + sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx + ''; + + # fetch_Download_item tries to interpret the name as a variable name + # Let it do so… + postConfigure = '' + sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile + sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile + + # unit test sd_tiledrendering seems to be fragile + # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + echo > ./sd/CppunitTest_sd_tiledrendering.mk + sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk + # one more fragile test? + sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + ''; + + makeFlags = "SHELL=${bash}/bin/bash"; + + enableParallelBuilding = true; + + buildPhase = '' + # This is required as some cppunittests require fontconfig configured + export FONTCONFIG_FILE=${fontsConf} + + # This to avoid using /lib:/usr/lib at linking + sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk + + find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; + + make + ''; + + # It installs only things to $out/lib/libreoffice + postInstall = '' + mkdir -p $out/bin $out/share/desktop + + mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" + + for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do + ln -s $out/lib/libreoffice/program/$a $out/bin/$a + wrapProgram "$out/bin/$a" \ + --prefix XDG_DATA_DIRS : \ + "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + ; + done + + ln -s $out/bin/soffice $out/bin/libreoffice + ln -s $out/lib/libreoffice/share/xdg $out/share/applications + + for f in $out/share/applications/*.desktop; do + substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice" + substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" + substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice" + done + + cp -r sysui/desktop/icons "$out/share" + sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop + ''; + + configureFlags = [ + "${if withHelp then "" else "--without-help"}" + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.lib}/lib" + "--with-beanshell-jar=${bsh}" + "--with-vendor=NixOS" + "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" + "--disable-report-builder" + "--enable-python=system" + "--enable-dbus" + (lib.enableFeature kdeIntegration "kde4") + "--with-package-format=installed" + "--enable-epm" + "--with-jdk-home=${jdk.home}" + "--with-ant-home=${ant}/lib/ant" + "--with-system-cairo" + "--with-system-libs" + "--with-system-headers" + "--with-system-openssl" + "--with-system-libabw" + "--with-system-libcmis" + "--with-system-libwps" + "--with-system-openldap" + "--with-system-coinmp" + + # Without these, configure does not finish + "--without-junit" + + # I imagine this helps. Copied from go-oo. + # Modified on every upgrade, though + "--disable-odk" + "--disable-postgresql-sdbc" + "--disable-firebird-sdbc" + "--without-fonts" + "--without-myspell-dicts" + "--without-doxygen" + + # TODO: package these as system libraries + "--with-system-beanshell" + "--without-system-hsqldb" + "--without-system-altlinuxhyph" + "--without-system-lpsolve" + "--without-system-npapi-headers" + "--without-system-libetonyek" + "--without-system-libfreehand" + "--without-system-liblangtag" + "--without-system-libmspub" + "--without-system-libpagemaker" + "--without-system-libgltf" + # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f + "--without-system-orcus" + ]; + + checkPhase = '' + make unitcheck + make slowcheck + ''; + + buildInputs = with xorg; + [ ant ArchiveZip autoconf automake bison boost cairo clucene_core + CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig + freetype GConf getopt gnome_vfs gperf gtk3 gtk + hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg + libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 + libXaw libXext libXi libXinerama libxml2 libxslt libXtst + libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer + gst_all_1.gst-plugins-base gsettings_desktop_schemas glib + neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler + python3 sablotron sane-backends tcsh unzip vigra which zip zlib + mdds bluez5 glibc libcmis libwps libabw + libxshmfence libatomic_ops graphite2 harfbuzz + librevenge libe-book libmwaw glm glew ncurses + libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper + ] + ++ lib.optional kdeIntegration kde4.kdelibs; + + meta = with lib; { + description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; + homepage = http://libreoffice.org/; + license = licenses.lgpl3; + maintainers = with maintainers; [ viric raskin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5ce66d56b9..621ed6a5145 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13000,6 +13000,26 @@ in }; }; + libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { + inherit (perlPackages) ArchiveZip CompressZlib; + inherit (gnome) GConf ORBit2 gnome_vfs; + inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; + zip = zip.override { enableNLS = false; }; + #glm = glm_0954; + bluez5 = bluez5_28; + fontsConf = makeFontsConf { + fontDirectories = [ + freefont_ttf xorg.fontmiscmisc xorg.fontbhttf + ]; + }; + clucene_core = clucene_core_2; + lcms = lcms2; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; + }); + + liferea = callPackage ../applications/networking/newsreaders/liferea { webkitgtk = webkitgtk24x; }; From e36339fd806490409e006f58a5b9d01dc3affbc8 Mon Sep 17 00:00:00 2001 From: danbst Date: Fri, 22 Apr 2016 15:59:40 +0000 Subject: [PATCH 079/210] mercurial: add comment for maintainers on version bump --- pkgs/applications/version-management/mercurial/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index f44baad4715..27f0279335d 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -3,6 +3,7 @@ , ApplicationServices, cf-private }: let + # if you bump version, update pkgs.tortoisehg too or ping maintainer version = "3.7.3"; name = "mercurial-${version}"; in From 2fce49d3e8218c231aed37926acf987dd3b112df Mon Sep 17 00:00:00 2001 From: danbst Date: Fri, 22 Apr 2016 16:00:43 +0000 Subject: [PATCH 080/210] tortoisehg: 3.7.1 -> 3.7.3, refactor update tortoisehg to 3.7.3 and remove source patch in build expression. setup.py in TortoiseHG computes wrong paths in `build` phase (upstream bug https://bitbucket.org/tortoisehg/thg/issues/4483/problems-with-setuppy-on-posix-systems). So we skip this phase and perform install manually (the `build` phase is still performed as subcommand). --- .../version-management/tortoisehg/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 60e71351208..2ba730a04d2 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,12 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "3.7.1"; - namePrefix = ""; + version = "3.7.3"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "1ycf8knwk1rs99s5caq611sk4c4nzwyzq8g35hw5kwj15b6dl4k6"; + sha256 = "1vahiavpkf9ib2mx8z5i6f0kh072zycazmbrc4sl94p5pvv5w1dh"; }; pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ]; @@ -15,14 +14,11 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ qscintilla iniparse ]; doCheck = false; - - postUnpack = '' - substituteInPlace $sourceRoot/setup.py \ - --replace "sharedir = os.path.join(installcmd.install_data[rootlen:], 'share')" "sharedir = '$out/share/'" - ''; - - postInstall = '' - ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias + dontStrip = true; + buildPhase = ""; + installPhase = '' + ${pythonPackages.python.executable} setup.py install --prefix=$out + ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias ''; meta = { From 2c0a0ce3c53bbdcd38af73987ae78e839c9e3ec2 Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Fri, 22 Apr 2016 18:29:44 +0200 Subject: [PATCH 081/210] file-roller: Enable nautilus extension --- pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix index df90c7b2977..d5b2558cf70 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf }: +, attr, bzip2, acl, wrapGAppsHook, librsvg, libnotify, gdk_pixbuf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - # TODO: support nautilus - # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive + buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive libnotify gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg gnome3.dconf ]; + installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ]; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/FileRoller; description = "Archive manager for the GNOME desktop environment"; From 9f4ac8d3f8e964561be657d276d331de6fd6a638 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Fri, 22 Apr 2016 14:03:27 -0300 Subject: [PATCH 082/210] lsb-release: init at 1.4 --- .../os-specific/linux/lsb-release/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/os-specific/linux/lsb-release/default.nix diff --git a/pkgs/os-specific/linux/lsb-release/default.nix b/pkgs/os-specific/linux/lsb-release/default.nix new file mode 100644 index 00000000000..9715f77f9e4 --- /dev/null +++ b/pkgs/os-specific/linux/lsb-release/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, perl, getopt }: + +stdenv.mkDerivation rec { + version = "1.4"; + name = "lsb-release-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/lsb/${name}.tar.gz"; + sha256 = "0wkiy7ymfi3fh2an2g30raw6yxh6rzf6nz2v90fplbnnz2414clr"; + }; + + preConfigure = '' + substituteInPlace help2man \ + --replace /usr/bin/perl ${perl}/bin/perl + ''; + + installFlags = [ "prefix=$(out)" ]; + + buildInputs = [ perl getopt ]; + + meta = { + description = "Prints certain LSB (Linux Standard Base) and Distribution information"; + homepage = http://www.linuxfoundation.org/collaborate/workgroups/lsb; + license = [ stdenv.lib.licenses.gpl2Plus stdenv.lib.licenses.gpl3Plus ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8a5bdb8605..d31afaa46be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2249,6 +2249,8 @@ in lrzip = callPackage ../tools/compression/lrzip { }; + lsb-release = callPackage ../os-specific/linux/lsb-release { }; + # lsh installs `bin/nettle-lfib-stream' and so does Nettle. Give the # former a lower priority than Nettle. lsh = lowPrio (callPackage ../tools/networking/lsh { }); From 1f1d8993c93ce773afeea87a247330283ebce9a7 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 22 Apr 2016 20:47:40 +0200 Subject: [PATCH 083/210] calibre: 2.54.0 -> 2.55.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7b789b3881d..d7ab712dae6 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.54.0"; + version = "2.55.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1r2cxnqiqnx51gbw283z8lz58i9zpvbf0a5ncrg5b2i9bphdiq79"; + sha256 = "12412d5vjp141xp5qvif50fskd1vsmr15h956z3bh6j99n8z5953"; }; inherit python; From b56dc1c4b04fd1c411a1d0d724680c783f19d7dd Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 22 Apr 2016 20:48:58 +0200 Subject: [PATCH 084/210] entr: 3.4 -> 3.5 --- pkgs/tools/misc/entr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index c6bca6e9d8f..0cc30fe45e3 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.4"; + version = "3.5"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "02h1drxn2lid2fwzwjpkp9p04l0g5a56v6jyj3gi3dzjsq7h0zff"; + sha256 = "05k4jyjna0pr2dalwc1l1dhrcyk6pw7hbss7jl4ykwfadcs5br73"; }; postPatch = '' From fe6899e330cec6e52d8704d463c03d0cfb60a9ed Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 22 Apr 2016 20:51:11 +0200 Subject: [PATCH 085/210] instead: 2.4.0 -> 2.4.1 --- pkgs/games/instead/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 3dbda395dd6..e3fd6ccb2f7 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }: let - version = "2.4.0"; + version = "2.4.1"; # I took several games at random from http://instead.syscall.ru/games/ games = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; - sha256 = "1xxga3ppgjshxzd0p53vsbaqkpzmjnm4vw0j1v7qbqzjgi3r44ix"; + sha256 = "1i69b10jfb980d5zhmvh1i789hh982vxiwgqna82b84pdf3y7kgw"; }; NIX_LDFLAGS = "-llua -lgcc_s"; From 8d7e44745d98f77c505cf53b26e2b0920a0494fc Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 22 Apr 2016 21:01:56 +0200 Subject: [PATCH 086/210] libfilezilla: 0.4.0.1 -> 0.5.0 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index d8e1c29875c..4381f9e6c73 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.4.0.1"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2"; - sha256 = "1ldiyhjv4jg2jyj3d56mlgyj9lx0qkf1857wvsy51lp9aj96h0v0"; + sha256 = "07f5hk5izqgqjadrwy608gi0w3scm3zvpsv63j7bgfqk67qilslc"; }; meta = with stdenv.lib; { From 6768d3be9c48fc908da2f53cd1d60cd0ce1cad06 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 22 Apr 2016 21:03:14 +0200 Subject: [PATCH 087/210] python-betamax: 0.5.1 -> 0.6.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a180eb6cf02..69f54774858 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1702,11 +1702,11 @@ in modules // { }; betamax = buildPythonPackage rec { - name = "betamax-0.5.1"; + name = "betamax-0.6.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/betamax/${name}.tar.gz"; - sha256 = "1glzigrbip9w2jr2gcmwa96rffhi9x9l1455dhbcx2gh3pmcykl6"; + sha256 = "0vw4d53jbbb2kdl7l891h8iyxklqcd6ldvgcyhw9hl40ljdhv1wz"; }; propagatedBuildInputs = [ self.requests2 ]; From 545a65a76767d1a85a5398d4253f281dd841b2fb Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 22 Apr 2016 21:04:39 +0200 Subject: [PATCH 088/210] betamax-matchers: 0.2.0 -> 0.3.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69f54774858..877b12dcf1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1721,11 +1721,11 @@ in modules // { betamax-matchers = buildPythonPackage rec { name = "betamax-matchers-${version}"; - version = "0.2.0"; + version = "0.3.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/betamax-matchers/${name}.tar.gz"; - sha256 = "13n2dy8s2jx8x8bbx684bff3444584bnmg0zhkfxhxndpy18p4is"; + sha256 = "039kvqsdcvvlfxjc3n1x2xvjg6qkqbql0p7rc4z7bnxm9kcm88la"; }; buildInputs = with self; [ betamax requests_toolbelt ]; From 6ec9d2119438bf82fd538311436651a19c268522 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 22 Apr 2016 22:07:35 +0200 Subject: [PATCH 089/210] theme-vertex: 20150923 -> 20160329 --- pkgs/misc/themes/vertex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index ea79426d47e..7c6778a40d5 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "theme-vertex-${version}"; - version = "20150923"; + version = "20160329"; src = fetchFromGitHub { owner = "horst3180"; repo = "Vertex-theme"; rev = version; - sha256 = "0jsdnrw7sgrb7s4byv80y9c782gd6vbq0xsrrhwkflfnxcldvz4r"; + sha256 = "1zafnbxn9hgi4lmi254iw9jyhifcqijxa7cymwjpyy0jfa6sm1qj"; }; buildInputs = [ autoreconfHook gtk3 pkgconfig ]; From 6a0903597ad05d73c902895677e05a66f011bff5 Mon Sep 17 00:00:00 2001 From: Ethan Pailes Date: Fri, 22 Apr 2016 11:42:40 -0400 Subject: [PATCH 090/210] tomb: init at version 2.2 --- pkgs/os-specific/linux/tomb/default.nix | 41 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/os-specific/linux/tomb/default.nix diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix new file mode 100644 index 00000000000..5ed7ad5b959 --- /dev/null +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, zsh, pinentry, cryptsetup, gnupg1orig, makeWrapper }: + +let + version = "2.2"; +in + +stdenv.mkDerivation rec { + name = "tomb-${version}"; + + src = fetchurl { + url = "https://files.dyne.org/tomb/tomb-${version}.tar.gz"; + sha256 = "11msj38fdmymiqcmwq1883kjqi5zr01ybdjj58rfjjrw4zw2w5y0"; + }; + + buildInputs = [ makeWrapper ]; + + buildPhase = '' + # manually patch the interpreter + sed -i -e "1s|.*|#!${zsh}/bin/zsh|g" tomb + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + + cp tomb $out/bin/tomb + cp doc/tomb.1 $out/share/man/man1 + + wrapProgram $out/bin/tomb \ + --prefix PATH : "${pinentry}/bin" \ + --prefix PATH : "${cryptsetup}/bin" \ + --prefix PATH : "${gnupg1orig}/bin" + ''; + + meta = { + description = "File encryption on GNU/Linux"; + homepage = https://www.dyne.org/software/tomb/; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8a73642055..d0067f5aeb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16618,4 +16618,6 @@ in discord = callPackage ../applications/networking/instant-messengers/discord { }; golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {}; + + tomb = callPackage ../os-specific/linux/tomb {}; } From d24523cc13982a1aeffdd151b185386ff6c7b187 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 22 Apr 2016 14:51:49 -0700 Subject: [PATCH 091/210] nixpkgs manual: fix link to go2nix --- doc/languages-frameworks/go.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 89908b3b8ff..d715765f6a1 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -119,6 +119,6 @@ done - To extract dependency information from a Go package in automated way use go2nix. + To extract dependency information from a Go package in automated way use go2nix. From 5b5ce8dcff65385c7fda90d1a9a8772ddea6381c Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 22 Apr 2016 17:13:29 -0500 Subject: [PATCH 092/210] fix my email address --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9d9caa776d6..63b79ccab0b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -254,7 +254,7 @@ notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; nslqqq = "Nikita Mikhailov "; - obadz = "obadz "; + obadz = "obadz "; ocharles = "Oliver Charles "; odi = "Oliver Dunkl "; offline = "Jaka Hudoklin "; From 0f98931d466d12f109cfbe74d7c96330c1534a1d Mon Sep 17 00:00:00 2001 From: = Date: Fri, 22 Apr 2016 14:32:15 +0200 Subject: [PATCH 093/210] NeuroTools: init at 0.3.1 --- pkgs/top-level/python-packages.nix | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bcf655efe6..12854cc5e29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4598,6 +4598,40 @@ in modules // { }; }); + neurotools = buildPythonPackage (rec { + name = "NeuroTools-${version}"; + version = "0.3.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/N/NeuroTools/${name}.tar.gz"; + sha256 = "0ly6qa87l3afhksab06vp1iimlbm1kdnsw98mxcnpzz9q07l4nd4"; + }; + + disabled = isPy3k; + + # Tests are not automatically run + # Many tests fail (using py.test), and some need R + doCheck = false; + + propagatedBuildInputs = with self; [ + scipy + numpy + matplotlib + tables + pyaml + urllib3 + rpy2 + mpi4py + ]; + + meta = { + description = "Collection of tools to support analysis of neural activity"; + homepage = https://pypi.python.org/pypi/NeuroTools; + license = licenses.gpl2; + maintainers = with maintainers; [ nico202 ]; + }; + }); + jdatetime = buildPythonPackage (rec { name = "jdatetime-${version}"; version = "1.7.1"; From bdf714c3039411bcaa942822cfc7c039a391a552 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Fri, 22 Apr 2016 19:34:11 -0300 Subject: [PATCH 094/210] dwarf-fortress-unfuck: 2016-02-11 -> 2016-04-22 and zlib dependency --- pkgs/games/dwarf-fortress/unfuck.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 57b0e458cc2..598f795083b 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, cmake , mesa, SDL, SDL_image, SDL_ttf, glew, openalSoft -, ncurses, glib, gtk2, libsndfile +, ncurses, glib, gtk2, libsndfile, zlib }: stdenv.mkDerivation { - name = "dwarf_fortress_unfuck-2016-02-11"; + name = "dwarf_fortress_unfuck-2016-04-22"; src = fetchFromGitHub { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; - rev = "2ba59c87bb63bea598825a73bdc896b0e041e2d5"; - sha256 = "0q2rhigvaabdknmb2c84gg71qz7xncmx04npzx4bki9avyxsrpcl"; + rev = "dde40a2c619eac119b6db1bcd0c8d8612472f866"; + sha256 = "12bqh3k4wsk1c0bz2zly8h0ilbsdmsbwr9cdjc6i7liwg9906g7i"; }; cmakeFlags = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ mesa SDL SDL_image SDL_ttf glew openalSoft - ncurses gtk2 libsndfile + ncurses gtk2 libsndfile zlib ]; installPhase = '' From d10d105ca6cc5fc71528250228775101df825573 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 22 Apr 2016 21:20:32 +0300 Subject: [PATCH 095/210] aria2: 1.21.0 -> 1.22.0 --- pkgs/tools/networking/aria2/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 189be8be9e2..01c6500b143 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.21.0"; + version = "1.22.0"; src = fetchurl { url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz"; - sha256 = "1035rzx9y7qv4p7cv04f461343dxha7ikprch059x2fci8n5yp12"; + sha256 = "12agwdvvkr34wqhyyfp418dj0k7nbr297qmcd3wj5kkn7brv6gxc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://github.com/tatsuhiro-t/aria2; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; From b9682eba1784b1aa9b6835c78ce302eda8d2bc11 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 02:20:17 +0300 Subject: [PATCH 096/210] svox: init at 2016-01-25 --- pkgs/applications/audio/svox/default.nix | 43 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/audio/svox/default.nix diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix new file mode 100644 index 00000000000..f8258dd10ab --- /dev/null +++ b/pkgs/applications/audio/svox/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "svox-${version}"; + version = "2016-01-25"; + + src = fetchgit { + url = "https://android.googlesource.com/platform/external/svox"; + rev = "dfb9937746b1828d093faf3b1494f9dc403f392d"; + sha256 = "1gkfj5avikzmr2vv8bhf83n15jcbz4phz5j13l0qnh3gjzh4f1bk"; + }; + + postPatch = '' + cd pico + ''; + + buildPhase = '' + cd lib + for i in *.c; do + $CC -O2 -fPIC -c -o ''${i%.c}.o $i + done + $CC -shared -o libttspico.so *.o + cd .. + ''; + + installPhase = '' + install -Dm755 lib/libttspico.so $out/lib/libttspico.so + mkdir -p $out/include + cp lib/*.h $out/include + mkdir -p $out/share/pico/lang + cp lang/*.bin $out/share/pico/lang + ''; + + NIX_CFLAGS_COMPILE = [ "-include stdint.h" ]; + + meta = with stdenv.lib; { + description = "Text-to-speech engine"; + homepage = https://android.googlesource.com/platform/external/svox; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f939096cc5e..a959341fe35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12593,6 +12593,8 @@ in quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { }; + svox = callPackage ../applications/audio/svox { }; + gkrellm = callPackage ../applications/misc/gkrellm { }; gmu = callPackage ../applications/audio/gmu { }; From f3435096e2110ab78e4edeba3bfb0d905d19b2ed Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 22 Apr 2016 21:02:52 +0300 Subject: [PATCH 097/210] speechd: 0.7.1 -> 0.8.3 Make it actually useful -- support sound output and several voice modules --- .../development/libraries/speechd/default.nix | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 5104532ea91..613fee3c6d6 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -1,20 +1,37 @@ -{ fetchurl, stdenv, dotconf, glib, pkgconfig }: +{ fetchurl, lib, stdenv, intltool, libtool, pkgconfig, glib, dotconf, libsndfile +, libao, python3Packages +, withEspeak ? false, espeak +, withPico ? true, svox +}: stdenv.mkDerivation rec { - name = "speech-dispatcher-" + version; - version = "0.7.1"; + name = "speech-dispatcher-${version}"; + version = "0.8.3"; src = fetchurl { url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz"; - sha256 = "0laag72iw03545zggdzcr860b8q7w1vrjr3csd2ldps7jhlwzad8"; + sha256 = "0kqy7z4l59n2anc7xn588w4rkacig1hajx8c53qrh90ypar978ln"; }; - buildInputs = [ dotconf glib pkgconfig ]; + buildInputs = [ intltool libtool glib dotconf libsndfile libao python3Packages.python ] + ++ lib.optional withEspeak espeak + ++ lib.optional withPico svox; + nativeBuildInputs = [ pkgconfig python3Packages.wrapPython ]; - meta = { + pythonPath = with python3Packages; [ pyxdg ]; + + postPatch = lib.optionalString withPico '' + sed -i 's,/usr/share/pico/lang/,${svox}/share/pico/lang/,g' src/modules/pico.c + ''; + + postInstall = '' + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { description = "Common interface to speech synthesis"; - homepage = http://www.freebsoft.org/speechd; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } From 5489bc41099dbfaf9407942669f7c5faf8b6dad2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 02:21:34 +0300 Subject: [PATCH 098/210] mumble: fix speechd support --- pkgs/applications/networking/mumble/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 20a32159520..37c4c4005ba 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -80,6 +80,8 @@ let "CONFIG+=no-server" ]; + NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher"; + installPhase = '' cp scripts/mumble-overlay $out/bin sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay From 6900fdc84b3b884cb10808dd4afd538fc05d03a0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 02:21:46 +0300 Subject: [PATCH 099/210] mumble: 1.2.10 -> 1.2.15 --- pkgs/applications/networking/mumble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 37c4c4005ba..9af0401a818 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -110,12 +110,12 @@ let }; stableSource = rec { - version = "1.2.10"; + version = "1.2.15"; qtVersion = 4; src = fetchurl { url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz"; - sha256 = "012vm0xf84x13414jlsx964c5a1nwnbn41jnspkciajlxxipldn6"; + sha256 = "1yjywzybgq23ry5s2yihggs13ffrphhwl6rlp6lq79rkwvafa9v5"; }; }; From ae0a64cf2c04b45fcf135e27be114debfbfe902d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 02:22:03 +0300 Subject: [PATCH 100/210] mumble_git: 2015-11-08 -> 2016-04-10 --- .../networking/mumble/default.nix | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 9af0401a818..88b9ae49efd 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -120,34 +120,15 @@ let }; gitSource = rec { - version = "1.3.0-git-2015-11-08"; + version = "1.3.0-git-2016-04-10"; qtVersion = 5; + # Needs submodules src = fetchgit { url = "https://github.com/mumble-voip/mumble"; - rev = "72038f6aa038f5964e2bba5a09d3d391d4680e5f"; - sha256 = "03978b85f7y0bffl8vwkmakjnxxjqapfz3pn0b8zf3b1ppwjy9g4"; + rev = "0502fa67b036bae9f07a586d9f05a8bf74c24291"; + sha256 = "073v8nway17j1n1lm70x508722b1q3vb6h4fvmcbbma3d22y1h45"; }; - - # TODO: Remove fetchgit as it requires git - /*src = fetchFromGitHub { - owner = "mumble-voip"; - repo = "mumble"; - rev = "13e494c60beb20748eeb8be126b27e1226d168c8"; - sha256 = "024my6wzahq16w7fjwrbksgnq98z4jjbdyy615kfyd9yk2qnpl80"; - }; - - theme = fetchFromGitHub { - owner = "mumble-voip"; - repo = "mumble-theme"; - rev = "16b61d958f131ca85ab0f601d7331601b63d8f30"; - sha256 = "0rbh825mwlh38j6nv2sran2clkiwvzj430mhvkdvzli9ysjxgsl3"; - }; - - prePatch = '' - rmdir themes/Mumble - ln -s ${theme} themes/Mumble - '';*/ }; in { mumble = client stableSource; From 1076c93de3778f818d7e4cfe68b5232808f34fa0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Apr 2016 01:29:34 +0200 Subject: [PATCH 101/210] tiled: 0.12.3 -> 0.16.0; clean up; maintain --- pkgs/applications/editors/tiled/default.nix | 35 ++++++++++++--------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index e4b2f0461c2..201db054743 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,26 +1,31 @@ -{ stdenv, fetchurl, qtbase, qttools, qmakeHook, pkgconfig, python }: +{ stdenv, fetchurl, pkgconfig, qmakeHook +, python, qtbase, qttools, zlib }: let - version = "0.12.3"; - sha256 = "001j4lvb5d9h3m6vgz2na07637x6xg4bdvxi2hg4a0j9rikb4y40"; -in - -stdenv.mkDerivation rec { +# qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; +in stdenv.mkDerivation rec { name = "tiled-${version}"; + version = "0.16.0"; src = fetchurl { + name = "${name}.tar.gz"; url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz"; - inherit sha256; + sha256 = "1vlhfkgl126irp53xw94jw1xnj96l1hwnbxmm1s5az60460gfbf0"; }; - buildInputs = [ qtbase qttools qmakeHook pkgconfig python ]; + nativeBuildInputs = [ pkgconfig qmakeHook ]; + buildInputs = [ python qtbase qttools ]; - meta = { - description = "A free, easy to use and flexible tile map editor"; - homepage = "http://www.mapeditor.org/"; - # libtiled and tmxviewer is licensed under 2-calause BSD license. - # The rest is GPL2 or later. - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Free, easy to use and flexible tile map editor"; + homepage = http://www.mapeditor.org/; + license = with licenses; [ + bsd2 # libtiled and tmxviewer + gpl2Plus # all the rest + ]; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; }; } From 23f3d86a3be8188a7623fe74727e8c842d01e633 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Apr 2016 01:30:53 +0200 Subject: [PATCH 102/210] sane-backends-git -> 2016-04-23 More Pixma fixes. --- pkgs/applications/graphics/sane/backends/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix index d7d512d8def..182c99dc2d0 100644 --- a/pkgs/applications/graphics/sane/backends/git.nix +++ b/pkgs/applications/graphics/sane/backends/git.nix @@ -1,10 +1,10 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // { - version = "2016-04-20"; + version = "2016-04-23"; src = fetchgit { - sha256 = "f4a20eb41d72ff5961484ef164df44805a987523153107cc6f45acfb3d0208e2"; - rev = "4b2f171a13248a8e3d79379e368c54fb71ed97e2"; + sha256 = "11bf60cd5a6b314e855a69a6f57a5ca0db3254527def55662bce25810a2314df"; + rev = "c8169b1e656f7f95c67946298da5a0e1c143f8e8"; url = "git://alioth.debian.org/git/sane/sane-backends.git"; }; }) From be21e16652b18eb6e9611c8cf9a20e8d877ec564 Mon Sep 17 00:00:00 2001 From: roblabla Date: Sat, 23 Apr 2016 01:48:54 +0200 Subject: [PATCH 103/210] matrix-synapse: update 0.12.0 -> 0.14.0 --- pkgs/servers/matrix-synapse/default.nix | 10 +++++----- pkgs/top-level/python-packages.nix | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 9165e03d79c..ee0e66baa95 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -2,23 +2,23 @@ let matrix-angular-sdk = buildPythonApplication rec { name = "matrix-angular-sdk-${version}"; - version = "0.6.6"; + version = "0.6.8"; src = fetchurl { url = "https://pypi.python.org/packages/source/m/matrix-angular-sdk/matrix-angular-sdk-${version}.tar.gz"; - sha256 = "1vknhmibb8gh8lng50va2cdvng5xm7vqv9dl680m3gj38pg0bv8a"; + sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; }; }; in buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; - rev = "f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38"; - sha256 = "0b0k1am9lh0qglagc06m91qs26ybv37k7wpbg5333x8jaf5d1si4"; + rev = "5fbdf2bcec40bf2f24fc0698440ee384595ff027"; + sha256 = "1f9flb68l0bb5fkggxz1pghv72snsx6yia3s58f85z13f9vh84cb"; }; patches = [ ./matrix-synapse.patch ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d1e2026a82..f7a5fc4d326 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16251,11 +16251,11 @@ in modules // { pysaml2 = buildPythonPackage rec { name = "pysaml2-${version}"; - version = "3.0.0"; + version = "3.0.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pysaml2/${name}.tar.gz"; - sha256 = "1h2wvagvl59642jq0s63mfr01q637vq6526mr8riykrjnchcbbi2"; + sha256 = "0y2iw1dddcvi13xjh3l52z1mvnrbc41ik9k4nn7lwj8x5kimnk9n"; }; propagatedBuildInputs = with self; [ @@ -25045,12 +25045,12 @@ in modules // { unpaddedbase64 = buildPythonPackage rec { name = "unpaddedbase64-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = pkgs.fetchgit { url = "https://github.com/matrix-org/python-unpaddedbase64.git"; rev = "refs/tags/v${version}"; - sha256 = "f221240a6d414c4244ab906b1dc8983c4d1114acb778cb857f6fc50d710be502"; + sha256 = "2dad07b53cf816a5c2fc14a1a193b0df63ab5aacaccffb328753e7d3027d434e"; }; }; From 83274eccf04584b98d4f64e92a1056178c7e7e7f Mon Sep 17 00:00:00 2001 From: Markus Binsteiner Date: Sat, 23 Apr 2016 12:52:42 +1200 Subject: [PATCH 104/210] seafile-*: 4.4.2 -> 5.0.7 Also updated dependencies: ccnet: 1.4.2 -> 5.0.7 libsearpc: 1.2.2 -> 3.0.7 --- pkgs/applications/networking/seafile-client/default.nix | 4 ++-- pkgs/development/libraries/libsearpc/default.nix | 8 ++++---- pkgs/misc/seafile-shared/default.nix | 4 ++-- pkgs/tools/networking/ccnet/default.nix | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 108135cea37..555667c035c 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "4.4.2"; + version = "5.0.7"; name = "seafile-client-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; - sha256 = "0aj39xiayibxp3vcrwi58pn51h9vcsy2z04q8jm17qadmk9dzyw6"; + sha256 = "ae6975bc1adf45d09cf9f6332ceac7cf285f8191f6cf50c6291ed45f8cf4ffa5"; }; buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ]; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 0410f64edec..0391786c3fd 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "1.2.2"; - seafileVersion = "3.0-latest"; + version = "3.0.7"; + seafileVersion = "5.0.7"; name = "libsearpc-${version}"; src = fetchurl { - url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz"; - sha256 = "1kdq6chn3qhvr616sw91gf9kjfgbv9snl2srqisw0zddw1qkfcan"; + url = "https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"; + sha256 = "0fdrgksdwd4qxp7qvh75y39dy52h2f5wfjbqr00h3rwkbx4npvpg"; }; patches = [ ./libsearpc.pc.patch ]; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 2b3b05ceda1..16464ab27e3 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "4.4.2"; + version = "5.0.7"; name = "seafile-shared-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; - sha256 = "00sflvyap3nw38qblpagp2japgp83sqc5s4r336mi6475grgmnyi"; + sha256 = "ec166c86a41e7ab3b1ae97a56326ab4a2b1ec38686486b956c3d153b8023c670"; }; buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ]; diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 556ef8d0274..d7aaa0f77fc 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "1.4.2"; - seafileVersion = "4.0.6"; + version = "5.0.7"; + seafileVersion = "5.0.7"; name = "ccnet-${version}"; src = fetchurl { - url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz"; - sha256 = "06srvyphrfx7g18vk899850q0aw8cxx34cj96mjzc3sqm0bkzqsh"; + url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; + sha256 = "1e1c670a85619b174328a15925a050c7a8b323fecd13434992332f5c15e05de1"; }; buildInputs = [ which automake autoconf pkgconfig libtool vala python ]; From 274a699348b4fdb610e9af48c965f611fd111b7f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 03:57:00 +0300 Subject: [PATCH 105/210] libburn: init at 1.4.2.pl01 --- pkgs/development/libraries/libburn/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/libburn/default.nix diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix new file mode 100644 index 00000000000..22edcc15769 --- /dev/null +++ b/pkgs/development/libraries/libburn/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libburn-${version}"; + version = "1.4.2.pl01"; + + src = fetchurl { + url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + sha256 = "1nqfm24dm2csdnhsmpgw9cwcnkwvqlvfzsm9bhr6yg7bbmzwvkrk"; + }; + + meta = with stdenv.lib; { + homepage = http://libburnia-project.org/; + description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a959341fe35..2c791a2c30c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7338,6 +7338,8 @@ in libbson = callPackage ../development/libraries/libbson { }; + libburn = callPackage ../development/libraries/libburn { }; + libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { }; From 60ddddeb5b3693483e2d75ebfef52b1d60edee22 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 03:57:14 +0300 Subject: [PATCH 106/210] libisofs: init at 1.4.2 --- .../libraries/libisofs/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/libisofs/default.nix diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix new file mode 100644 index 00000000000..d7e78410740 --- /dev/null +++ b/pkgs/development/libraries/libisofs/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, acl, attr, zlib }: + +stdenv.mkDerivation rec { + name = "libisofs-${version}"; + version = "1.4.2"; + + src = fetchurl { + url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + sha256 = "1axk1ykv8ibrlrd2f3allidviimi4ya6k7wpvr6r4y1sc7mg7rym"; + }; + + buildInputs = [ attr zlib ]; + propagatedBuildInputs = [ acl ]; + + meta = with stdenv.lib; { + homepage = http://libburnia-project.org/; + description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c791a2c30c..c70314209b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7735,6 +7735,8 @@ in graphviz = graphviz-nox; }; + libisofs = callPackage ../development/libraries/libisofs { }; + libiptcdata = callPackage ../development/libraries/libiptcdata { }; libjpeg_original = callPackage ../development/libraries/libjpeg { }; From 666cba9ad96caaf79833474034eac4a18614c23e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 04:11:19 +0300 Subject: [PATCH 107/210] cdrtools: mark as free but don't distribute in binary form --- pkgs/applications/misc/cdrtools/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 2168a21f7da..55bcfd99e17 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -26,10 +26,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/cdrtools/; description = "Highly portable CD/DVD/BluRay command line recording software"; - # Licensing issues: This package contains code licensed under CDDL, GPL2 - # and LGPL2. There is debate regarding the legality of this licensing. - # Marked as unfree to avoid any possible legal issues. - license = licenses.unfree; + license = with licenses; [ gpl2 lgpl2 cddl ]; platforms = platforms.linux; + # Licensing issues: This package contains code licensed under CDDL, GPL2 + # and LGPL2. There is a debate regarding the legality of distributing this + # package in binary form. + hydraPlatforms = []; }; } From 2a51c3c12acc9b7199d2b38c880c5072f7928505 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 04:13:43 +0300 Subject: [PATCH 108/210] brasero: use libburn and libisofs instead of some packages --- pkgs/tools/cd-dvd/brasero/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index ff910ad2e49..e903601c81d 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify -, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, cdrdao -, dvdplusrwtools, cdrtools, vcdimager, wrapGAppsHook }: +, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs +, vcdimager, wrapGAppsHook }: # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590 let major = "3.12"; minor = "1"; - binpath = lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools vcdimager cdrtools ]; + binpath = lib.makeBinPath [ dvdauthor vcdimager ]; in stdenv.mkDerivation rec { version = "${major}.${minor}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; - buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 + buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ]; From e690c3a8dd566651f5fa237bb6cb1d3166450b50 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 04:14:10 +0300 Subject: [PATCH 109/210] k3b: move cdrtools dependency to a wrapper --- pkgs/applications/misc/k3b/default.nix | 7 ++++--- pkgs/applications/misc/k3b/wrapper.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++--- 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/misc/k3b/wrapper.nix diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index 922dec11180..8c69e36a4e4 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig , shared_mime_info, libvorbis, taglib, flac, libsamplerate , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao -, cdrtools, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg +, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg , kdemultimedia, phonon, libkcddb ? null }: @@ -9,10 +9,11 @@ let # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format, # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild, # vcdxminfo, and vcdxrip - binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager cdrtools ]; + binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager ]; in stdenv.mkDerivation rec { - name = "k3b-2.0.3a"; + name = "k3b-${version}"; + version = "2.0.3a"; src = fetchurl { url = "http://download.kde.org/stable/k3b/${name}.tar.xz"; diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix new file mode 100644 index 00000000000..d5c98a2affa --- /dev/null +++ b/pkgs/applications/misc/k3b/wrapper.nix @@ -0,0 +1,23 @@ +{ lib, buildEnv, k3b-original, cdrtools, makeWrapper }: + +let + binPath = lib.makeBinPath [ cdrtools ]; +in buildEnv { + name = "k3b-${k3b-original.version}"; + + paths = [ k3b-original ]; + buildInputs = [ makeWrapper ]; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${k3b-original}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/k3b \ + --prefix PATH ':' ${binPath} + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c70314209b2..9a7bffe73a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15292,9 +15292,9 @@ in eventlist = callPackage ../applications/office/eventlist {}; - k3b = callPackage ../applications/misc/k3b { - cdrtools = cdrkit; - }; + k3b-original = lowPrio (callPackage ../applications/misc/k3b { }); + + k3b = callPackage ../applications/misc/k3b/wrapper.nix { }; kadu = callPackage ../applications/networking/instant-messengers/kadu { }; From ef9175c5fb5ae0dc17bdfdffef8859d725f318c1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 04:14:28 +0300 Subject: [PATCH 110/210] brasero: move cdrtools dependency to a wrapper --- pkgs/tools/cd-dvd/brasero/wrapper.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/cd-dvd/brasero/wrapper.nix diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix new file mode 100644 index 00000000000..021e0da0e72 --- /dev/null +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -0,0 +1,23 @@ +{ lib, buildEnv, brasero-original, cdrtools, makeWrapper }: + +let + binPath = lib.makeBinPath [ cdrtools ]; +in buildEnv { + name = "brasero-${brasero-original.version}"; + + paths = [ brasero-original ]; + buildInputs = [ makeWrapper ]; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${brasero-original}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/brasero \ + --prefix PATH ':' ${binPath} + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a7bffe73a5..c75365bf8fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -609,7 +609,9 @@ in boxfs = callPackage ../tools/filesystems/boxfs { }; - brasero = callPackage ../tools/cd-dvd/brasero { }; + brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); + + brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; brltty = callPackage ../tools/misc/brltty { alsaSupport = (!stdenv.isDarwin); From d3754d34824810d80c8e05767f05c85855883a00 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 22 Apr 2016 22:49:00 -0400 Subject: [PATCH 111/210] ghcjs-base: update via ghcjs-boot This pulls in two fixes for XMLHttpRequest for ghcjs-base: * Fix two typos for websockets https://github.com/ghcjs/ghcjs-base/pull/54 * Respect `.withCredentials`property of XHR https://github.com/ghcjs/ghcjs-base/pull/57 --- pkgs/development/compilers/ghcjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 929d59a9a9b..fb8d789f533 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -40,8 +40,8 @@ , ghcjsBootSrc ? fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "758e79e420403e0f6625eda19b10c46564f7cbb5"; - sha256 = "0gq1mc86cb2z875a7sdj44yy8g95rwxzkl3z1q8gg33k05s3b58r"; + rev = "8c549931da27ba9e607f77195208ec156c840c8a"; + sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv"; fetchSubmodules = true; } , ghcjsBoot ? import ./ghcjs-boot.nix { From 0657ddca952ea24a566e581f5c80e2172c6c6e61 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sat, 23 Apr 2016 00:39:17 -0400 Subject: [PATCH 112/210] go: 1.6 -> 1.6.2 --- pkgs/development/compilers/go/1.6.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index d9924c56744..4efcdb53f47 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -15,11 +15,11 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.6"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/golang/go/archive/go${version}.tar.gz"; - sha256 = "04g7w34qamgy9gqpy75xm03s8xbbslv1735iv1a06z8sphpkgs7m"; + sha256 = "17sfhg3xfnakk666wlsbhxp4vbn19hlywf5cn1zfcd4zqkcyx30h"; }; # perl is used for testing go vet @@ -96,12 +96,6 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.5.patch - # Fix bug when using musl (see https://github.com/golang/go/issues/14476) - # Should be fixed by go 1.6.1 - (fetchpatch { - url = "https://github.com/golang/go/commit/1439158120742e5f41825de90a76b680da64bf76.patch"; - sha256 = "0yixpbx056ns5wgd3f4absgiyc2ymmqk8mkhhz5ja90dvilzxcwd"; - }) ] # -ldflags=-s is required to compile on Darwin, see # https://github.com/golang/go/issues/11994 From 08546d3a20c915fb6554d68b3de89a1f2c0a1faa Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Fri, 22 Apr 2016 22:39:28 -0700 Subject: [PATCH 113/210] unifi: fix for closure-size changes --- nixos/modules/services/networking/unifi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 4dc0cd96904..782dced33df 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -62,7 +62,7 @@ in bindsTo = systemdMountPoints; unitConfig.RequiresMountsFor = stateDir; # This a HACK to fix missing dependencies of dynamic libs extracted from jars - environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc}/lib"; + environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib"; preStart = '' # Ensure privacy of state From 86357de0c8d971f968b776abfc9f556b759f0ed2 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Fri, 22 Apr 2016 22:43:45 -0700 Subject: [PATCH 114/210] mfi: relocatable data dir --- nixos/modules/services/networking/mfi.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/networking/mfi.nix b/nixos/modules/services/networking/mfi.nix index 5afb83ed022..775564a2c44 100644 --- a/nixos/modules/services/networking/mfi.nix +++ b/nixos/modules/services/networking/mfi.nix @@ -10,6 +10,7 @@ let { what = "${pkgs.mfi}/dl"; where = "${stateDir}/dl"; } { what = "${pkgs.mfi}/lib"; where = "${stateDir}/lib"; } { what = "${pkgs.mongodb248}/bin"; where = "${stateDir}/bin"; } + { what = "${cfg.dataDir}"; where = "${stateDir}/data"; } ]; systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints; ports = [ 6080 6880 6443 6843 ]; @@ -23,6 +24,15 @@ in default = true; description = "Whether to open TCP ports ${concatMapStrings (a: "${toString a} ") ports}for the services."; }; + dataDir = mkOption { + type = types.str; + default = "${stateDir}/data"; + description = '' + Where to store the database and other data. + + This directory will be bind-mounted to ${stateDir}/data as part of the service startup. + ''; + }; }; }; From 032f3e721c1259b8a65f2bbe9f6c3a4d1994719f Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Fri, 22 Apr 2016 22:43:55 -0700 Subject: [PATCH 115/210] unifi: relocatable data dir --- nixos/modules/services/networking/unifi.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 782dced33df..cb5a88e67aa 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -17,6 +17,10 @@ let what = "${pkgs.mongodb}/bin"; where = "${stateDir}/bin"; } + { + what = "${cfg.dataDir}"; + where = "${stateDir}/data"; + } ]; systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints; in @@ -32,6 +36,16 @@ in ''; }; + services.unifi.dataDir = mkOption { + type = types.str; + default = "${stateDir}/data"; + description = '' + Where to store the database and other data. + + This directory will be bind-mounted to ${stateDir}/data as part of the service startup. + ''; + }; + }; config = mkIf cfg.enable { From efd1d4fa6059dd23dcdb869028ce40f4fcd6ac44 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 23 Apr 2016 10:45:24 +0200 Subject: [PATCH 116/210] qtbitcointrader: 1.08.03 -> 1.10.01 --- .../misc/qtbitcointrader/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 7de4e3e55a1..a8613f917eb 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,36 +1,33 @@ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook }: +{ stdenv, fetchurl, qt5 }: let - version = "1.08.03"; + version = "1.10.01"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; - src = fetchFromGitHub { - owner = "JulyIGHOR"; - repo = "QtBitcoinTrader"; - rev = "ee30cf158fa8535f2155a387558d3b8994728c28"; - sha256 = "0kxb0n11agqid0nyqdspfndm03b8l0nl8x4yx2hsrizs6m5z08h4"; + src = fetchurl { + url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; + sha256 = "0pgj8rsk9yxvls7yjpzblzbci2vvd0mlf9c7wdbjhwf6qyi7dfi3"; }; - buildInputs = [ qt4 ]; - - nativeBuildHooks = [ qmake4Hook ]; + buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; postUnpack = "sourceRoot=\${sourceRoot}/src"; - preConfigure = '' - qmakeFlags="$qmakeFlags \ + configurePhase = '' + qmake $qmakeFlags \ + PREFIX=$out \ DESKTOPDIR=$out/share/applications \ ICONDIR=$out/share/pixmaps \ - " + QtBitcoinTrader_Desktop.pro ''; meta = with stdenv.lib; - { description = "Secure bitcoin trading client"; + { description = "Bitcoin trading client"; homepage = https://centrabit.com/; license = licenses.lgpl3; - platforms = qt4.meta.platforms; + platforms = qt5.qtbase.meta.platforms; maintainers = [ maintainers.ehmry ]; }; } From 7a9aded54da8afc6d9305312263294bc16f880da Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Apr 2016 11:30:11 +0200 Subject: [PATCH 117/210] pythonPackages.aiohttp: 0.19.0 -> 0.21.5 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 72f808434c1..0fd3fb23fbf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -431,11 +431,11 @@ in modules // { aiohttp = buildPythonPackage rec { name = "aiohttp-${version}"; - version = "0.19.0"; + version = "0.21.5"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/aiohttp/${name}.tar.gz"; - sha256 = "9bfb173baec179431a1c8f3566185e8ebbd1517cf4450217087d79e26e44c287"; + sha256 = "0n8517wc8b6yc925f7zhgl4wqf4ay1w2fzar0pj1h20yfa1wiids"; }; disabled = pythonOlder "3.4"; From d4f7c8a2086aba8066cb97286f31588bd7849341 Mon Sep 17 00:00:00 2001 From: = Date: Sat, 23 Apr 2016 12:20:44 +0200 Subject: [PATCH 118/210] non: 2016-03-06 -> 2016-04-05 --- pkgs/applications/audio/non/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index ead53721950..9217bc285bc 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "non-${version}"; - version = "2016-03-06"; + version = "2016-04-05"; src = fetchFromGitHub { owner = "original-male"; repo = "non"; - rev = "3946d392216ee999b560d8b7cdee7c4347110e29"; - sha256 = "02vnq2mfimgdrmv3lmz80yif4h9a1lympv0wqc5dr2l0f8amj2fp"; + rev = "16885e69fe865495dc32d869d1454ab148b0dca6"; + sha256 = "1nwzzgcdpbqh5kjvz40yy5nmzvpp8gcr9biyhhwi68s5bsg972ss"; }; buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile From 733d89d802a7b201f1811af9c62cb2567035b4c0 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 23 Apr 2016 12:32:58 +0200 Subject: [PATCH 119/210] rustRegistry: 2016-04-18 -> 2016-04-23 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 0476b3991ba..d3a84d416d1 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-04-18"; - rev = "2cd09d5c51264ae0e2deede74fb2620dae757c16"; + version = "2016-04-23"; + rev = "ae2c4051b5df822213c3382bf0d1daaef38ea90c"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0br52x480g9wqm9fl6kcin0m4a4bd20j65c454hhdw7b9ngaydav"; + sha256 = "17ypnb59w4j2f51qpyx5jidkgqvsrk3c7b3mc5s85niy7mvk8wy4"; }; in From 5fdc54387e03b0bf626da8c7f704d4335f2d911b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 22 Apr 2016 12:19:18 +0200 Subject: [PATCH 120/210] haxor-news: init at 0.3.1 --- pkgs/applications/misc/haxor-news/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/haxor-news/default.nix diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix new file mode 100644 index 00000000000..e4074547d78 --- /dev/null +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + version = "0.3.1"; + name = "haxor-news-${version}"; + + src = fetchurl { + url = "https://github.com/donnemartin/haxor-news/archive/0.3.1.tar.gz"; + sha256 = "0jglx8fy38sjyszvvg7mvmyk66l53kyq4i09hmgdz7hb1hrm9m2m"; + }; + + propagatedBuildInputs = with pythonPackages; [ + click + colorama + requests2 + pygments + prompt_toolkit_52 + six + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/donnemartin/haxor-news"; + description = "Browse Hacker News like a haxor"; + license = licenses.asl20; + maintainers = with maintainers; [ matthiasbeyer ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8a73642055..8fddd44cded 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7128,6 +7128,8 @@ in hawknl = callPackage ../development/libraries/hawknl { }; + haxor-news = callPackage ../applications/misc/haxor-news { }; + herqq = callPackage ../development/libraries/herqq { }; heyefi = self.haskellPackages.heyefi; From db179647d62e181a884d6d30460c9ff841808dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 Apr 2016 13:11:32 +0100 Subject: [PATCH 121/210] make all boot tests release critical #14902 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9d1662c6c90059b63fad01b3f55a0df94af7cde4) Signed-off-by: Domen Kožar --- nixos/release-combined.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 53ef4564b5c..abb69f121da 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -64,6 +64,9 @@ in rec { (all nixos.tests.installer.btrfsSubvols) (all nixos.tests.installer.btrfsSubvolDefault) (all nixos.tests.boot.biosCdrom) + (all nixos.tests.boot.biosUsb) + (all nixos.tests.boot.uefiCdrom) + (all nixos.tests.boot.uefiUsb) (all nixos.tests.ipv6) (all nixos.tests.kde4) #(all nixos.tests.lightdm) From bb13afea6cff95c5d4d6f7a7045d60f141bb7abf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 13 Mar 2016 16:39:07 -0400 Subject: [PATCH 122/210] pyatspi: call via pythonPackages --- pkgs/development/python-modules/pyatspi/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 636126ea74a..598056a0c36 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, python3Packages, at_spi2_core }: +{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }: stdenv.mkDerivation rec { version = "2.18.0"; @@ -9,8 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0imbyk2v6c11da7pkwz91313pkkldxs8zfg81zb2ql6h0nnh6vzq"; }; + broken = true; + buildInputs = [ - pkgconfig python3 python3Packages.pygobject3 at_spi2_core + at_spi2_core + pkgconfig + pythonPackages.python + pythonPackages.pygobject3 ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0906c7ce961..85e3c5f7b6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2944,7 +2944,7 @@ in pwnat = callPackage ../tools/networking/pwnat { }; - pyatspi = callPackage ../development/python-modules/pyatspi { }; + pyatspi = python3Packages.pyatspi; pycangjie = pythonPackages.pycangjie; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a0c2bc5d351..0a2e6bc7286 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -140,6 +140,8 @@ in modules // { plantuml = callPackage ../tools/misc/plantuml { }; + pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}"; + pycairo = callPackage ../development/python-modules/pycairo { }; From d72e82498313705df4cf29681c91177c411c5397 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 13 Mar 2016 16:56:08 -0400 Subject: [PATCH 123/210] pyexiv2: call via pythonPackages --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85e3c5f7b6a..e9fee1e8e3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9452,7 +9452,7 @@ in pycups = pythonPackages.pycups; - pyexiv2 = callPackage ../development/python-modules/pyexiv2 { }; + pyexiv2 = pythonPackages.pyexiv2; pygame = pythonPackages.pygame; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a2e6bc7286..ba084652063 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -149,6 +149,8 @@ in modules // { pycrypto = callPackage ../development/python-modules/pycrypto { }; + pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}"; + pygame = callPackage ../development/python-modules/pygame { }; pygobject = callPackage ../development/python-modules/pygobject { }; From b843ef426c5bb348864c0cb6bd42d4752e3a0a42 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 13 Mar 2016 17:02:41 -0400 Subject: [PATCH 124/210] rhpl: call via pythonPackages --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9fee1e8e3f..bdfd78abb83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9470,7 +9470,7 @@ in pyopenssl = pythonPackages.pyopenssl; - rhpl = callPackage ../development/python-modules/rhpl { }; + rhpl = pythonPackages.rhpl; pyqt4 = pythonPackages.pyqt4; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba084652063..429acdd6347 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -187,6 +187,8 @@ in modules // { pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}"; + rhpl = if !isPy3k then callPackage ../development/python-modules/rhpl {} else throw "rhpl not supported for interpreter ${python.executable}"; + sip = callPackage ../development/python-modules/sip { }; sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { }; From dd16ab92dc7f11c83d74c58f8eb94c7d40191623 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sat, 23 Apr 2016 15:08:45 +0200 Subject: [PATCH 125/210] emby: init at 3.0.5930 --- pkgs/servers/emby/default.nix | 35 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/emby/default.nix diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix new file mode 100644 index 00000000000..26ac26f67c1 --- /dev/null +++ b/pkgs/servers/emby/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, unzip, sqlite }: + +stdenv.mkDerivation rec { + name = "emby-${version}"; + version = "3.0.5930"; + + src = fetchurl { + url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; + sha256 = "0498v7wng13c9n8sjfaq0b8p933vn7hk5icsranm39bkh3jqgdwf"; + }; + + buildInputs = [ unzip ]; + propagatedBuildInputs = [ sqlite ]; + + # Need to set sourceRoot as unpacker will complain about multiple directory output + sourceRoot = "."; + + patchPhase = '' + substituteInPlace System.Data.SQLite.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so + substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server" + ''; + + installPhase = '' + mkdir -p $out/bin + cp -r * $out/bin + ''; + + meta = { + description = "MediaBrowser - Bring together your videos, music, photos, and live television"; + homepage = http://emby.media/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc5b11fdbd3..6cd3c72e89f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -754,6 +754,8 @@ in elementary-icon-theme = callPackage ../data/icons/elementary-icon-theme { }; + emby = callPackage ../servers/emby { }; + enca = callPackage ../tools/text/enca { }; ent = callPackage ../tools/misc/ent { }; From c145f6eaa75567f87dd2f61832c3e28f067cfe2b Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sat, 23 Apr 2016 15:49:33 +0200 Subject: [PATCH 126/210] emby service: new service --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/emby.nix | 64 ++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 nixos/modules/services/misc/emby.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 9e6bbc74438..684ca132bc7 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -263,6 +263,7 @@ caddy = 239; taskd = 240; factorio = 241; + emby = 242; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -497,6 +498,7 @@ caddy = 239; taskd = 240; factorio = 241; + emby = 242; # 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/module-list.nix b/nixos/modules/module-list.nix index 41210e64851..972802b2341 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -216,6 +216,7 @@ ./services/misc/dictd.nix ./services/misc/disnix.nix ./services/misc/docker-registry.nix + ./services/misc/emby.nix ./services/misc/etcd.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix new file mode 100644 index 00000000000..fe872349f45 --- /dev/null +++ b/nixos/modules/services/misc/emby.nix @@ -0,0 +1,64 @@ +{ config, pkgs, lib, mono, ... }: + +with lib; + +let + cfg = config.services.emby; + emby = pkgs.emby; +in +{ + options = { + services.emby = { + enable = mkEnableOption "Emby Media Server"; + + user = mkOption { + type = types.str; + default = "emby"; + description = "User account under which Emby runs."; + }; + + group = mkOption { + type = types.str; + default = "emby"; + description = "Group under which emby runs."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.emby = { + description = "Emby Media Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + test -d /var/lib/emby/ProgramData-Server || { + echo "Creating initial Emby data directory in /var/lib/emby/ProgramData-Server" + mkdir -p /var/lib/emby/ProgramData-Server + chown -R ${cfg.user}:${cfg.group} /var/lib/emby/ProgramData-Server + } + ''; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = "true"; + ExecStart = "${pkgs.mono}/bin/mono ${pkgs.emby}/bin/MediaBrowser.Server.Mono.exe"; + Restart = "on-failure"; + }; + }; + + users.extraUsers = mkIf (cfg.user == "emby") { + emby = { + group = cfg.group; + uid = config.ids.uids.emby; + }; + }; + + users.extraGroups = mkIf (cfg.group == "emby") { + emby = { + gid = config.ids.gids.emby; + }; + }; + }; +} From a1b39b9990f2c23f31875a5993441ea686885df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 23 Apr 2016 16:16:22 +0200 Subject: [PATCH 127/210] cups tests: finally fix them Fixes #14748. --- nixos/tests/printing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 10d69b446cd..c777fd41b78 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -62,7 +62,7 @@ import ./make-test.nix ({pkgs, ... }: { # Test printing various file types. foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", "${pkgs.groff.doc}/share/doc/*/meref.ps", - "${pkgs.cups}/share/doc/cups/images/cups.png", + "${pkgs.cups.out}/share/doc/cups/images/cups.png", "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt") { $file =~ /([^\/]*)$/; my $fn = $1; From 788122c3c5dcd146f65fbd587972b22f5ff8481e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 21 Apr 2016 21:35:41 -0500 Subject: [PATCH 128/210] facetimehd: Only unload module if it is loaded The pre-sleep service exits if any command fails. Unloading facetimehd without it being loaded blocks subsequent commands from running. Note: `modprobe -r` works a bit better when unloading unused modules, and is preferrable to `rmmod`. However, the facetimehd module does not support suspending. In this case, it seems preferable to forcefully unload the module. `modprobe` does not support a `--force` flag when removing, so we are left with `rmmod`. See: - https://github.com/NixOS/nixpkgs/pull/14883 - https://github.com/patjak/bcwc_pcie/wiki#known-issues --- nixos/modules/hardware/video/webcam/facetimehd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix index 309cedca48b..2a2fcf3057d 100644 --- a/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -31,7 +31,7 @@ in # unload module during suspend/hibernate as it crashes the whole system powerManagement.powerDownCommands = '' - ${pkgs.kmod}/bin/rmmod -f facetimehd + ${pkgs.kmod}/bin/lsmod | ${pkgs.gnugrep}/bin/grep -q "^facetimehd" && ${pkgs.kmod}/bin/rmmod -f -v facetimehd ''; # and load it back on resume From 1b80f2478851d7c2bec8e4732224ad6028d0e3cd Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 4 Mar 2016 14:10:17 +0100 Subject: [PATCH 129/210] vim-plugins: make Cocoa optional --- pkgs/misc/vim-plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 0ad4db97635..83dcab35e67 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2,7 +2,7 @@ { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip , which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip , vim_configurable, vimPlugins, xkb_switch, git -, Cocoa +, Cocoa ? null }: let From aaec8fb9f1ab299b399793fe5b86f60a7c3f8f88 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 29 Feb 2016 18:40:32 +0100 Subject: [PATCH 130/210] vim-plugins: add vimprivewpandoc and needed python modules --- pkgs/misc/vim-plugins/default.nix | 21 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 2 ++ pkgs/top-level/python-packages.nix | 46 ++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 83dcab35e67..5b32a1b49ea 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1682,4 +1682,25 @@ rec { }; + vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-pandoc-after-2015-06-01"; + src = fetchgit { + url = "git://github.com/vim-pandoc/vim-pandoc-after"; + rev = "4377665e5c98f29ea838deb3b942200b8dd096ef"; + sha256 = "1di82bgi7sjn7lmma7g9zbdraamsy9c6g7ms6jgglfvynbbvmgg0"; + }; + dependencies = []; + + }; + + vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimpreviewpandoc-2016-03-03"; + src = fetchgit { + url = "git://github.com/tex/vimpreviewpandoc"; + rev = "7c05b4a7bf55a361c7ac33e6e05f7965daed5889"; + sha256 = "12xnnsvdsl2wc7fy537pdk6s3nfxw46g1l4xqr0fxzhz712nczk5"; + }; + dependencies = []; + + }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5102d6cde1c..2b8d71b8760 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -68,6 +68,7 @@ "github:shougo/vimshell.vim" "github:sjl/gundo.vim" "github:takac/vim-hardtime" +"github:tex/vimpreviewpandoc" "github:thinca/vim-quickrun" "github:tomasr/molokai" "github:tpope/vim-eunuch" @@ -77,6 +78,7 @@ "github:vim-airline/vim-airline-themes" "github:vim-pandoc/vim-pandoc" "github:vim-pandoc/vim-pandoc-syntax" +"github:vim-pandoc/vim-pandoc-after" "github:vim-scripts/Colour-Sampler-Pack" "github:vim-scripts/a.vim" "github:vim-scripts/align" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 429acdd6347..68a71864933 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26541,4 +26541,50 @@ in modules // { platforms = platforms.linux; }; }; + pandocfilters = buildPythonPackage rec{ + version = "1.3.0"; + pname = "pandocfilters"; + name = pname + "-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "jgm"; + repo = pname; + rev = version; + sha256 = "0ky9k800ixwiwvra0na6d6qaqcyps83mycgd8qvkrn5r80hddkzz"; + }; + + propagatedBuildInputs = with self; [ ]; + + meta = { + description = "A python module for writing pandoc filters, with a collection of examples"; + homepage = https://github.com/jgm/pandocfilters; + license = licenses.mit; + maintainers = with maintainers; []; + }; + }; + + htmltreediff = buildPythonPackage rec{ + version = "0.1.2"; + pname = "htmltreediff"; + name = pname + "-${version}"; + + # Does not work with Py >= 3 + disabled = !isPy27; + + src = pkgs.fetchFromGitHub { + owner = "christian-oudard"; + repo = pname; + rev = "v" + version; + sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1"; + }; + + propagatedBuildInputs = with self; [ lxml html5lib ]; + + meta = { + description = " Structure-aware diff for html and xml documents"; + homepage = https://github.com/christian-oudard/htmltreediff; + license = licenses.bsdOriginal; + maintainers = with maintainers; []; + }; + }; } From 31176b579227956554a8d347e0a644332951e1f2 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 5 Mar 2016 22:55:55 +0100 Subject: [PATCH 131/210] blockdiag: 1.4.7 --> 1.5.3 * version bump * change url from pypi to bitbucket --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68a71864933..1232f7a58fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2334,11 +2334,12 @@ in modules // { blockdiag = buildPythonPackage rec { - name = "blockdiag-1.4.7"; + name = "blockdiag"; + version = "1.5.3"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/b/blockdiag/${name}.tar.gz"; - sha256 = "0bc29sh8hj3hmhclifh1by0n6vg2pl9wkxb7fmljyw0arjas54bf"; + url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; + sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f"; }; buildInputs = with self; [ pep8 nose unittest2 docutils ]; From 07d305af32ba74319c58f3f66dc94d814f89850d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 23 Apr 2016 20:33:21 +0200 Subject: [PATCH 132/210] rkt: 1.2.0 -> 1.4.0 --- pkgs/applications/virtualization/rkt/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 4845d0b6065..892deadfe38 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -1,15 +1,15 @@ { stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools, - cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }: + cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }: let - coreosImageRelease = "794.1.0"; - coreosImageSystemdVersion = "222"; + coreosImageRelease = "991.0.0"; + coreosImageSystemdVersion = "225"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. stage1Flavours = [ "coreos" "fly" "host" ]; in stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.4.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -17,15 +17,16 @@ in stdenv.mkDerivation rec { rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "0icsrh118mm3rabbcr0gd3b22m5rizdbqlrfp9d79g591p7bjh38"; + sha256 = "0lnvqhg88aa6zx4wnkz17v3f529i9hi0y2aihfsq09pvsn56hwjl"; }; stage1BaseImage = fetchurl { url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym"; + sha256 = "1vaimrbynhjh4f30rq92bv1h3c1lxnf8isx5c2qvnn3lghypss9k"; }; buildInputs = [ + glibc.out glibc.static autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd makeWrapper ]; From 929b0d99c1848ae4491aec0620c1fe252bf2fbd0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 19:32:08 +0300 Subject: [PATCH 133/210] imagemagick: support JPEG2000 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index ef3b7b05b18..b732a2ed916 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg -, lcms2, openexr, libpng, librsvg, libtiff, libxml2 +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg }: let @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg - openexr libpng librsvg libtiff libxml2 + openexr libpng librsvg libtiff libxml2 openjpeg ]; propagatedBuildInputs = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cd3c72e89f..0daa3d2b13c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12814,6 +12814,7 @@ in librsvg = null; libtiff = null; libxml2 = null; + openjpeg = null; }; imagemagick = self.imagemagickBig.override { From 7f32a05baac41ca5472bb9bcc0b1d0ea7f48d7bb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Apr 2016 22:25:34 +0300 Subject: [PATCH 134/210] dwarf-therapist: fix build --- pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 65eb7d49771..6c094ff20f8 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, texlive }: +{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmakeHook, texlive }: let version = "37.0.0"; @@ -15,14 +15,10 @@ stdenv.mkDerivation { outputs = [ "out" "layouts" ]; buildInputs = [ qtbase qtdeclarative ]; - nativeBuildInputs = [ texlive ]; + nativeBuildInputs = [ texlive qmakeHook ]; enableParallelBuilding = false; - configurePhase = '' - $QMAKE PREFIX=$out - ''; - # Move layout files so they cannot be found by Therapist postInstall = '' mkdir -p $layouts From 3f14b00106e74bd6e0d81f8f1af301d38278e0ec Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Fri, 22 Apr 2016 23:34:16 -0300 Subject: [PATCH 135/210] cegui: init at 0.8.4 --- pkgs/development/libraries/cegui/default.nix | 21 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/cegui/default.nix diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix new file mode 100644 index 00000000000..c7d7aa4d67a --- /dev/null +++ b/pkgs/development/libraries/cegui/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake, ogre, freetype, boost, expat }: + +stdenv.mkDerivation rec { + name = "cegui-${version}"; + version = "0.8.4"; + + src = fetchurl { + url = "mirror://sourceforge/crayzedsgui/${name}.tar.bz2"; + sha256 = "1253aywv610rbs96hwqiw2z7xrrv24l3jhfsqj95w143idabvz5m"; + }; + + + buildInputs = [ cmake ogre freetype boost expat ]; + + meta = with stdenv.lib; { + homepage = http://cegui.org.uk/; + description = "C++ Library for creating GUIs"; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 449a17137ae..abeb980a532 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6492,6 +6492,8 @@ in celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {}; celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {}; + cegui = callPackage ../development/libraries/cegui {}; + cgal = callPackage ../development/libraries/CGAL {}; cgui = callPackage ../development/libraries/cgui {}; From a49ffbb196441b53907c4da5953e68e3f50adca9 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Sat, 23 Apr 2016 23:08:02 +0300 Subject: [PATCH 136/210] cargo: add libiconv to buildInputs to fix darwin build --- pkgs/development/tools/build-managers/cargo/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index c3e782a12ea..2d7cdc36504 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -1,5 +1,7 @@ -{ stdenv, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl -, cmake, zlib, makeWrapper }: +{ stdenv, lib, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl +, cmake, zlib, makeWrapper +# Darwin dependencies +, libiconv }: with rustPlatform; @@ -20,7 +22,8 @@ buildRustPackage rec { depsSha256 = "1x2m7ww2z8nl5ic2nds85p7ma8x0zp654jg7ay905ia95daiabzg"; - buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]; + buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ] + ++ lib.optional stdenv.isDarwin libiconv; configurePhase = '' ./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo From 0fc911f029387701c775607cc13b0ccf5b15dc91 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 11:55:39 +0200 Subject: [PATCH 137/210] perl-File-ReadBackwards: init at 1.05 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index da58b1c4cf8..ee389880ea9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5124,6 +5124,19 @@ let self = _self // overrides; _self = with self; { }; }; + FileReadBackwards = buildPerlPackage rec { + name = "File-ReadBackwards-1.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/U/UR/URI/${name}.tar.gz"; + sha256 = "82b261af87507cc3e7e66899c457104ebc8d1c09fb85c53f67c1f90f70f18d6e"; + }; + meta = { + description = "Read a file backwards by lines"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + FileRemove = buildPerlPackage rec { name = "File-Remove-1.52"; src = fetchurl { From 30f1bc1a6496693e866f06cfe72fd3a9980691a5 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 12:36:09 +0200 Subject: [PATCH 138/210] perl-Test-Fatal: 0.013 -> 0.014 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ee389880ea9..ffcc0496118 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11852,17 +11852,18 @@ let self = _self // overrides; _self = with self; { }; }; - TestFatal = buildPerlPackage { - name = "Test-Fatal-0.013"; + TestFatal = buildPerlPackage rec { + name = "Test-Fatal-0.014"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.013.tar.gz; - sha256 = "1rrndzkjff3bdlzzdsfsd3fhng142la2m74ihkgv17islkp17yq2"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "bcdcef5c7b2790a187ebca810b0a08221a63256062cfab3c3b98685d91d1cbb0"; }; propagatedBuildInputs = [ TryTiny ]; meta = { - homepage = https://github.com/rjbs/test-fatal; + homepage = https://github.com/rjbs/Test-Fatal; description = "Incredibly simple helpers for testing code with exceptions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From 367b5d7710fbc5e6e8125b974c000d9a44f175a8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 12:37:20 +0200 Subject: [PATCH 139/210] perl-Pod-LaTeX: fix build and license fields --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ffcc0496118..0d76a3c07b4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10076,17 +10076,18 @@ let self = _self // overrides; _self = with self; { }; }; - PodLaTeX = buildPerlModule { + PodLaTeX = buildPerlModule rec { name = "Pod-LaTeX-0.61"; src = fetchurl { - url = mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz; + url = "mirror://cpan/authors/id/T/TJ/TJENNESS/${name}.tar.gz"; sha256 = "15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46"; }; - propagatedBuildInputs = [ if_ ]; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ self."if" ]; meta = { homepage = http://github.com/timj/perl-Pod-LaTeX/tree/master; description = "Convert Pod data to formatted Latex"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; From 8693a51c7d33f457d8bb2fd95fcef4a4ad2d0d85 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 12:38:07 +0200 Subject: [PATCH 140/210] perl-Pod-POM: init at 2.01 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d76a3c07b4..ba776785489 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10076,6 +10076,21 @@ let self = _self // overrides; _self = with self; { }; }; + PodPOM = buildPerlPackage rec { + name = "Pod-POM-2.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + sha256 = "1b50fba9bbdde3ead192beeba0eaddd0c614e3afb1743fa6fff805f57c56f7f4"; + }; + buildInputs = [ FileSlurper TestDifferences TextDiff ]; + meta = { + homepage = https://github.com/neilb/Pod-POM; + description = "POD Object Model"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + PodLaTeX = buildPerlModule rec { name = "Pod-LaTeX-0.61"; src = fetchurl { From 9ff7ad81d800447a9c42ec919cb6824dffa82078 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 12:39:13 +0200 Subject: [PATCH 141/210] perl-Pod-POM-View-TOC: init at 0.02 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ba776785489..85ca89926b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10091,6 +10091,21 @@ let self = _self // overrides; _self = with self; { }; }; + PodPOMViewTOC = buildPerlPackage rec { + name = "Pod-POM-View-TOC-0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; + sha256 = "ccb42272c7503379cb1131394620ee50276d72844e0e80eb4b007a9d58f87623"; + }; + buildInputs = [ TestMore ]; + propagatedBuildInputs = [ PodPOM ]; + meta = { + description = "Generate the TOC of a POD with Pod::POM"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + PodLaTeX = buildPerlModule rec { name = "Pod-LaTeX-0.61"; src = fetchurl { From 93972de2e7500677c2316813462b9ca951943fa0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 12:42:03 +0200 Subject: [PATCH 142/210] perl-MIME-Lite: init at 3.030 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 85ca89926b2..013a131da3a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7565,6 +7565,20 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ProcWaitStat ]; }; + MIMELite = buildPerlPackage rec { + name = "MIME-Lite-3.030"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "8f39901bc580bc3dce69e10415305e4435ff90264c63d29f707b4566460be962"; + }; + propagatedBuildInputs = [ EmailDateFormat MailTools MIMETypes ]; + meta = { + description = "Low-calorie MIME generator (DEPRECATED)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + MIMEtools = buildPerlPackage { name = "MIME-tools-5.507"; src = fetchurl { From 2d3ffdc33921307ee2cc08df49de2c827c371c6e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 12:48:10 +0200 Subject: [PATCH 143/210] perl-MailTools: 2.13 -> 2.14 Also add meta section. --- pkgs/top-level/perl-packages.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 013a131da3a..7857f130bce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7325,13 +7325,18 @@ let self = _self // overrides; _self = with self; { }; }; - MailTools = buildPerlPackage { - name = "MailTools-2.13"; + MailTools = buildPerlPackage rec { + name = "MailTools-2.14"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.13.tar.gz; - sha256 = "1djjl05ndn8dmwri4vw5wfky5sqy7sf63qaijvhf9g5yh53405kj"; + url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; + sha256 = "1y6zndb4rsn8i65g1bg3b0zb7966cz83q19zg7m7bvxjfkv7wz2b"; + }; + propagatedBuildInputs = [ TimeDate ]; + meta = { + description = "Various e-mail related modules"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; - propagatedBuildInputs = [TimeDate TestPod]; }; MathLibm = buildPerlPackage rec { From 8410664baa148a99603e4c4663cb4fff76971808 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 12:49:23 +0200 Subject: [PATCH 144/210] perl-Catalyst-Controller-POD: init at 1.0.0 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7857f130bce..07ca0677aa3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -973,6 +973,22 @@ let self = _self // overrides; _self = with self; { namespaceautoclean ]; }; + CatalystControllerPOD = buildPerlPackage rec { + name = "Catalyst-Controller-POD-1.0.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; + sha256 = "ee2a4bb3ed78baa1464335408f284345b6ba0ef6576ad7bfbd7b656c788a39f9"; + }; + buildInputs = [ CatalystRuntime ModuleBuild ModuleInstall TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ CatalystPluginStaticSimple CatalystRuntime ClassAccessor FileShareDir FileSlurp JSONXS LWP ListMoreUtils PathClass PodPOM PodPOMViewTOC TestWWWMechanizeCatalyst XMLSimple ]; + meta = { + homepage = http://search.cpan.org/dist/Catalyst-Controller-POD/; + description = "Serves PODs right from your Catalyst application"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ maintainers.rycee ]; + }; + }; + CatalystDevel = buildPerlPackage { name = "Catalyst-Devel-1.39"; src = fetchurl { From 5895b38c2998f8830e166cad6aefbb18c61cc12c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 13:12:16 +0200 Subject: [PATCH 145/210] perl-Guard: 1.022 -> 1.023 Fixes build with Perl 5.22. --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 07ca0677aa3..fb7e3189210 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5593,11 +5593,11 @@ let self = _self // overrides; _self = with self; { }; }; - Guard = buildPerlPackage { - name = "Guard-1.022"; + Guard = buildPerlPackage rec { + name = "Guard-1.023"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.022.tar.gz; - sha256 = "0saq9949d13mdvpnls7mw1cy74lm4ncl7agbs7n2jl4sy6bvmw9m"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + sha256 = "34c4ddf91fc93d1090d86da14df706d175b1610c67372c01e12ce9555d4dd1dc"; }; meta = { maintainers = with maintainers; [ ocharles ]; From 46e5412cfd92aea1a6eaeef84e49b8680d583513 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 19:16:20 +0200 Subject: [PATCH 146/210] perl-Exception-Base: 0.25 -> 0.2501 Fixes build under Perl 5.22. --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fb7e3189210..6517879cb40 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4516,16 +4516,17 @@ let self = _self // overrides; _self = with self; { }; }; - ExceptionBase = buildPerlPackage { - name = "Exception-Base-0.25"; + ExceptionBase = buildPerlPackage rec { + name = "Exception-Base-0.2501"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz; - sha256 = "1s2is862xba2yy633wn2nklrya36yrlwxlbpqjrv8m31xj2c8khw"; + url = "mirror://cpan/authors/id/D/DE/DEXTER/${name}.tar.gz"; + sha256 = "5723dd78f4ac0b4d262a05ea46af663ea00d8096b2e9c0a43515c210760e1e75"; }; buildInputs = [ TestUnitLite ]; meta = { + description = "Lightweight exceptions"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; }; }; From 71b935c33978ceda7b761c0d798f373407f7a4d1 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Fri, 22 Apr 2016 22:58:51 -0300 Subject: [PATCH 147/210] opendungeons: init at 0.6.0 --- pkgs/games/opendungeons/cmakepaths.patch | 17 +++++++++++++++++ pkgs/games/opendungeons/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/games/opendungeons/cmakepaths.patch create mode 100644 pkgs/games/opendungeons/default.nix diff --git a/pkgs/games/opendungeons/cmakepaths.patch b/pkgs/games/opendungeons/cmakepaths.patch new file mode 100644 index 00000000000..bcffd7a22bc --- /dev/null +++ b/pkgs/games/opendungeons/cmakepaths.patch @@ -0,0 +1,17 @@ +--- ../CMakeLists.txt ++++ ../CMakeLists.txt +@@ -31,12 +31,12 @@ + set(OD_PLUGINS_CFG_PATH ".") + else() + # Set binary and data install locations if we want to use the installer +- set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/games CACHE PATH "Absolute path to the game binary directory") ++ set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Absolute path to the game binary directory") + set(OD_DATA_PATH ${CMAKE_INSTALL_PREFIX}/share/games/${PROJECT_NAME} CACHE PATH "Absolute path to the game data directory") + set(OD_SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Absolute path to the shared data directory (desktop file, icons, etc.)") + # Set the plugins.cfg file path to a common but architecture-dependent location. + # Because the plugins.cfg Ogre plugins path path may vary depending on the architecture used. +- set(OD_PLUGINS_CFG_PATH /etc/${PROJECT_NAME} CACHE PATH "Absolute path to the Ogre plugins.cfg file") ++ set(OD_PLUGINS_CFG_PATH ${CMAKE_INSTALL_PREFIX}/etc/${PROJECT_NAME} CACHE PATH "Absolute path to the Ogre plugins.cfg file") + endif() + + if(NOT MSVC) diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix new file mode 100644 index 00000000000..fe3a381c7f5 --- /dev/null +++ b/pkgs/games/opendungeons/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, ogre, cegui, boost, sfml, openal, cmake, ois }: + +stdenv.mkDerivation rec { + name = "opendungeons-${version}"; + version = "0.6.0"; + + src = fetchurl { + url = "ftp://download.tuxfamily.org/opendungeons/${version}/${name}.tar.xz"; + sha256 = "1g0sjh732794h26cbkr0p96i3c0avm0mx9ip5zbvb2y3sbpjcbib"; + }; + + patches = [ ./cmakepaths.patch ]; + + buildInputs = [ cmake ogre cegui boost sfml openal ois ]; + + meta = with stdenv.lib; { + description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; + homepage = "https://opendungeons.github.io"; + license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abeb980a532..fcfba76dbf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14904,6 +14904,8 @@ in openarena = callPackage ../games/openarena { }; + opendungeons = callPackage ../games/opendungeons { }; + openlierox = callPackage ../games/openlierox { }; openmw = callPackage ../games/openmw { }; From cf445932263b1c6f6131c83f1c19b281717ee308 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Apr 2016 22:49:18 +0200 Subject: [PATCH 148/210] perl-PDF-API2: init at 2.027 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6517879cb40..62ebb60c539 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9608,6 +9608,20 @@ let self = _self // overrides; _self = with self; { }; }; + PDFAPI2 = buildPerlPackage rec { + name = "PDF-API2-2.027"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz"; + sha256 = "d24db02d902198406270551857830633b289ad39f5a9ba5431246f8cd60e7599"; + }; + propagatedBuildInputs = [ FontTTF ]; + meta = { + description = "Facilitates the creation and modification of PDF files"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ maintainers.rycee ]; + }; + }; + Pegex = buildPerlPackage rec { name = "Pegex-0.60"; src = fetchurl { From c397348538fc7874daa361711002958e84b66499 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 23 Apr 2016 22:52:34 +0200 Subject: [PATCH 149/210] vdirsyncer: 0.9.3 -> 0.10.0 lxml is not needed anymore. I added myself to the maintainers. I didn't check why pypi is providing this complicated URL now. --- pkgs/tools/misc/vdirsyncer/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index fedfaa48aa3..0cf7f92912e 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -3,18 +3,17 @@ # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst pythonPackages.buildPythonApplication rec { - version = "0.9.3"; + version = "0.10.0"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { - url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz"; - sha256 = "1wjhzjfcvwz68j6wc5cmjsw69ggwcpfy7jp7z7q6fnwwp4dr98lc"; + url = "https://pypi.python.org/packages/0b/fb/c42223e1e9169e4770194e62143d431755724b080d8cb77f14705b634815/vdirsyncer-0.10.0.tar.gz"; + sha256 = "1gf86sbd6w0w4zayh9r3irlp5jwrzbjikjc0vs5zkdpa5c199f78"; }; propagatedBuildInputs = with pythonPackages; [ click click-log click-threading - lxml requests_toolbelt requests2 atomicwrites @@ -31,7 +30,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with maintainers; [ matthiasbeyer jgeerds DamienCassou ]; platforms = platforms.all; license = licenses.mit; }; From 3c4f8612007d9b8f8e4c569d855ca4d8b4303cfe Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 24 Apr 2016 05:51:54 +0300 Subject: [PATCH 150/210] audacity: 2.1.1 -> 2.1.2 --- pkgs/applications/audio/audacity/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index afa8a94d200..a93a445db31 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, +{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ }: stdenv.mkDerivation rec { - version = "2.1.1"; + version = "2.1.2"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "15c5ff7ac1c0b19b08f4bdcb0f4988743da2f9ed3fab41d6f07600e67cb9ddb6"; + sha256 = "1ggr6g0mk36rqj7ahsg8b0b1r9kphwajzvxgn43md263rm87n04h"; }; patches = [(fetchpatch { name = "new-ffmpeg.patch"; @@ -18,12 +18,6 @@ stdenv.mkDerivation rec { sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf"; })]; - # fix with gcc-5 from http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2012-December/245884.html - postPatch = '' - substituteInPlace lib-src/libnyquist/nyquist/ffts/src/fftlib.c \ - --replace 'inline void' 'static inline void' - ''; - preConfigure = /* we prefer system-wide libs */ '' mv lib-src lib-src-rm mkdir lib-src @@ -31,11 +25,11 @@ stdenv.mkDerivation rec { rm -r lib-src-rm/ ''; - configureFlags = "--with-libsamplerate"; + configureFlags = [ "--with-libsamplerate" ]; buildInputs = [ - pkgconfig gettext wxGTK gtk expat alsaLib - libsndfile soxr libid3tag + pkgconfig gettext wxGTK30 expat alsaLib + libsndfile soxr libid3tag gtk ffmpeg libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms From 022b4a8dd1f0861e5251763b5d79dc5ed5fb4e5d Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 24 Apr 2016 12:28:56 +0200 Subject: [PATCH 151/210] workrave: add missing dependencies --- pkgs/applications/misc/workrave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index f0f0b00c927..045767eb413 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, gettext, intltool, libtool, pkgconfig, - libXtst, cheetah, libXScrnSaver, + libXtst, cheetah, libXScrnSaver, xorg, glib, glibmm, gtk, gtkmm, atk, @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libXScrnSaver glib glibmm gtk gtkmm atk pango pangomm cairo cairomm - dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx + dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx xorg.libICE xorg.libSM ]; preConfigure = "./autogen.sh"; From dc0d32cab756b3b7c61b031c6b7767f790aba293 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 24 Apr 2016 14:34:25 +0200 Subject: [PATCH 152/210] libu2f-host: Install udev-rules. This allows users to automatically set up necessary udev-rules by adding `pkgs.libu2f-host` to `services.udev.packages`. --- pkgs/development/libraries/libu2f-host/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index de51da51bca..dc2481a2e85 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ json_c hidapi ]; + postInstall = '' + mkdir -p $out/lib/udev/rules.d/ + cp -v *.rules $out/lib/udev/rules.d/ + ''; + meta = with stdenv.lib; { homepage = https://developers.yubico.com/libu2f-host; description = "A C library and command-line tool thati mplements the host-side of the U2F protocol"; From a9a94df4e644168de200c3689d3c53100256bf74 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 24 Apr 2016 16:20:37 +0300 Subject: [PATCH 153/210] SDL: use mesa_noglu instead of mesa --- pkgs/development/libraries/SDL/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 6c3920ff8aa..5d97a7fa59e 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap -, openglSupport ? false, mesa ? null +, openglSupport ? false, mesa_noglu ? null , alsaSupport ? true, alsaLib ? null , x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null @@ -10,7 +10,7 @@ # PulseAudio. assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (mesa != null && x11Support); +assert openglSupport -> (mesa_noglu != null && x11Support); assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { optionals x11Support [ xlibsWrapper libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optional openglSupport mesa ++ + optional openglSupport mesa_noglu ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; From 953c51f65e399f71fb76c2f1a41932fed675037b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 24 Apr 2016 16:33:11 +0300 Subject: [PATCH 154/210] dwarf-fortress-unfuck: use mesa_noglu instead of mesa --- pkgs/games/dwarf-fortress/unfuck.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 598f795083b..1d6ea1196da 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake -, mesa, SDL, SDL_image, SDL_ttf, glew, openalSoft +, mesa_noglu, SDL, SDL_image, SDL_ttf, glew, openalSoft , ncurses, glib, gtk2, libsndfile, zlib }: @@ -20,8 +20,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ - mesa SDL SDL_image SDL_ttf glew openalSoft - ncurses gtk2 libsndfile zlib + SDL SDL_image SDL_ttf glew openalSoft + ncurses gtk2 libsndfile zlib mesa_noglu ]; installPhase = '' From 1c08aa2704e0b9d5bf1bb9f3f9b607edf2dbdcea Mon Sep 17 00:00:00 2001 From: ldesgoui Date: Sun, 24 Apr 2016 16:45:09 +0200 Subject: [PATCH 155/210] discord: 0.0.1 -> 0.0.3 --- .../networking/instant-messengers/discord/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 86b21f90ad9..0d6e6d40284 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,22 +4,22 @@ , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango , libudev }: -let version = "0.0.1"; in +let version = "0.0.3"; in stdenv.mkDerivation { name = "discord-${version}"; src = fetchurl { - url = "https://storage.googleapis.com/discord-developer/test/discord-canary-${version}.tar.gz"; - sha256 = "1skmwc84s4xqyc167qrplhy5ah06kwfa3d3rxiwi4c8rc55vdd0g"; + url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz"; + sha256 = "1k1mnfkcx7183qbdc4qx1anngddqim969cribg9gzc7mixvj17ca"; }; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome.GConf gtk libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss pango libudev + libXtst nspr nss pango libudev.out ]; installPhase = '' @@ -35,12 +35,13 @@ stdenv.mkDerivation { ln -s $out/DiscordCanary $out/bin/ # Putting udev in the path won't work :( - ln -s ${libudev}/lib/libudev.so.1 $out + ln -s ${libudev.out}/lib/libudev.so.1 $out ''; meta = with stdenv.lib; { description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone"; homepage = "https://discordapp.com/"; + downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; license = licenses.unfree; maintainers = [ maintainers.ldesgoui ]; platforms = [ "x86_64-linux" ]; From 01bdf515977fb53f02365f104dff9ee1abb0b1b5 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 24 Apr 2016 16:56:31 +0200 Subject: [PATCH 156/210] go tools: 2015-08-24 -> 2016-02-04 (#14943) --- pkgs/top-level/go-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 941f77d9a61..00d5f44128a 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -147,11 +147,11 @@ let }; tools = buildFromGitHub { - rev = "b48dc8da98ae78c3d11f220e7d327304c84e623a"; - version = "2015-08-24"; + rev = "c887be1b2ebd11663d4bf2fbca508c449172339e"; + version = "2016-02-04"; owner = "golang"; repo = "tools"; - sha256 = "187p3jjxrw2qjnzqwwrq7f9w10zh6vcnwnfl3q7ms8rbiffpjy5c"; + sha256 = "15cm7wmab5na4hphvriazlz639882z0ipb466xmp7500rn6f5kzf"; goPackagePath = "golang.org/x/tools"; goPackageAliases = [ "code.google.com/p/go.tools" ]; From af9fcaf910a4087bae0f51be03d9131302fc0201 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 24 Apr 2016 18:08:32 +0300 Subject: [PATCH 157/210] mumble: fix mumble-overlay --- pkgs/applications/networking/mumble/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 88b9ae49efd..c46ef561c37 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -83,8 +83,9 @@ let NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher"; installPhase = '' - cp scripts/mumble-overlay $out/bin + install -m755 scripts/mumble-overlay $out/bin sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay + ( cd $out/lib; ln -s libmumble.so.1.* libmumble.so.1 ) mkdir -p $out/share/applications cp scripts/mumble.desktop $out/share/applications From 9ad2832b1bf6897d59d7085859b3ed8627aa1cd7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Apr 2016 17:22:40 +0200 Subject: [PATCH 158/210] pgadmin: Fix build Fixes #14919. --- pkgs/applications/misc/pgadmin/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 894aeaab425..2f33edc9adc 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }: +{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib }: stdenv.mkDerivation rec { name = "pgadmin3-${version}"; @@ -11,12 +11,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ]; + buildInputs = [ postgresql wxGTK openssl zlib ]; preConfigure = '' substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell" ''; + configureFlags = [ + "--with-libxml2=${libxml2}" + "--with-libxslt=${libxslt}" + ]; + meta = with stdenv.lib; { description = "PostgreSQL administration GUI tool"; homepage = http://www.pgadmin.org; From 76fc67a083f3140ce5d31c8afe83496ad4d26f2f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Apr 2016 16:49:52 +0200 Subject: [PATCH 159/210] darkice: Fix build due to multiple outputs --- pkgs/tools/audio/darkice/default.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index e4fc129ef60..8ac9039b57e 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -1,10 +1,20 @@ -{ stdenv, buildEnv, fetchurl, alsaLib, faac, libjack2, lame, libogg, libopus, libpulseaudio, libsamplerate, libvorbis }: +{ stdenv, buildEnv, fetchurl +, libjack2, alsaLib, libpulseaudio +, faac, lame, libogg, libopus, libvorbis, libsamplerate +}: let oggEnv = buildEnv { name = "env-darkice-ogg"; paths = [ - libopus libvorbis libogg + libopus.dev libopus libvorbis.dev libvorbis libogg.dev libogg + ]; + }; + + darkiceEnv = buildEnv { + name = "env-darkice"; + paths = [ + lame.out lame.lib libpulseaudio libpulseaudio.dev alsaLib alsaLib.dev libsamplerate.out libsamplerate.dev ]; }; @@ -18,13 +28,13 @@ in stdenv.mkDerivation rec { }; configureFlags = [ - "--with-alsa-prefix=${alsaLib}" + "--with-alsa-prefix=${darkiceEnv}" "--with-faac-prefix=${faac}" "--with-jack-prefix=${libjack2}" - "--with-lame-prefix=${lame}" + "--with-lame-prefix=${darkiceEnv}" "--with-opus-prefix=${oggEnv}" - "--with-pulseaudio-prefix=${libpulseaudio}" - "--with-samplerate-prefix=${libsamplerate}" + "--with-pulseaudio-prefix=${darkiceEnv}" + "--with-samplerate-prefix=${darkiceEnv}" "--with-vorbis-prefix=${oggEnv}" # "--with-aacplus-prefix=${aacplus}" ### missing: aacplus # "--with-twolame-prefix=${twolame}" ### missing: twolame @@ -34,6 +44,6 @@ in stdenv.mkDerivation rec { homepage = http://darkice.org/; description = "Live audio streamer"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; + maintainers = with stdenv.lib.maintainers; [ ikervagyok fpletz ]; }; } From d1d4bd9a9dc5ee605ed5d06f815da4842b4c1ebe Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Apr 2016 17:32:22 +0200 Subject: [PATCH 160/210] avrdude: 6.1 -> 6.3 --- pkgs/development/tools/misc/avrdude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 2026e0ad2c8..e7d5aaceb2b 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -6,11 +6,11 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null; stdenv.mkDerivation rec { - name = "avrdude-6.1"; + name = "avrdude-6.3"; src = fetchurl { url = "mirror://savannah/avrdude/${name}.tar.gz"; - sha256 = "0frxg0q09nrm95z7ymzddx7ysl77ilfbdix1m81d9jjpiv5bm64y"; + sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg"; }; configureFlags = stdenv.lib.optionalString docSupport "--enable-doc"; From 73182fd328b40fedd2f81ab452a8a0ec01d0885c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 24 Apr 2016 18:49:22 +0300 Subject: [PATCH 161/210] mumble_overlay: move from mumble and more fixes --- .../networking/mumble/default.nix | 4 ---- .../networking/mumble/overlay.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/mumble/overlay.nix diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index c46ef561c37..53fa7146257 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -83,10 +83,6 @@ let NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher"; installPhase = '' - install -m755 scripts/mumble-overlay $out/bin - sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay - ( cd $out/lib; ln -s libmumble.so.1.* libmumble.so.1 ) - mkdir -p $out/share/applications cp scripts/mumble.desktop $out/share/applications diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix new file mode 100644 index 00000000000..23f78ff29b3 --- /dev/null +++ b/pkgs/applications/networking/mumble/overlay.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, which, file, mumble, mumble_i686 +}: + +let + binPath = lib.makeBinPath [ which file ]; +in stdenv.mkDerivation { + name = "mumble-overlay-${mumble.version}"; + + inherit (mumble) src; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/lib + ln -s ${mumble}/lib/libmumble.so.1.* $out/lib/libmumble.so.1 + ${lib.optionalString (mumble_i686 != null) '' + mkdir -p $out/lib32 + ln -s ${mumble_i686}/lib/libmumble.so.1.* $out/lib32/libmumble.so.1 + ''} + install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay + sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay + sed -i '2iPATH="${binPath}:$PATH"' $out/bin/mumble-overlay + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0d6690b3ae..0956dcf680c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13280,6 +13280,12 @@ in iceSupport = config.murmur.iceSupport or true; }) mumble mumble_git murmur murmur_git; + mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { + mumble_i686 = if system == "x86_64-linux" + then pkgsi686Linux.mumble + else null; + }; + musescore = qt5.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; From fb13625a44099fe03b6e6d671b9bbb06ab69ae7f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 24 Apr 2016 16:55:20 +0100 Subject: [PATCH 162/210] rofi: 0.15.12 -> 1.0.0 (#14950) --- pkgs/applications/misc/rofi/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 9f11a141ff4..e1ee9b2d145 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,21 +1,31 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig -, libX11, libXinerama, pango, cairo +, libX11, libxkbcommon, pango, cairo, glib +, libxcb, xcbutil, xcbutilwm, which, git , libstartup_notification, i3Support ? false, i3 }: stdenv.mkDerivation rec { name = "rofi-${version}"; - version = "0.15.12"; + version = "1.0.0"; src = fetchurl { - url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz"; - sha256 = "112fgx2awsw1xf1983bmy3jvs33qwyi8qj7j59jqc4gx07nv1rp5"; + url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz"; + sha256 = "0ard95pjgykafm5ga8lfy7x206f07lrc6kara5s9irlhdgblq2m5"; }; - buildInputs = [ autoreconfHook pkgconfig libX11 libXinerama pango - cairo libstartup_notification + preConfigure = '' + patchShebangs "script" + # root not present in build /etc/passwd + sed -i 's/~root/~nobody/g' test/helper-expand.c + ''; + + buildInputs = [ autoreconfHook pkgconfig libX11 libxkbcommon pango + cairo libstartup_notification libxcb xcbutil xcbutilwm + which git ] ++ stdenv.lib.optional i3Support i3; + doCheck = true; + meta = { description = "Window switcher, run dialog and dmenu replacement"; homepage = https://davedavenport.github.io/rofi; From 5ec61652d77cc250d25bb40062a1107ed37e3792 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sun, 24 Apr 2016 16:55:15 +0100 Subject: [PATCH 163/210] perl-packages: Remove Coro and NetRabbitFoot These are no longer buildable with Perl 5.22 and beyond, and upstream have confirmed that this won't change. --- pkgs/top-level/perl-packages.nix | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62ebb60c539..b6914325279 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2284,19 +2284,6 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CGICookieXS ]; }; - Coro = buildPerlPackage rec { - name = "Coro-6.41"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; - sha256 = "1r1gam4yyl6w88ga8rkbvj33v1r5ald3ryqlpg13c7y1i79yizxa"; - }; - propagatedBuildInputs = [ AnyEvent Guard CommonSense ]; - meta = { - maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; - }; - }; - CPAN = buildPerlPackage rec { name = "CPAN-2.10"; src = fetchurl { @@ -9141,22 +9128,6 @@ let self = _self // overrides; _self = with self; { }; }; - NetRabbitFoot = buildPerlPackage { - name = "Net-RabbitFoot-1.03"; - src = fetchurl { - url = mirror://cpan/authors/id/I/IK/IKUTA/Net-RabbitFoot-1.03.tar.gz; - sha256 = "0544b1914e7847b32b60a643abc6f0b1fdc6d4a816afd84bcd3eee0c28b001ac"; - }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ AnyEventRabbitMQ ConfigAny Coro JSONXS ListMoreUtils Moose MooseXAppCmd MooseXAttributeHelpers MooseXConfigFromFile ]; - meta = { - description = "An Asynchronous and multi channel Perl AMQP client"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; - }; - }; - NetServer = buildPerlPackage { name = "Net-Server-2.007"; src = fetchurl { From f583efea44fd0fb432bbeed2ae5093e288961d08 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sun, 24 Apr 2016 16:57:10 +0100 Subject: [PATCH 164/210] perl-packages: Remove ocharles from maintainers I no longer write Perl and it is not productive for me to maintain things I don't use/track upstream. --- pkgs/top-level/perl-packages.nix | 262 +++++++++++++++---------------- 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b6914325279..c2c291e0979 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -83,7 +83,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ AlgorithmDiff ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -125,7 +125,7 @@ let self = _self // overrides; _self = with self; { sha256 = "16nnqzxy5baiar6gxnq5w296mmjgijcn1jq8rp867nksph03mxz8"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -154,7 +154,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "An asynchronous and multi channel Perl AMQP client"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -227,7 +227,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/rjbs/app-cmd; description = "Write command line apps with less suffering"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -581,7 +581,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Wrap OP check callbacks"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -607,7 +607,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [CarpClan]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -727,7 +727,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ StringCRC32 ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -741,7 +741,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Perl client for B, in C language"; license = "perl"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -755,7 +755,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TimeDate DBFile DigestSHA1 FileNFSLock HeapFibonacci IOString ]; doCheck = false; # can time out meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -806,7 +806,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [HTMLTiny LWP]; buildInputs = [TestPod]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -919,7 +919,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "HTTP Basic and Digest authentication"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -1149,7 +1149,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Flexible caching support for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -1165,7 +1165,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "HTTP/1.1 cache validators for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -1229,7 +1229,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Unicode aware Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -1524,7 +1524,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestException ]; meta = { description = "Convert flat hash to nested data using TT2's dot convention"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -1645,7 +1645,7 @@ let self = _self // overrides; _self = with self; { }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -2250,7 +2250,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ SymbolUtil ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -2509,7 +2509,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/dist/Crypt-Random-Source; description = "Get weak or strong random data from pluggable sources"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -2695,7 +2695,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Polymorphic data cloning"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -2942,7 +2942,7 @@ let self = _self // overrides; _self = with self; { homepage = https://metacpan.org/release/Data-UUID-MT; description = "Fast random UUID generator using the Mersenne Twister algorithm"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -3012,7 +3012,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [CarpClan BitVector]; doCheck = false; # some of the checks rely on the year being <2015 meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -3167,7 +3167,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Parses ISO8601 formats"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -3223,7 +3223,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Parse and format PostgreSQL dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -3595,7 +3595,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/dist/DBIx-Connector/; description = "Fast, safe DBI connection and transaction management"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -3645,7 +3645,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DBI ]; meta = { description = "Very complete easy-to-use OO interface to DBI"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -3668,7 +3668,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Find memory cycles in objects"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -3684,7 +3684,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Adding keywords to perl, in perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles rycee ]; + maintainers = with maintainers; [ rycee ]; }; }; @@ -3731,7 +3731,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ Moose namespaceclean SubExporter Testuseok TestWarn ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -3815,7 +3815,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Keyed-Hashing for Message Authentication"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -3862,7 +3862,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ LWP ]; meta = { description = "Perl extension for getting MD5 sums for files and urls"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -4273,7 +4273,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Generate world unique message-ids"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -4289,7 +4289,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/rjbs/Email-MIME; description = "Easy MIME message handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles rycee ]; + maintainers = with maintainers; [ rycee ]; }; }; @@ -4303,7 +4303,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/rjbs/Email-MIME-ContentType; description = "Parse a MIME Content-Type Header"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles rycee ]; + maintainers = with maintainers; [ rycee ]; }; }; @@ -4318,7 +4318,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/rjbs/Email-MIME-Encodings; description = "A unified interface to MIME encoding and decoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles rycee ]; + maintainers = with maintainers; [ rycee ]; }; }; @@ -4475,7 +4475,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1qhmj15a66h90pjl2dgnxsb9jj3b1r5mpvnr87cafcl8g69z0jr4"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -4513,7 +4513,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Lightweight exceptions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; }; }; @@ -4535,7 +4535,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestAssert TestUnitLite ]; propagatedBuildInputs = [ constantboolean ExceptionBase ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -4549,7 +4549,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestAssert TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -4566,7 +4566,7 @@ let self = _self // overrides; _self = with self; { homepage = http://open-exodus.net/projects/Exporter-Declare; description = "Exporting done right"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -4680,7 +4680,7 @@ let self = _self // overrides; _self = with self; { }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -4835,7 +4835,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ExceptionWarning TestAssert TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase ExceptionDied ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -4871,7 +4871,7 @@ let self = _self // overrides; _self = with self; { homepage = http://open-exodus.net/projects/Fennec-Lite; description = "Minimalist Fennec, the commonly used bits"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -5096,7 +5096,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1kclhmyha2xijq49darlz82f3bn7gq3saycxpfiz3dndqhr5i9iz"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -5123,7 +5123,7 @@ let self = _self // overrides; _self = with self; { homepage = https://metacpan.org/release/File-pushd; description = "Change directory temporarily for a limited scope"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -5160,7 +5160,7 @@ let self = _self // overrides; _self = with self; { homepage = http://github.com/ingydotnet/file-share-pm/tree; description = "Extend File::ShareDir to Local Libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -5187,7 +5187,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Install shared files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -5481,7 +5481,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgs.gnupg1orig ]; meta = { platforms = stdenv.lib.platforms.linux; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; }; }; @@ -5588,7 +5588,7 @@ let self = _self // overrides; _self = with self; { sha256 = "34c4ddf91fc93d1090d86da14df706d175b1610c67372c01e12ce9555d4dd1dc"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -5661,7 +5661,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ Testuseok ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -5673,7 +5673,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1plv2djbyhvkdcw2ic54rdqb745cwksxckgzvw7ssxiir7rjknnc"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -5796,7 +5796,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir HTMLTree JSON ListAllUtils Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass SubExporter SubName TryTiny aliased namespaceautoclean ]; meta = { description = "HTML forms using Moose"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5879,7 +5879,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestBase ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -5977,7 +5977,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Add XPath support to HTML::TreeBuilder"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -6225,7 +6225,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/ingydotnet/io-all-pm/tree; description = "IO::All of it to Graham and Damian!"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -6405,7 +6405,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/rjbs/io-tiecombine; description = "Produce tied (and other) separate but combined variables"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -6721,7 +6721,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -6880,7 +6880,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -6914,7 +6914,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -7005,7 +7005,7 @@ let self = _self // overrides; _self = with self; { description = "Perl module for manipulating .po entries from GNU gettext"; license = "unknown"; platforms = stdenv.lib.platforms.linux; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; }; }; @@ -7054,7 +7054,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Simple logging interface with a contextual log"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -7069,7 +7069,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Dispatches messages to one or more outputs"; license = stdenv.lib.licenses.artistic2; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -7263,7 +7263,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ LWP HookLexWrap ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; # Tests require network connectivity @@ -7443,7 +7443,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/dist/Math-Random-ISAAC; description = "Perl interface to the ISAAC PRNG algorithm"; license = with stdenv.lib.licenses; [ publicDomain mit artistic2 gpl3 ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -7458,7 +7458,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Auto-seeded Mersenne Twister PRNGs"; license = "unrestricted"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -7474,7 +7474,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; license = stdenv.lib.licenses.artistic2; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -7505,7 +7505,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Tools for creating Meta objects to track custom metrics"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -7520,7 +7520,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Basic method declarations with signatures, without source filters"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -7783,7 +7783,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Declare author-only dependencies"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -7798,7 +7798,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Designate tests only run by module authors"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -7954,7 +7954,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.unzip ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8106,7 +8106,7 @@ let self = _self // overrides; _self = with self; { homepage = http://metacpan.org/release/MooseX-ABC; description = "Abstract base classes for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8133,7 +8133,7 @@ let self = _self // overrides; _self = with self; { homepage = http://metacpan.org/release/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8258,7 +8258,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Extend your attribute interfaces (deprecated)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8271,7 +8271,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean Testuseok ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8287,7 +8287,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "An abstract Moose role for setting attributes from a configfile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8349,7 +8349,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/pshangov/moosex-has-options; description = "Succinct options for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8506,7 +8506,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ Testuseok TestTableDriven ]; propagatedBuildInputs = [ ListMoreUtils Moose MooseXGetopt MooseXTypes MooseXTypesPathClass namespaceautoclean ParamsUtil ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8538,7 +8538,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ Moose TestFatal TestRequires ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8606,7 +8606,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/moose/MooseX-Types-Common; description = "A library of commonly used type constraints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles rycee ]; + maintainers = with maintainers; [ rycee ]; }; }; @@ -8618,7 +8618,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException Testuseok ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8646,7 +8646,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuildTiny Moose TestFatal ]; propagatedBuildInputs = [ ClassLoad ModuleRuntime Moose MooseXTypes namespaceautoclean ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; homepage = https://github.com/moose/MooseX-Types-LoadableClass; description = "ClassName type constraint with coercion to load the class"; @@ -8679,7 +8679,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/karenetheridge/moosex-types-path-tiny; description = "Path::Tiny types and coercions for Moose"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8709,7 +8709,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/dagolden/moosex-types-stringlike; description = "Moose type constraints for strings or string-like objects"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8726,7 +8726,7 @@ let self = _self // overrides; _self = with self; { homepage = http://metacpan.org/release/MooseX-Types-Structured; description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8739,7 +8739,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean Testuseok URI URIFromHash ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8914,7 +8914,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ URI ]; meta = { description = "Perl extension to create signatures for AWS requests"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -8984,7 +8984,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Manage Amazon S3 policies for HTTP POST forms"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -9001,7 +9001,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Advanced Message Queue Protocol (de)serialization and representation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -9032,7 +9032,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/metabrainz/CoverArtArchive; description = "Query the coverartarchive.org"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -9261,7 +9261,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Comprehensive inside-out object support module"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -9538,7 +9538,7 @@ let self = _self // overrides; _self = with self; { homepage = https://metacpan.org/release/Path-Tiny; description = "File path utility"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; preConfigure = @@ -9772,7 +9772,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Display information about the current request/response"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -10310,7 +10310,7 @@ let self = _self // overrides; _self = with self; { homepage = https://metacpan.org/pod/Redis; description = "Perl binding for Redis database"; license = stdenv.lib.licenses.artistic2; - maintainers = with maintainers; [ ocharles rycee ]; + maintainers = with maintainers; [ rycee ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -10390,7 +10390,7 @@ let self = _self // overrides; _self = with self; { homepage = http://jaldhar.github.com/REST-Utils; description = "Utility functions for REST applications"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -10475,7 +10475,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ SOAPLite ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -10626,7 +10626,7 @@ let self = _self // overrides; _self = with self; { }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -10662,7 +10662,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Perl's Web Services Toolkit"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -10855,7 +10855,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ NumberFormat ]; meta = { license = "open_source"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -10942,7 +10942,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0m3hjk292hnxyi8nkfy8hlr1khnbf2clgkb4kzj0ycq8gcd2z0as"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -10968,7 +10968,7 @@ let self = _self // overrides; _self = with self; { sha256 = "12ls7f7847i4qcikkp3skwraqvjphjiv2zxfhl5d49326f5myr7x"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -11037,7 +11037,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0dfxhr6hxc2majkkrm0qbx3qcbykzpphbj2ms93dc86f7183c1p6"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -11076,7 +11076,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Use TT to interpolate lexical variables"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -11292,7 +11292,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0cnwwrd5d6i80f33s7n2ak90rh4s53ss7q57wndrpkpr4bfn3djm"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -11384,7 +11384,7 @@ let self = _self // overrides; _self = with self; { description = "Stream TAP from pgTAP test scripts"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; }; }; @@ -11455,7 +11455,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ TemplateToolkit ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -11482,7 +11482,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ TemplateToolkit ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -11495,7 +11495,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ JSON TemplateToolkit ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -11718,7 +11718,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ClassInspector TestUnitLite ]; propagatedBuildInputs = [ constantboolean ExceptionBase SymbolUtil ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -11874,7 +11874,7 @@ let self = _self // overrides; _self = with self; { homepage = http://metacpan.org/release/Test-EOL; description = "Check the correct line endings in your project"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -11899,7 +11899,7 @@ let self = _self // overrides; _self = with self; { homepage = https://metacpan.org/release/Test-FailWarnings; description = "Add test failures if warnings are caught"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12007,7 +12007,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ JSONAny TestDifferences TestTester ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12041,7 +12041,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelCycle PadWalker ]; meta = { description = "Verifies code hasn't left circular references"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12057,7 +12057,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { description = "Simulating other classes"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }; @@ -12070,7 +12070,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ SUPER ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12150,7 +12150,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Check the presence of tabs in your project"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12280,7 +12280,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12356,7 +12356,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Write tests, not scripts that run them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12391,7 +12391,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Unit testing without external dependencies"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12447,7 +12447,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Test fallback behaviour in absence of modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12490,7 +12490,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ CGI TestWWWMechanize WWWMechanizeCGI ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12517,7 +12517,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ XMLLibXML ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12734,7 +12734,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Spy on objects to achieve test doubles (mock testing)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12762,7 +12762,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Micro template engine with Perl5 language"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12965,7 +12965,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Remove leading and/or trailing whitespace from strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -12977,7 +12977,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0avk50kia78kxryh2whmaj5l18q2wvmkdyqyjsf6kwr4kgy6x3i7"; }; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -13024,7 +13024,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ URI ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -13404,7 +13404,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Wrapper around ICU collation services"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; broken = true; # tests fail http://hydra.nixos.org/build/25141764/nixlog/1/raw }; @@ -13506,7 +13506,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Build a URI from a set of named parameters"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -13615,7 +13615,7 @@ let self = _self // overrides; _self = with self; { --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' ''; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -13849,7 +13849,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A re-usable XPath engine for DOM-like trees"; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -13924,7 +13924,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ XMLParser ]; meta = { - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; From bd9d37e6759e3bc3d778e67fe538a87736a230ca Mon Sep 17 00:00:00 2001 From: robbinch Date: Mon, 25 Apr 2016 00:32:16 +0800 Subject: [PATCH 165/210] tinc-haskell: Rename package name to avoid conflict (#14952) --- pkgs/development/tools/misc/{tinc => tinc-haskell}/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/tools/misc/{tinc => tinc-haskell}/default.nix (98%) diff --git a/pkgs/development/tools/misc/tinc/default.nix b/pkgs/development/tools/misc/tinc-haskell/default.nix similarity index 98% rename from pkgs/development/tools/misc/tinc/default.nix rename to pkgs/development/tools/misc/tinc-haskell/default.nix index 44491fa0ef9..4efdc909673 100644 --- a/pkgs/development/tools/misc/tinc/default.nix +++ b/pkgs/development/tools/misc/tinc-haskell/default.nix @@ -6,7 +6,7 @@ , ghc, cabal2nix, cabal-install, makeWrapper }: mkDerivation { - pname = "tinc"; + pname = "tinc-haskell"; version = "20160419"; src = fetchFromGitHub { owner = "sol"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0956dcf680c..2ef9afe98ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6306,7 +6306,7 @@ in texi2html = callPackage ../development/tools/misc/texi2html { }; - tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc { }; + tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc-haskell { }; travis = callPackage ../development/tools/misc/travis { }; From e74289decc997a21339471ce25e4eeb436329bd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 24 Apr 2016 17:37:05 +0100 Subject: [PATCH 166/210] maim: 3.4.46 -> 3.4.47 --- pkgs/tools/graphics/maim/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index fe812eac7d4..fb674bc8d80 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, cmake, gengetopt, imlib2, libXrandr, libXfixes -, cppcheck}: +{ stdenv, fetchurl, cmake, gengetopt, imlib2, libXrandr, libXfixes }: stdenv.mkDerivation rec { name = "maim-${version}"; - version = "3.4.46"; + version = "3.4.47"; src = fetchurl { url = "https://github.com/naelstrof/maim/archive/v${version}.tar.gz"; - sha256 = "04gb858g0rrvdiva2dxwsfd7dmq62r67irnc8cpd0r02hr92dr6n"; + sha256 = "0kfp7k55bxc5h6h0wv8bwmsc5ny66h9ra2z4dzs4yzszq16544pv"; }; - buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ] - ++ stdenv.lib.optional doCheck cppcheck; + buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ]; doCheck = false; From ed6943ecbc1413e0e6aa452027a399e9b274bcbe Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Sun, 24 Apr 2016 13:24:01 -0400 Subject: [PATCH 167/210] virtualgl: fix libturbojpeg library path Without this, it tries to link to the dev output of libjpeg_turbo, which breaks the build. --- pkgs/tools/X11/virtualgl/lib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 2df037229ea..6b93c6432c3 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l"; }; - cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ]; + cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; makeFlags = [ "PREFIX=$(out)" ]; From 5c4e00b6b797c444c0a0ca434c3b6fb469558a91 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Apr 2016 19:40:20 +0200 Subject: [PATCH 168/210] gst_all_1: 1.6.1 -> 1.8.0 (#14628) --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/base/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/core/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/ges/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/good/default.nix | 8 ++++---- pkgs/development/libraries/gstreamer/libav/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/python/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/vaapi/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/validate/default.nix | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 330c1d8dfa4..add3026275f 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -14,7 +14,7 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.6.1"; + name = "gst-plugins-bad-1.8.0"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0rjla9zcal9b5ynagq7cscjs53qrd9bafjkjssrp8s2z2apsjxp1"; + sha256 = "03m99igngm37653353n5d724bcqw7p6hw6xjw0i2824523fpcqqi"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 4f592dbe31e..b2fff30197c 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.6.1"; + name = "gst-plugins-base-1.8.0"; meta = { description = "Base plugins and helper libraries"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "18sbyjcp281zb3bsqji3pglsdsxi0s6ai7rx90sx8cpflkxdqcwm"; + sha256 = "08hmg7fp519wim1fm04r7f2q2020ssdninawqsbrqjsvs70srh5b"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 754b2bb64b8..40caf4093f0 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.6.1"; + name = "gstreamer-1.8.0"; meta = { description = "Open source multimedia framework"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "172w1bpnkn6mm1wi37n03apdbb6cdkykhzjf1vfxchcd7hhkyflp"; + sha256 = "1p5y9bbrhywng0prmpxv29p6jsz6vd039d49bnc98p9b45532yll"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 1e0ee39667e..e47ecfa01aa 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.6.1"; + name = "gstreamer-editing-services-1.8.0"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "1lkvkrsipn35341hwwkhwn44n90y49sjwra1r5pazbjgn1yykxzm"; + sha256 = "1gisdfa91kq89bsmbvb47alaxh8lpqmr6f3dzlwmf389nkandw2h"; }; nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 75f0760747b..54175fb83fb 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python , gst-plugins-base, orc, bzip2 , libv4l, libdv, libavc1394, libiec61883 -, libvpx, speex, flac, taglib +, libvpx, speex, flac, taglib, libshout , cairo, gdk_pixbuf, aalib, libcaca , libsoup, libpulseaudio, libintlOrEmpty }: @@ -10,7 +10,7 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.6.1"; + name = "gst-plugins-good-1.8.0"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "0darc3058kbnql3mnlpizl0sq0hhli7vkm0rpqb7nywz14abim46"; + sha256 = "0kczdvqxvl8kxiy2d7czv16jp73hv9k3nykh47ckihnv8x6i6362"; }; nativeBuildInputs = [ pkgconfig python ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gst-plugins-base orc bzip2 libdv libvpx speex flac taglib cairo gdk_pixbuf aalib libcaca - libsoup + libsoup libshout ] ++ libintlOrEmpty ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 6d0c28d0e28..e4daa642ba0 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.6.1"; + name = "gst-libav-1.8.0"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "1a9pc7zp5rg0cvpx8gqkr21w73i6p9xa505a34day9f8p3lfim94"; + sha256 = "0719njp8aarhvn038pijq6dmsnli0zlg146hyfs3rsdffs4f472s"; }; configureFlags = stdenv.lib.optionalString withSystemLibav diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index c1b94a647b8..5320fdfaced 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - name = "gst-python-1.4.0"; + name = "gst-python-1.8.0"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "0gixsp46mv7fvhk669q60wfk9w2lc02sdb1qipq066xlrqlhrr5i"; + sha256 = "1spn49x7yaj69df6mxh9wwcs0y3abswkfpk84njs71lzqlbzyiff"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 540b3ba0be8..8f8437ad4ac 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.6.1"; + name = "gst-plugins-ugly-1.8.0"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "0mvasl1pwq70w2kmrkcrg77kggl5q7jqybi7fkvy3vr28c7gkhqc"; + sha256 = "137b6kqykh5nwbmiv28nn1pc1d2x2rb2xxg382pc9pa9gpxpyrak"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index bf061b4125b..a9aa3d73fa2 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "0.6.1"; + version = "0.7.0"; src = fetchurl { url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2"; - sha256 = "1cv7zlz5wj6b3acv0pr5cq5wqzd5vcs1lrrlvyl9wrzcnzz8mz1n"; + sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b"; }; nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 0b0ba11a793..1c123621664 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.6.0"; + name = "gst-validate-1.8.0"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "1vmg5mh068zrvhgrjsbnb7y4k632akyhm8ql0g196cinnp3zibiv"; + sha256 = "1pcy9pfffyk6xiw6aq38kbv7k24x2rljdy8fabjfy1abpmvvfrkn"; }; nativeBuildInputs = [ From 882391a1620f5179eab0f9f4b96f85af875cbb34 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Apr 2016 19:44:01 +0200 Subject: [PATCH 169/210] redshift service: run as user service Fixes #14882. --- nixos/modules/services/x11/redshift.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 4318a17a4fa..8f1e317e52b 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -94,11 +94,9 @@ in { }; config = mkIf cfg.enable { - systemd.services.redshift = { + systemd.user.services.redshift = { description = "Redshift colour temperature adjuster"; - requires = [ "display-manager.service" ]; - after = [ "display-manager.service" ]; - wantedBy = [ "graphical.target" ]; + wantedBy = [ "default.target" ]; serviceConfig = { ExecStart = '' ${cfg.package}/bin/redshift \ @@ -107,10 +105,10 @@ in { -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \ ${lib.strings.concatStringsSep " " cfg.extraOptions} ''; - RestartSec = 3; + RestartSec = 3; + Restart = "always"; }; environment = { DISPLAY = ":0"; }; - serviceConfig.Restart = "always"; }; }; From 345ea398ad3136c39e208508481fb5116e2d238b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Apr 2016 15:42:02 +0200 Subject: [PATCH 170/210] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20160406-3-gd7a4f81 using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/e8b3512fba355d239648e4b90f876a960cfa7692 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/573e5576f28878481839cc7c1dfa545d6c47457e - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/70928b4eec4bee01900f4702c0ea9802336b7878 --- .../haskell-modules/configuration-lts-0.0.nix | 15 + .../haskell-modules/configuration-lts-0.1.nix | 15 + .../haskell-modules/configuration-lts-0.2.nix | 15 + .../haskell-modules/configuration-lts-0.3.nix | 15 + .../haskell-modules/configuration-lts-0.4.nix | 15 + .../haskell-modules/configuration-lts-0.5.nix | 15 + .../haskell-modules/configuration-lts-0.6.nix | 15 + .../haskell-modules/configuration-lts-0.7.nix | 15 + .../haskell-modules/configuration-lts-1.0.nix | 15 + .../haskell-modules/configuration-lts-1.1.nix | 15 + .../configuration-lts-1.10.nix | 15 + .../configuration-lts-1.11.nix | 15 + .../configuration-lts-1.12.nix | 15 + .../configuration-lts-1.13.nix | 15 + .../configuration-lts-1.14.nix | 15 + .../configuration-lts-1.15.nix | 15 + .../haskell-modules/configuration-lts-1.2.nix | 15 + .../haskell-modules/configuration-lts-1.4.nix | 15 + .../haskell-modules/configuration-lts-1.5.nix | 15 + .../haskell-modules/configuration-lts-1.7.nix | 15 + .../haskell-modules/configuration-lts-1.8.nix | 15 + .../haskell-modules/configuration-lts-1.9.nix | 15 + .../haskell-modules/configuration-lts-2.0.nix | 15 + .../haskell-modules/configuration-lts-2.1.nix | 15 + .../configuration-lts-2.10.nix | 15 + .../configuration-lts-2.11.nix | 15 + .../configuration-lts-2.12.nix | 15 + .../configuration-lts-2.13.nix | 15 + .../configuration-lts-2.14.nix | 15 + .../configuration-lts-2.15.nix | 15 + .../configuration-lts-2.16.nix | 15 + .../configuration-lts-2.17.nix | 15 + .../configuration-lts-2.18.nix | 15 + .../configuration-lts-2.19.nix | 15 + .../haskell-modules/configuration-lts-2.2.nix | 15 + .../configuration-lts-2.20.nix | 15 + .../configuration-lts-2.21.nix | 15 + .../configuration-lts-2.22.nix | 15 + .../haskell-modules/configuration-lts-2.3.nix | 15 + .../haskell-modules/configuration-lts-2.4.nix | 15 + .../haskell-modules/configuration-lts-2.5.nix | 15 + .../haskell-modules/configuration-lts-2.6.nix | 15 + .../haskell-modules/configuration-lts-2.7.nix | 15 + .../haskell-modules/configuration-lts-2.8.nix | 15 + .../haskell-modules/configuration-lts-2.9.nix | 15 + .../haskell-modules/configuration-lts-3.0.nix | 15 + .../haskell-modules/configuration-lts-3.1.nix | 15 + .../configuration-lts-3.10.nix | 15 + .../configuration-lts-3.11.nix | 15 + .../configuration-lts-3.12.nix | 15 + .../configuration-lts-3.13.nix | 15 + .../configuration-lts-3.14.nix | 15 + .../configuration-lts-3.15.nix | 15 + .../configuration-lts-3.16.nix | 15 + .../configuration-lts-3.17.nix | 15 + .../configuration-lts-3.18.nix | 15 + .../configuration-lts-3.19.nix | 15 + .../haskell-modules/configuration-lts-3.2.nix | 15 + .../configuration-lts-3.20.nix | 15 + .../configuration-lts-3.21.nix | 15 + .../configuration-lts-3.22.nix | 15 + .../haskell-modules/configuration-lts-3.3.nix | 15 + .../haskell-modules/configuration-lts-3.4.nix | 15 + .../haskell-modules/configuration-lts-3.5.nix | 15 + .../haskell-modules/configuration-lts-3.6.nix | 15 + .../haskell-modules/configuration-lts-3.7.nix | 15 + .../haskell-modules/configuration-lts-3.8.nix | 15 + .../haskell-modules/configuration-lts-3.9.nix | 15 + .../haskell-modules/configuration-lts-4.0.nix | 15 + .../haskell-modules/configuration-lts-4.1.nix | 15 + .../haskell-modules/configuration-lts-4.2.nix | 15 + .../haskell-modules/configuration-lts-5.0.nix | 15 + .../haskell-modules/configuration-lts-5.1.nix | 15 + .../configuration-lts-5.10.nix | 15 + .../configuration-lts-5.11.nix | 15 + .../configuration-lts-5.12.nix | 15 + .../configuration-lts-5.13.nix | 15 + .../haskell-modules/configuration-lts-5.2.nix | 15 + .../haskell-modules/configuration-lts-5.3.nix | 15 + .../haskell-modules/configuration-lts-5.4.nix | 15 + .../haskell-modules/configuration-lts-5.5.nix | 15 + .../haskell-modules/configuration-lts-5.6.nix | 15 + .../haskell-modules/configuration-lts-5.7.nix | 15 + .../haskell-modules/configuration-lts-5.8.nix | 15 + .../haskell-modules/configuration-lts-5.9.nix | 15 + .../haskell-modules/hackage-packages.nix | 1319 +++++++++++++++-- 86 files changed, 2451 insertions(+), 143 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 6209c4405ad..5d5e07c3a48 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -1219,6 +1219,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2472,6 +2473,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4332,6 +4334,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4413,6 +4416,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4755,6 +4759,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4899,6 +4904,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5087,6 +5093,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5648,6 +5655,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6165,6 +6173,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6636,6 +6645,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7553,6 +7563,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7641,6 +7652,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_6"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8497,6 +8510,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8644,6 +8658,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index d205c4cdff8..994ca185089 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -1219,6 +1219,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2472,6 +2473,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4332,6 +4334,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4413,6 +4416,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4755,6 +4759,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4899,6 +4904,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5087,6 +5093,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5648,6 +5655,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6165,6 +6173,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6636,6 +6645,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7553,6 +7563,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7641,6 +7652,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_6"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8497,6 +8510,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8644,6 +8658,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 22c56ac8a67..13288cf6eef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -1219,6 +1219,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2472,6 +2473,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4332,6 +4334,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4413,6 +4416,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4755,6 +4759,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4899,6 +4904,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5087,6 +5093,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5648,6 +5655,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6165,6 +6173,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6636,6 +6645,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7553,6 +7563,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7641,6 +7652,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_6"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8497,6 +8510,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8644,6 +8658,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 29ef3a1c4a8..a2a328b65c0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -1219,6 +1219,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2472,6 +2473,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4332,6 +4334,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4413,6 +4416,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4755,6 +4759,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4899,6 +4904,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5087,6 +5093,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5648,6 +5655,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6165,6 +6173,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6636,6 +6645,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7553,6 +7563,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7641,6 +7652,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_6"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8497,6 +8510,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8644,6 +8658,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 73b991dd378..8947dce5d90 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -1219,6 +1219,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2472,6 +2473,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4329,6 +4331,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4410,6 +4413,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4752,6 +4756,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4896,6 +4901,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5084,6 +5090,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5645,6 +5652,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6162,6 +6170,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6633,6 +6642,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7549,6 +7559,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7637,6 +7648,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_6"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8493,6 +8506,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8640,6 +8654,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 0504c68e1e6..74c95cb7400 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -1219,6 +1219,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2472,6 +2473,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4329,6 +4331,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4410,6 +4413,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4752,6 +4756,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4896,6 +4901,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5084,6 +5090,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5645,6 +5652,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6162,6 +6170,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6633,6 +6642,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7549,6 +7559,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7637,6 +7648,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_6"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8493,6 +8506,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8640,6 +8654,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 65e9713e303..1e44d58aefd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -1218,6 +1218,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2471,6 +2472,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4327,6 +4329,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4408,6 +4411,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4750,6 +4754,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4894,6 +4899,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5082,6 +5088,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5643,6 +5650,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6160,6 +6168,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6631,6 +6640,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7546,6 +7556,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7634,6 +7645,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_6"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8490,6 +8503,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8637,6 +8651,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 081a214d4db..f5075c4afc2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -1218,6 +1218,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2471,6 +2472,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4327,6 +4329,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4408,6 +4411,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4750,6 +4754,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4894,6 +4899,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5082,6 +5088,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5643,6 +5650,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6160,6 +6168,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6631,6 +6640,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7546,6 +7556,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7634,6 +7645,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_6"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8490,6 +8503,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8637,6 +8651,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index e1c3d165ff7..b1e9391c5f8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -1215,6 +1215,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2464,6 +2465,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4319,6 +4321,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4400,6 +4403,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4741,6 +4745,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4885,6 +4890,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5073,6 +5079,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5634,6 +5641,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6151,6 +6159,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6622,6 +6631,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7536,6 +7546,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7624,6 +7635,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8479,6 +8492,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8626,6 +8640,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 070631c28b2..4f833f432c8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -1215,6 +1215,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2462,6 +2463,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4315,6 +4317,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4396,6 +4399,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4735,6 +4739,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4879,6 +4884,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5067,6 +5073,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5628,6 +5635,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6144,6 +6152,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6615,6 +6624,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7529,6 +7539,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7616,6 +7627,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8467,6 +8480,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8614,6 +8628,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index ccd32b161ed..988c7e3714a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -1214,6 +1214,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2458,6 +2459,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4304,6 +4306,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4385,6 +4388,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4724,6 +4728,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4868,6 +4873,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5051,6 +5057,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5611,6 +5618,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6126,6 +6134,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6595,6 +6604,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7507,6 +7517,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7593,6 +7604,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8440,6 +8453,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8587,6 +8601,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 3ba65450a7b..0fe6da3b536 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -1214,6 +1214,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2458,6 +2459,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4303,6 +4305,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4384,6 +4387,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4723,6 +4727,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4867,6 +4872,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5048,6 +5054,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5607,6 +5614,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6122,6 +6130,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6591,6 +6600,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7503,6 +7513,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7589,6 +7600,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8436,6 +8449,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8583,6 +8597,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 5f128b69c41..6523554f052 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -1214,6 +1214,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2458,6 +2459,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4302,6 +4304,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4383,6 +4386,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4722,6 +4726,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4866,6 +4871,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5047,6 +5053,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5606,6 +5613,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6121,6 +6129,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6590,6 +6599,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7502,6 +7512,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7588,6 +7599,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8435,6 +8448,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8582,6 +8596,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 64693d1c910..9b192de0166 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -1214,6 +1214,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2458,6 +2459,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4301,6 +4303,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4382,6 +4385,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4721,6 +4725,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4865,6 +4870,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5046,6 +5052,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5605,6 +5612,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6120,6 +6128,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6589,6 +6598,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7501,6 +7511,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7587,6 +7598,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8433,6 +8446,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8580,6 +8594,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index bf089955500..a2021991e50 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -1213,6 +1213,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2455,6 +2456,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4298,6 +4300,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4379,6 +4382,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4718,6 +4722,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4862,6 +4867,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5043,6 +5049,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5602,6 +5609,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6116,6 +6124,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6585,6 +6594,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7496,6 +7506,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7582,6 +7593,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8428,6 +8441,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8575,6 +8589,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 647c141ef7f..b5fdfd2a4aa 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -1212,6 +1212,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2452,6 +2453,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4294,6 +4296,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4375,6 +4378,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4714,6 +4718,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4858,6 +4863,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5039,6 +5045,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5598,6 +5605,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6110,6 +6118,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6579,6 +6588,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7489,6 +7499,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7575,6 +7586,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8419,6 +8432,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8566,6 +8580,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 42c898fadf4..2ce53895ab7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -1215,6 +1215,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2460,6 +2461,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4312,6 +4314,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4393,6 +4396,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4732,6 +4736,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4876,6 +4881,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5064,6 +5070,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5625,6 +5632,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6141,6 +6149,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6611,6 +6620,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7523,6 +7533,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7610,6 +7621,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8461,6 +8474,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8608,6 +8622,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 4cf1b11f75d..5092c1f02a7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -1214,6 +1214,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2459,6 +2460,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4309,6 +4311,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4390,6 +4393,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4729,6 +4733,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4873,6 +4878,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5061,6 +5067,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5622,6 +5629,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6137,6 +6145,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6607,6 +6616,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7519,6 +7529,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7606,6 +7617,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8456,6 +8469,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8603,6 +8617,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 44c6245033c..de2508852e7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -1214,6 +1214,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2458,6 +2459,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4308,6 +4310,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4389,6 +4392,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4728,6 +4732,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4872,6 +4877,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5060,6 +5066,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5621,6 +5628,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6136,6 +6144,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6606,6 +6615,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7518,6 +7528,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7605,6 +7616,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8454,6 +8467,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8601,6 +8615,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 34799a77d6b..72af4fc6c77 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -1214,6 +1214,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2458,6 +2459,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4308,6 +4310,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4389,6 +4392,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4728,6 +4732,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4872,6 +4877,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5055,6 +5061,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5616,6 +5623,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6131,6 +6139,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6601,6 +6610,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7513,6 +7523,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7600,6 +7611,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8449,6 +8462,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8596,6 +8610,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 3b19bb0c58d..b7b754a984f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -1214,6 +1214,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2458,6 +2459,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4305,6 +4307,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4386,6 +4389,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4725,6 +4729,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4869,6 +4874,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5052,6 +5058,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5612,6 +5619,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6127,6 +6135,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6597,6 +6606,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7509,6 +7519,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7596,6 +7607,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8444,6 +8457,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8591,6 +8605,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index ecdfc50ad91..6cb77fd1f9b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -1214,6 +1214,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2458,6 +2459,7 @@ self: super: { "csv-conduit" = doDistribute super."csv-conduit_0_6_3"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4304,6 +4306,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4385,6 +4388,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = dontDistribute super."hindent"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4724,6 +4728,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = dontDistribute super."hspec-smallcheck"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4868,6 +4873,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5051,6 +5057,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5611,6 +5618,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6126,6 +6134,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6596,6 +6605,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7508,6 +7518,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7595,6 +7606,8 @@ self: super: { "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly" = doDistribute super."shelly_1_5_7"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8443,6 +8456,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8590,6 +8604,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 6575165571f..fa5928d6b72 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -1206,6 +1206,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2440,6 +2441,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4278,6 +4280,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4358,6 +4361,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4695,6 +4699,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4840,6 +4845,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5016,6 +5022,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5568,6 +5575,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6073,6 +6081,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6538,6 +6547,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7446,6 +7456,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7531,6 +7542,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8370,6 +8383,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8516,6 +8530,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index cb85183a364..8ff45e0c7df 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -1206,6 +1206,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2439,6 +2440,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4277,6 +4279,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4357,6 +4360,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4694,6 +4698,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4839,6 +4844,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5015,6 +5021,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5567,6 +5574,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6072,6 +6080,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6537,6 +6546,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7445,6 +7455,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7530,6 +7541,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8369,6 +8382,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8515,6 +8529,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index ede06c7477c..3b13848d98a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -1201,6 +1201,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2427,6 +2428,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4258,6 +4260,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4338,6 +4341,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4674,6 +4678,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4818,6 +4823,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4993,6 +4999,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5542,6 +5549,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6047,6 +6055,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6511,6 +6520,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7415,6 +7425,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7500,6 +7511,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8329,6 +8342,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8475,6 +8489,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index d54a1f5c3e5..14570e607c8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2426,6 +2427,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4255,6 +4257,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4335,6 +4338,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4671,6 +4675,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4815,6 +4820,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4990,6 +4996,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5538,6 +5545,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6042,6 +6050,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6505,6 +6514,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7408,6 +7418,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7493,6 +7504,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8320,6 +8333,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8466,6 +8480,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 91703369a40..706e342f6b2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2426,6 +2427,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4255,6 +4257,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4335,6 +4338,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4671,6 +4675,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4815,6 +4820,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4990,6 +4996,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5538,6 +5545,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6042,6 +6050,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6505,6 +6514,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7407,6 +7417,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7492,6 +7503,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8319,6 +8332,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8465,6 +8479,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 30375d21722..7cad852e803 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2426,6 +2427,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4254,6 +4256,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4334,6 +4337,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4670,6 +4674,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4814,6 +4819,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4988,6 +4994,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5536,6 +5543,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6040,6 +6048,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6503,6 +6512,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7405,6 +7415,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7490,6 +7501,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8317,6 +8330,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8463,6 +8477,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index c2d4495820d..951fd6c2f8d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2426,6 +2427,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4253,6 +4255,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4333,6 +4336,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4669,6 +4673,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4812,6 +4817,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4986,6 +4992,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5534,6 +5541,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6038,6 +6046,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6501,6 +6510,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7403,6 +7413,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7488,6 +7499,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8314,6 +8327,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8460,6 +8474,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index e396fc6a908..8adbc6fec84 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2426,6 +2427,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4252,6 +4254,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4332,6 +4335,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4668,6 +4672,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4811,6 +4816,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4985,6 +4991,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5533,6 +5540,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6036,6 +6044,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6499,6 +6508,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7401,6 +7411,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7486,6 +7497,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8311,6 +8324,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8457,6 +8471,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index a34eb76a309..3e319aa5ed4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2424,6 +2425,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4248,6 +4250,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4328,6 +4331,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4664,6 +4668,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4807,6 +4812,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4981,6 +4987,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5528,6 +5535,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6031,6 +6039,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6494,6 +6503,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7396,6 +7406,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7481,6 +7492,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8306,6 +8319,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8452,6 +8466,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index c0365589afd..0a58df94535 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2422,6 +2423,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4244,6 +4246,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4324,6 +4327,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4660,6 +4664,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4803,6 +4808,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4977,6 +4983,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5524,6 +5531,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6027,6 +6035,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6489,6 +6498,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7391,6 +7401,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7476,6 +7487,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8301,6 +8314,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8447,6 +8461,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index d7768a5ed46..e7a9357da6a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2421,6 +2422,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4242,6 +4244,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4322,6 +4325,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4658,6 +4662,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4801,6 +4806,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4975,6 +4981,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5522,6 +5529,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6025,6 +6033,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6486,6 +6495,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7388,6 +7398,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7473,6 +7484,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8297,6 +8310,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8443,6 +8457,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 44b5e76deb6..de4b6c8fbb8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2421,6 +2422,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4241,6 +4243,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4321,6 +4324,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4657,6 +4661,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4800,6 +4805,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4974,6 +4980,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5521,6 +5528,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6023,6 +6031,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6484,6 +6493,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7386,6 +7396,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7471,6 +7482,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8294,6 +8307,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8440,6 +8454,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 7fe581e10da..b1785347434 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -1205,6 +1205,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2436,6 +2437,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4274,6 +4276,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4354,6 +4357,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4691,6 +4695,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4836,6 +4841,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5012,6 +5018,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5564,6 +5571,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6069,6 +6077,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6534,6 +6543,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7442,6 +7452,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7527,6 +7538,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8366,6 +8379,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8512,6 +8526,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 6e6ca82e27d..13fd59373ee 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2420,6 +2421,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4240,6 +4242,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4320,6 +4323,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4656,6 +4660,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4799,6 +4804,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4973,6 +4979,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5520,6 +5527,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6022,6 +6030,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6483,6 +6492,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7384,6 +7394,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7469,6 +7480,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8291,6 +8304,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8437,6 +8451,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 16154f7dbb9..9718fd66f08 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2420,6 +2421,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4240,6 +4242,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4320,6 +4323,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4656,6 +4660,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4799,6 +4804,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4973,6 +4979,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5520,6 +5527,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6022,6 +6030,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6483,6 +6492,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7383,6 +7393,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7468,6 +7479,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8290,6 +8303,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8436,6 +8450,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 1a8df55704d..c9c1be69df4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -1200,6 +1200,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2420,6 +2421,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4240,6 +4242,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4320,6 +4323,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4655,6 +4659,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4798,6 +4803,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4972,6 +4978,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5519,6 +5526,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6021,6 +6029,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6482,6 +6491,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7382,6 +7392,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7467,6 +7478,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8289,6 +8302,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8435,6 +8449,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 2000c0c997c..5548314dff3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -1205,6 +1205,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2436,6 +2437,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4273,6 +4275,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4353,6 +4356,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4690,6 +4694,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4835,6 +4840,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5010,6 +5016,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5562,6 +5569,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6067,6 +6075,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6532,6 +6541,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7440,6 +7450,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7525,6 +7536,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8364,6 +8377,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8510,6 +8524,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 3f2c842fadd..9becf92e39a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -1205,6 +1205,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2435,6 +2436,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4272,6 +4274,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4352,6 +4355,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4689,6 +4693,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4834,6 +4839,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5009,6 +5015,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5561,6 +5568,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6066,6 +6074,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6530,6 +6539,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7437,6 +7447,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7522,6 +7533,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8361,6 +8374,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8507,6 +8521,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 2f1c3f48a19..c770cc19433 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -1205,6 +1205,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2434,6 +2435,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4271,6 +4273,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4351,6 +4354,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4688,6 +4692,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4833,6 +4838,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5008,6 +5014,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5560,6 +5567,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6065,6 +6073,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6529,6 +6538,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7436,6 +7446,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7521,6 +7532,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8360,6 +8373,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8506,6 +8520,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 57c1e6077e4..b18878eda98 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -1203,6 +1203,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2431,6 +2432,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4266,6 +4268,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4346,6 +4349,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4683,6 +4687,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4828,6 +4833,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5003,6 +5009,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5555,6 +5562,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6059,6 +6067,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6523,6 +6532,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7430,6 +7440,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7515,6 +7526,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8352,6 +8365,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8498,6 +8512,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 2516bf13e66..a310f5c2279 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -1202,6 +1202,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2430,6 +2431,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4265,6 +4267,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4345,6 +4348,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4682,6 +4686,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4827,6 +4832,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5002,6 +5008,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5554,6 +5561,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6059,6 +6067,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6523,6 +6532,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7430,6 +7440,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7515,6 +7526,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8352,6 +8365,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8498,6 +8512,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 3d9ad22a9fa..6f38b78b48a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -1201,6 +1201,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2429,6 +2430,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4263,6 +4265,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4343,6 +4346,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4680,6 +4684,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4825,6 +4830,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5000,6 +5006,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5552,6 +5559,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6057,6 +6065,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6521,6 +6530,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7427,6 +7437,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7512,6 +7523,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8346,6 +8359,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8492,6 +8506,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index fc5d94955c9..e082c07865a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -1201,6 +1201,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2427,6 +2428,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4259,6 +4261,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4339,6 +4342,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_4_2"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4675,6 +4679,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4819,6 +4824,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4994,6 +5000,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5545,6 +5552,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -6050,6 +6058,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = dontDistribute super."nationstates"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6514,6 +6523,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7420,6 +7430,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7505,6 +7516,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_1_2"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8335,6 +8348,7 @@ self: super: { "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-lift" = dontDistribute super."transformers-lift"; "transformers-runnable" = dontDistribute super."transformers-runnable"; @@ -8481,6 +8495,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus-model" = dontDistribute super."udbus-model"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 95dd9bd6479..dc44bbbcf45 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -1178,6 +1178,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2362,6 +2363,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4150,6 +4152,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4227,6 +4230,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4559,6 +4563,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4699,6 +4704,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4865,6 +4871,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5388,6 +5395,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5874,6 +5882,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_0"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6324,6 +6333,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7214,6 +7224,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7295,6 +7306,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_3_3"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8099,6 +8112,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8241,6 +8255,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index d6292298ad9..564fca0b8df 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -1177,6 +1177,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2361,6 +2362,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4148,6 +4150,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4225,6 +4228,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4557,6 +4561,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4697,6 +4702,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4863,6 +4869,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5386,6 +5393,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5870,6 +5878,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_0"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6320,6 +6329,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7208,6 +7218,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7289,6 +7300,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_3_3"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8093,6 +8106,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8235,6 +8249,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 63e0e4aee90..80084167d43 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -1174,6 +1174,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2350,6 +2351,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4124,6 +4126,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4200,6 +4203,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4530,6 +4534,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4670,6 +4675,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4834,6 +4840,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5352,6 +5359,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5834,6 +5842,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6280,6 +6289,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7161,6 +7171,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7242,6 +7253,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8038,6 +8051,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8179,6 +8193,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index eb489c0e4ae..a7a66f37824 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -1174,6 +1174,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2349,6 +2350,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4122,6 +4124,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4198,6 +4201,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4528,6 +4532,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4668,6 +4673,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4832,6 +4838,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5350,6 +5357,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5832,6 +5840,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6277,6 +6286,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7158,6 +7168,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7239,6 +7250,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8035,6 +8048,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8176,6 +8190,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 34063daafaa..928bc177e6a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -1174,6 +1174,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2348,6 +2349,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4120,6 +4122,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4196,6 +4199,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4526,6 +4530,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4666,6 +4671,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4830,6 +4836,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5348,6 +5355,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5830,6 +5838,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6274,6 +6283,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7155,6 +7165,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7236,6 +7247,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8030,6 +8043,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8171,6 +8185,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index 341e86d265d..45442c782c0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -1174,6 +1174,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2348,6 +2349,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4120,6 +4122,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4195,6 +4198,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4525,6 +4529,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4665,6 +4670,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4829,6 +4835,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5346,6 +5353,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5828,6 +5836,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6271,6 +6280,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7152,6 +7162,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7233,6 +7244,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8027,6 +8040,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8168,6 +8182,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 89d339d2168..3a2e3d30d4e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -1172,6 +1172,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2344,6 +2345,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4114,6 +4116,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4189,6 +4192,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_5"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4519,6 +4523,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4658,6 +4663,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4822,6 +4828,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5339,6 +5346,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5821,6 +5829,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6264,6 +6273,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7145,6 +7155,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7226,6 +7237,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8020,6 +8033,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8161,6 +8175,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index 8eff983280c..49d22021c49 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -1172,6 +1172,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2344,6 +2345,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4113,6 +4115,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4188,6 +4191,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_5"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4517,6 +4521,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4655,6 +4660,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4819,6 +4825,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5336,6 +5343,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5818,6 +5826,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6261,6 +6270,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7142,6 +7152,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7222,6 +7233,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8016,6 +8029,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8157,6 +8171,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index c548282e21b..c296a9132a1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -1171,6 +1171,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2343,6 +2344,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4110,6 +4112,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4185,6 +4188,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_5"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4514,6 +4518,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4652,6 +4657,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4816,6 +4822,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5332,6 +5339,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5813,6 +5821,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6256,6 +6265,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7135,6 +7145,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7215,6 +7226,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8006,6 +8019,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8147,6 +8161,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index 6b0cb8f9d20..501a11cc54c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -1171,6 +1171,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2342,6 +2343,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4108,6 +4110,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4183,6 +4186,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_5"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4512,6 +4516,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4650,6 +4655,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4813,6 +4819,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5329,6 +5336,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5808,6 +5816,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6251,6 +6260,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7130,6 +7140,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7210,6 +7221,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4_1"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8001,6 +8014,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8142,6 +8156,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix index cfcdee16b15..8eed33d20a2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -1171,6 +1171,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2341,6 +2342,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4103,6 +4105,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4178,6 +4181,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_5"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4507,6 +4511,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4644,6 +4649,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4807,6 +4813,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5323,6 +5330,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5802,6 +5810,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6244,6 +6253,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7123,6 +7133,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7202,6 +7213,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7993,6 +8006,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8134,6 +8148,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix index 31b01ea1cd4..a41538e4805 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix @@ -1171,6 +1171,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2336,6 +2337,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4098,6 +4100,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4173,6 +4176,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_5"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4500,6 +4504,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4637,6 +4642,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4800,6 +4806,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5314,6 +5321,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5793,6 +5801,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6234,6 +6243,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7113,6 +7123,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7192,6 +7203,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7982,6 +7995,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8123,6 +8137,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index fa09ae7b064..53be954857c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -1176,6 +1176,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2359,6 +2360,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4144,6 +4146,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4221,6 +4224,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4553,6 +4557,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4693,6 +4698,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4859,6 +4865,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5380,6 +5387,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5864,6 +5872,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_0"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6314,6 +6323,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7201,6 +7211,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7282,6 +7293,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_3_3"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8085,6 +8098,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8227,6 +8241,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix index 534c62479b0..58bef4e1657 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix @@ -1170,6 +1170,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2335,6 +2336,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4097,6 +4099,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4172,6 +4175,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_5"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4499,6 +4503,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4636,6 +4641,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4799,6 +4805,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5313,6 +5320,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5792,6 +5800,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6233,6 +6242,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7111,6 +7121,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_5"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_5"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7190,6 +7201,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7979,6 +7992,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8120,6 +8134,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix index 6acbf986015..ac0f58b31bd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix @@ -1170,6 +1170,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2334,6 +2335,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4094,6 +4096,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4169,6 +4172,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_5"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4496,6 +4500,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4633,6 +4638,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4794,6 +4800,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5308,6 +5315,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5786,6 +5794,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6226,6 +6235,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7101,6 +7111,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7177,6 +7188,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7965,6 +7978,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8106,6 +8120,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix index 008e4ca4156..438cbbc5a19 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix @@ -1170,6 +1170,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2334,6 +2335,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4091,6 +4093,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4166,6 +4169,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_5"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4493,6 +4497,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4630,6 +4635,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4789,6 +4795,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5302,6 +5309,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5780,6 +5788,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6220,6 +6229,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7095,6 +7105,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7171,6 +7182,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7959,6 +7972,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8100,6 +8114,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index abe5cc4f36d..0b13ec7c6b0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -1176,6 +1176,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2359,6 +2360,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4143,6 +4145,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4220,6 +4223,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4551,6 +4555,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4691,6 +4696,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4857,6 +4863,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5378,6 +5385,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5862,6 +5870,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_1"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6312,6 +6321,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7198,6 +7208,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7279,6 +7290,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_3_3"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8081,6 +8094,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8223,6 +8237,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 8e4b16f193f..70650c9956a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -1176,6 +1176,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2359,6 +2360,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4143,6 +4145,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4220,6 +4223,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4551,6 +4555,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4691,6 +4696,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4857,6 +4863,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5378,6 +5385,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5862,6 +5870,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_2"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6312,6 +6321,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7198,6 +7208,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7279,6 +7290,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_3_3"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8080,6 +8093,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8222,6 +8236,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 3ced8008f73..4f178b4b1cf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -1176,6 +1176,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2358,6 +2359,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4141,6 +4143,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4217,6 +4220,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4547,6 +4551,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4687,6 +4692,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4851,6 +4857,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5372,6 +5379,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5855,6 +5863,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6304,6 +6313,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7189,6 +7199,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7270,6 +7281,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_3_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8068,6 +8081,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8210,6 +8224,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 686ebe66539..cf8d12a6493 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -1176,6 +1176,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2358,6 +2359,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4138,6 +4140,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4214,6 +4217,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4544,6 +4548,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4684,6 +4689,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4848,6 +4854,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5366,6 +5373,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5849,6 +5857,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6298,6 +6307,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7183,6 +7193,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7264,6 +7275,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_3_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8062,6 +8075,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8203,6 +8217,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 82b01af5b5b..3cf88fb2e61 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -1176,6 +1176,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2355,6 +2356,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4134,6 +4136,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4210,6 +4213,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4540,6 +4544,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4680,6 +4685,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4844,6 +4850,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5362,6 +5369,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5845,6 +5853,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6294,6 +6303,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7177,6 +7187,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_4"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7258,6 +7269,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8055,6 +8068,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8196,6 +8210,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index 12e1101c971..104697b1a4b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -1176,6 +1176,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2353,6 +2354,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4128,6 +4130,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4204,6 +4207,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4534,6 +4538,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4674,6 +4679,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4838,6 +4844,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5356,6 +5363,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5838,6 +5846,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6287,6 +6296,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7169,6 +7179,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_4"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7250,6 +7261,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8046,6 +8059,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8187,6 +8201,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index 740e11523e7..be7b35aabf7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -1174,6 +1174,7 @@ self: super: { "airship" = dontDistribute super."airship"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2350,6 +2351,7 @@ self: super: { "css-syntax" = dontDistribute super."css-syntax"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -4124,6 +4126,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4200,6 +4203,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_5_4"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4530,6 +4534,7 @@ self: super: { "hspec-server" = dontDistribute super."hspec-server"; "hspec-setup" = dontDistribute super."hspec-setup"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4670,6 +4675,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4834,6 +4840,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5352,6 +5359,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5834,6 +5842,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "native" = dontDistribute super."native"; "nats" = doDistribute super."nats_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; @@ -6282,6 +6291,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgp-wordlist" = dontDistribute super."pgp-wordlist"; @@ -7164,6 +7174,7 @@ self: super: { "servant-blaze" = dontDistribute super."servant-blaze"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_4"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -7245,6 +7256,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -8041,6 +8054,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -8182,6 +8196,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix index 5d757751aae..5613b9d9119 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix @@ -1146,6 +1146,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_1_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2281,6 +2282,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3997,6 +3999,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4069,6 +4072,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4382,6 +4386,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4509,6 +4514,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4665,6 +4671,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5167,6 +5174,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5630,6 +5638,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -6051,6 +6060,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6891,6 +6901,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6965,6 +6976,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7724,6 +7737,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7860,6 +7874,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix index 3104f83dbf8..dad52f109ee 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix @@ -1145,6 +1145,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_2_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2279,6 +2280,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3990,6 +3992,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4062,6 +4065,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4375,6 +4379,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4502,6 +4507,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4654,6 +4660,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5152,6 +5159,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5615,6 +5623,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -6036,6 +6045,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6875,6 +6885,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6949,6 +6960,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7708,6 +7721,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7844,6 +7858,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix index 1e63fc7ecdb..53c71284163 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix @@ -1144,6 +1144,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2273,6 +2274,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3971,6 +3973,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -4043,6 +4046,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4354,6 +4358,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4481,6 +4486,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4631,6 +4637,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5127,6 +5134,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5587,6 +5595,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -6008,6 +6017,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6839,6 +6849,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6913,6 +6924,8 @@ self: super: { "shellmate" = dontDistribute super."shellmate"; "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7666,6 +7679,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7802,6 +7816,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix index 63ad44a1408..17e11586d38 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix @@ -1132,6 +1132,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2243,6 +2244,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3917,6 +3919,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3989,6 +3992,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4300,6 +4304,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4425,6 +4430,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4574,6 +4580,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5066,6 +5073,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5523,6 +5531,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5939,6 +5948,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6756,6 +6766,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6829,6 +6840,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7570,6 +7583,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7704,6 +7718,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix index ed02c06a840..bfb3b731998 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix @@ -1131,6 +1131,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2238,6 +2239,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3911,6 +3913,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3983,6 +3986,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4294,6 +4298,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4419,6 +4424,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4567,6 +4573,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5059,6 +5066,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5515,6 +5523,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5931,6 +5940,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6746,6 +6756,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6819,6 +6830,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7559,6 +7572,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7693,6 +7707,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix index 82d33cfb45d..4044a1f41a0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix @@ -1119,6 +1119,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2202,6 +2203,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3837,6 +3839,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3907,6 +3910,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4211,6 +4215,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; @@ -4334,6 +4339,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4479,6 +4485,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -4962,6 +4969,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5402,6 +5410,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5801,6 +5810,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6601,6 +6611,7 @@ self: super: { "serv-wai" = dontDistribute super."serv-wai"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1"; "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; @@ -6671,6 +6682,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7397,6 +7410,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7528,6 +7542,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix index 382e9af2de6..5d5a3767d6f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix @@ -1118,6 +1118,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2194,6 +2195,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3827,6 +3829,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3897,6 +3900,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4197,6 +4201,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; @@ -4320,6 +4325,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4464,6 +4470,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -4947,6 +4954,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5386,6 +5394,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5785,6 +5794,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6584,6 +6594,7 @@ self: super: { "serv-wai" = dontDistribute super."serv-wai"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1"; "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; @@ -6654,6 +6665,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7377,6 +7390,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7507,6 +7521,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.12.nix b/pkgs/development/haskell-modules/configuration-lts-5.12.nix index 517485ffb71..b8353d4f9b3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.12.nix @@ -1117,6 +1117,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2189,6 +2190,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3817,6 +3819,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3887,6 +3890,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4187,6 +4191,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; @@ -4309,6 +4314,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4453,6 +4459,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -4935,6 +4942,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5368,6 +5376,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5767,6 +5776,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6563,6 +6573,7 @@ self: super: { "serv" = dontDistribute super."serv"; "serv-wai" = dontDistribute super."serv-wai"; "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; @@ -6633,6 +6644,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7352,6 +7365,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7481,6 +7495,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.13.nix b/pkgs/development/haskell-modules/configuration-lts-5.13.nix index 8d104da5586..75d72e126f1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.13.nix @@ -1114,6 +1114,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2179,6 +2180,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3805,6 +3807,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3875,6 +3878,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4175,6 +4179,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; @@ -4293,6 +4298,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4437,6 +4443,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -4917,6 +4924,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5347,6 +5355,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5745,6 +5754,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6538,6 +6548,7 @@ self: super: { "serv" = dontDistribute super."serv"; "serv-wai" = dontDistribute super."serv-wai"; "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; @@ -6607,6 +6618,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7325,6 +7338,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7454,6 +7468,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix index dac1d3017ef..7dbaa3da18b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix @@ -1130,6 +1130,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2237,6 +2238,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3904,6 +3906,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3976,6 +3979,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4287,6 +4291,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4411,6 +4416,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4559,6 +4565,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5050,6 +5057,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5500,6 +5508,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5913,6 +5922,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6724,6 +6734,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6797,6 +6808,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7536,6 +7549,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7670,6 +7684,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix index 0ded8b1b398..4368c640604 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix @@ -1127,6 +1127,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2229,6 +2230,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3886,6 +3888,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3958,6 +3961,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4269,6 +4273,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4393,6 +4398,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4540,6 +4546,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5030,6 +5037,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5478,6 +5486,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5890,6 +5899,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6698,6 +6708,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6771,6 +6782,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7506,6 +7519,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7640,6 +7654,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix index 19a29cacb64..d54a61d0d9d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix @@ -1125,6 +1125,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2225,6 +2226,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3872,6 +3874,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3944,6 +3947,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4252,6 +4256,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4376,6 +4381,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4523,6 +4529,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5012,6 +5019,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5457,6 +5465,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5866,6 +5875,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6672,6 +6682,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6745,6 +6756,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7479,6 +7492,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7612,6 +7626,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix index 0f03cc418ac..3755d3ed35c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix @@ -1125,6 +1125,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2221,6 +2222,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3867,6 +3869,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3939,6 +3942,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4246,6 +4250,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4370,6 +4375,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4517,6 +4523,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -5006,6 +5013,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5451,6 +5459,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5860,6 +5869,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6666,6 +6676,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6739,6 +6750,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7473,6 +7486,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7606,6 +7620,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix index 51178e9c80a..53643599858 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix @@ -1124,6 +1124,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2215,6 +2216,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3856,6 +3858,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3928,6 +3931,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4235,6 +4239,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4359,6 +4364,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4506,6 +4512,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -4994,6 +5001,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5438,6 +5446,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5845,6 +5854,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6649,6 +6659,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6722,6 +6733,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7454,6 +7467,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7587,6 +7601,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix index db8b1941297..b8ae4e15211 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix @@ -1124,6 +1124,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2211,6 +2212,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3852,6 +3854,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3923,6 +3926,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4229,6 +4233,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4353,6 +4358,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4500,6 +4506,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -4988,6 +4995,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5431,6 +5439,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5835,6 +5844,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6638,6 +6648,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6711,6 +6722,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7441,6 +7454,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7573,6 +7587,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix index e4c9eec1feb..ddb17e5922d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix @@ -1124,6 +1124,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2210,6 +2211,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3851,6 +3853,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3922,6 +3925,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4228,6 +4232,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4352,6 +4357,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4499,6 +4505,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -4987,6 +4994,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5430,6 +5438,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5834,6 +5843,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6637,6 +6647,7 @@ self: super: { "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6"; "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_6"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-docs" = doDistribute super."servant-docs_0_4_4_6"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6710,6 +6721,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7440,6 +7453,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7572,6 +7586,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix index 20dfa12f481..3bb8e3ad802 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix @@ -1123,6 +1123,7 @@ self: super: { "airship" = doDistribute super."airship_0_4_3_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-distributed" = dontDistribute super."aivika-distributed"; "aivika-experiment" = dontDistribute super."aivika-experiment"; "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; @@ -2208,6 +2209,7 @@ self: super: { "css" = dontDistribute super."css"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-table" = dontDistribute super."csv-table"; "csv-to-qif" = dontDistribute super."csv-to-qif"; "ctemplate" = dontDistribute super."ctemplate"; "ctkl" = dontDistribute super."ctkl"; @@ -3845,6 +3847,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "heredocs" = dontDistribute super."heredocs"; "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; @@ -3915,6 +3918,7 @@ self: super: { "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; "hindent" = doDistribute super."hindent_4_6_1"; + "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; @@ -4221,6 +4225,7 @@ self: super: { "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4345,6 +4350,7 @@ self: super: { "hw-conduit" = dontDistribute super."hw-conduit"; "hw-diagnostics" = dontDistribute super."hw-diagnostics"; "hw-prim" = dontDistribute super."hw-prim"; + "hw-rankselect" = dontDistribute super."hw-rankselect"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4490,6 +4496,7 @@ self: super: { "interleavableIO" = dontDistribute super."interleavableIO"; "interleave" = dontDistribute super."interleave"; "interlude" = dontDistribute super."interlude"; + "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; "interpol" = dontDistribute super."interpol"; @@ -4976,6 +4983,7 @@ self: super: { "loadavg" = dontDistribute super."loadavg"; "local-address" = dontDistribute super."local-address"; "local-search" = dontDistribute super."local-search"; + "located" = dontDistribute super."located"; "located-base" = dontDistribute super."located-base"; "locators" = dontDistribute super."locators"; "loch" = dontDistribute super."loch"; @@ -5419,6 +5427,7 @@ self: super: { "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; + "native" = dontDistribute super."native"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5819,6 +5828,7 @@ self: super: { "pg-harness" = dontDistribute super."pg-harness"; "pg-harness-client" = dontDistribute super."pg-harness-client"; "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pg-store" = dontDistribute super."pg-store"; "pgdl" = dontDistribute super."pgdl"; "pgm" = dontDistribute super."pgm"; "pgsql-simple" = dontDistribute super."pgsql-simple"; @@ -6619,6 +6629,7 @@ self: super: { "serv-wai" = dontDistribute super."serv-wai"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1"; "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-csharp" = dontDistribute super."servant-csharp"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; @@ -6689,6 +6700,8 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shelly-extra" = dontDistribute super."shelly-extra"; + "shine" = dontDistribute super."shine"; + "shine-varying" = dontDistribute super."shine-varying"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; "shortcircuit" = dontDistribute super."shortcircuit"; @@ -7415,6 +7428,7 @@ self: super: { "transformers-abort" = dontDistribute super."transformers-abort"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; @@ -7547,6 +7561,7 @@ self: super: { "uAgda" = dontDistribute super."uAgda"; "ua-parser" = dontDistribute super."ua-parser"; "uacpid" = dontDistribute super."uacpid"; + "uber" = dontDistribute super."uber"; "uberlast" = dontDistribute super."uberlast"; "uconv" = dontDistribute super."uconv"; "udbus" = dontDistribute super."udbus"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index be180605a65..903f2c3a3a1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -440,8 +440,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "AFSM"; - version = "0.1.2.0"; - sha256 = "b2b8f50b4c0d8e270a2c8df396afd6bc7d4dbe0859d957907129718e37342004"; + version = "0.1.3.1"; + sha256 = "e6438e257446122b63c12dbb22ac58a2ff020ae164a2063a1166a544b325c27b"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/PseudoPower/AFSM"; description = "Arrowized functional state machines"; @@ -1993,6 +1993,32 @@ self: { license = "GPL"; }) {}; + "BlogLiterately_0_8_2_1" = callPackage + ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs + , containers, data-default, directory, filepath, HaXml, haxr + , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc + , pandoc-citeproc, pandoc-types, parsec, process, split, strict + , tagsoup, temporary, transformers + }: + mkDerivation { + pname = "BlogLiterately"; + version = "0.8.2.1"; + sha256 = "f95097b2bdc6a65328fd90e0007dac0a68c7847041e64e4d15e6dc523cba8c79"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html bool-extras bytestring cmdargs containers + data-default directory filepath HaXml haxr highlighting-kate + hscolour HTTP lens mtl pandoc pandoc-citeproc pandoc-types parsec + process split strict tagsoup temporary transformers + ]; + executableHaskellDepends = [ base cmdargs ]; + homepage = "http://byorgey.wordpress.com/blogliterately/"; + description = "A tool for posting Haskelly articles to blogs"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "BlogLiterately-diagrams_0_1_4_3" = callPackage ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder , diagrams-cairo, diagrams-lib, directory, filepath, pandoc, safe @@ -4719,6 +4745,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Diff_0_3_4" = callPackage + ({ mkDerivation, array, base, directory, pretty, process + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Diff"; + version = "0.3.4"; + sha256 = "77b7daec5a79ade779706748f11b4d9b8f805e57a68e7406c3b5a1dee16e0c2f"; + libraryHaskellDepends = [ array base pretty ]; + testHaskellDepends = [ + array base directory pretty process QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "O(ND) diff algorithm in haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "DifferenceLogic" = callPackage ({ mkDerivation, base, containers, fgl, FirstOrderTheory, HUnit }: mkDerivation { @@ -14064,6 +14108,22 @@ self: { license = "unknown"; }) {}; + "MonadRandom_0_4_2_3" = callPackage + ({ mkDerivation, base, mtl, random, transformers + , transformers-compat + }: + mkDerivation { + pname = "MonadRandom"; + version = "0.4.2.3"; + sha256 = "de40b12a70ec6425a9e54b33e2ac652e14d7c005a3b46d701d1e5696b98636c0"; + 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 { @@ -16056,8 +16116,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.9.0.5"; - sha256 = "2d39740f4bcca543b6fa53faf6dacb1d266f91986bc995fe2d0caeb68578dc3b"; + version = "0.9.0.7"; + sha256 = "48b55a36a471db30444ca4118402f2eece7cf20034a9737db5cd4b8723cbbf90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22521,9 +22581,10 @@ self: { ({ mkDerivation, acme-left-pad, base }: mkDerivation { pname = "acme-php"; - version = "0.0.4"; - sha256 = "c3015f1f75edeec2f42b7334cfaf7d69325b1c6ade573fe35fc487b4b81dc452"; + version = "0.0.5"; + sha256 = "545ecb6260ebb26336bdc41fbee7f0e48de390f220ff57ec1cce2c1661bc4ece"; libraryHaskellDepends = [ acme-left-pad base ]; + homepage = "http://hackage.haskell.org/package/acme-php-0.0.5/src/docs.html"; description = "The flexibility of Haskell and the safety of PHP"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -24190,13 +24251,12 @@ self: { }: mkDerivation { pname = "aeson-value-parser"; - version = "0.11.2"; - sha256 = "a0e64e5c4eb8e75e4ba27c6ea26276f508da407883fb1527102e07a20ed0d454"; + version = "0.11.3"; + sha256 = "ac948393647b17a7fe4ccda376c9941000ad99a4c30e48ee4ae39a027cef1b20"; libraryHaskellDepends = [ aeson base-prelude mtl-prelude scientific success text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/sannsyn/aeson-value-parser"; description = "An API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; @@ -24623,8 +24683,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { pname = "aivika"; - version = "4.3.3"; - sha256 = "3faa7104a9b51c138b9f3a6f3762de08ccff1e427653fee218466eb256b8cb3a"; + version = "4.3.4"; + sha256 = "4d533b39360fef397d948d8e48faed1d526799487f01f60821a7784c727fa8f8"; libraryHaskellDepends = [ array base containers mtl random vector ]; @@ -24649,6 +24709,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aivika-distributed" = callPackage + ({ mkDerivation, aivika, aivika-transformers, base, binary + , bytestring, containers, distributed-process, exceptions, mtl + , random, stm, time + }: + mkDerivation { + pname = "aivika-distributed"; + version = "0.1.3"; + sha256 = "fbfce34de97c3631dcc067726327c10df1325118685beb89458feb58ce860aae"; + libraryHaskellDepends = [ + aivika aivika-transformers base binary bytestring containers + distributed-process exceptions mtl random stm time + ]; + homepage = "http://www.aivikasoft.com/en/products/aivika.html"; + description = "Parallel distributed simulation library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aivika-experiment" = callPackage ({ mkDerivation, aivika, base, containers, directory, filepath, mtl , network-uri, parallel-io, split @@ -24723,8 +24801,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "4.3.3"; - sha256 = "1d05966db50550d92b75338cb4805c8b7f5c074ce7cac431e1b5e8e44902d5f5"; + version = "4.3.4"; + sha256 = "dbce6da57d88824135fafcf81c97f1e1905aea9fbd78241fac7f835491fa8ea9"; libraryHaskellDepends = [ aivika array base containers mtl random vector ]; @@ -34091,6 +34169,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec_0_13_0_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , QuickCheck, quickcheck-unicode, scientific, tasty + , tasty-quickcheck, text, transformers, vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.0.2"; + sha256 = "69f7f381f644ba4a6f348bbff9b2b4280b7b602e8e25e59eadb6e30ad5f2ec6a"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -34642,6 +34743,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "autoexporter_0_2_1" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "autoexporter"; + version = "0.2.1"; + sha256 = "fe46d1f434862dfaa4fd245c66d4a96ea8c4f3f8c3314ca6fc844e97e71097e4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/tfausak/autoexporter#readme"; + description = "Automatically re-export modules"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "automitive-cse" = callPackage ({ mkDerivation, base, bytestring, cereal, cryptonite, memory , quickcheck-simple @@ -38660,8 +38777,8 @@ self: { pname = "binary-orphans"; version = "0.1.4.0"; sha256 = "0a952a7521747a7aacf4aa1638674130262f2efacb7121727c1932d49017f742"; - revision = "4"; - editedCabalFile = "5c473d152fd0cc986ec5330e6138d3c3b62b29f2d3ae7ebfad0832ba82593ce6"; + revision = "5"; + editedCabalFile = "76b1ba2893085236d9989cf697d01fca25c7980563c5b5c452a133aeefec2b0d"; libraryHaskellDepends = [ aeson base binary hashable scientific semigroups tagged text text-binary time unordered-containers vector @@ -40778,8 +40895,8 @@ self: { }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.7.0.0"; - sha256 = "533cad5eb0c66efc407b676b9d2a43259e74b5343b00c35e2ded9382a5a36948"; + version = "0.7.0.1"; + sha256 = "808cce7f13d11c7ea5424fa017aada13e787dca3dafe67100e303e976dc6382e"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types microlens microlens-th network QuickCheck scientific split text @@ -47077,8 +47194,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "2.4.1.8"; - sha256 = "982f4bd1b6e8f4939795daaadf456faa6ea9ffa96723e5081fbbd13a0d28bd95"; + version = "2.4.1.9"; + sha256 = "a5156237cfb2bf64bcee8b1e408ace7b4c69d69733a129ab7d0b15436dab3acd"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances @@ -48930,6 +49047,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cheapskate_0_1_0_5" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, containers + , data-default, http-types, mtl, syb, text, uniplate, wai + , wai-extra, xss-sanitize + }: + mkDerivation { + pname = "cheapskate"; + version = "0.1.0.5"; + sha256 = "7a63b7ffc4976d006c5f693569a5ffd7a887e83d126d1dce9bbe8b5fbaabfa32"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html containers data-default mtl syb text uniplate + xss-sanitize + ]; + executableHaskellDepends = [ + aeson base blaze-html bytestring http-types text wai wai-extra + ]; + homepage = "http://github.com/jgm/cheapskate"; + description = "Experimental markdown processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cheapskate-highlight" = callPackage ({ mkDerivation, base, blaze-html, cheapskate, highlighting-kate , text @@ -60914,6 +61055,18 @@ self: { license = "GPL"; }) {}; + "csv-table" = callPackage + ({ mkDerivation, base, containers, csv, filepath, process }: + mkDerivation { + pname = "csv-table"; + version = "0.1.0.1"; + sha256 = "e91959b43226fe79dc00de47560cd25d0b24625c58c70058967d489d1656bcdc"; + libraryHaskellDepends = [ base containers csv filepath process ]; + homepage = "https://github.com/ucsd-progsys/csv-table"; + description = "Scripts for manipulating tables stored as CSV files"; + license = stdenv.lib.licenses.mit; + }) {}; + "csv-to-qif" = callPackage ({ mkDerivation, base, Cabal, explicit-exception, hspec, regex-tdfa , split, spreadsheet @@ -61640,6 +61793,8 @@ self: { pname = "darcs"; version = "2.10.3"; sha256 = "ca00c40d08276f94868c7c1bbc6dbd9b6b41a15c1907c34947aaa51d4dbbf642"; + revision = "1"; + editedCabalFile = "4f5cceb8b3cdf8974e5672c79a2dc8ce083d597f3b52c4137fb6d77cab5a281f"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -64639,19 +64794,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "deepseq_1_4_1_2" = callPackage + "deepseq_1_4_2_0" = callPackage ({ mkDerivation, array, base, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.1.2"; - sha256 = "3b7cfa5ff5eb169b3f97285be978f030d664c6e3e84a2525b2fafca4f7380651"; + version = "1.4.2.0"; + sha256 = "de0aa1291790409fe36e8b9bdf3c1f340661290eb3258876af2b07b721e94951"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ array base HUnit test-framework test-framework-hunit ]; - jailbreak = true; description = "Deep evaluation of data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -65595,6 +65749,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_2" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-prim, hspec, QuickCheck, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.2"; + sha256 = "763bb09a78ad4ffa00b30a3655bd01a7f2b816ebec8571c7cf059d481998b42a"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck transformers + transformers-compat + ]; + jailbreak = true; + homepage = "https://github.com/haskell-compat/deriving-compat"; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -66587,6 +66764,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-contrib_1_3_0_9" = callPackage + ({ mkDerivation, base, circle-packing, colour, containers + , data-default, data-default-class, diagrams-core, diagrams-lib + , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom + , mtl, parsec, QuickCheck, random, semigroups, split + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text + }: + mkDerivation { + pname = "diagrams-contrib"; + version = "1.3.0.9"; + sha256 = "b5a1fa28f7ab9d32dab44569a26e5918ec7a09c36399d2f789c22260d42d9b22"; + libraryHaskellDepends = [ + base circle-packing colour containers data-default + data-default-class diagrams-core diagrams-lib diagrams-solve + force-layout lens linear MonadRandom mtl parsec random semigroups + split text + ]; + testHaskellDepends = [ + base containers diagrams-lib HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Collection of user contributions to diagrams EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-core_1_2_0_4" = callPackage ({ mkDerivation, base, containers, dual-tree, lens, MemoTrie , monoid-extras, newtype, semigroups, vector-space @@ -77912,6 +78117,22 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-builder_0_0_0_4" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck + , stm + }: + mkDerivation { + pname = "fast-builder"; + version = "0.0.0.4"; + sha256 = "7c9349ff068b2f321fad9d84a4de699058575fd96470ab5d94964cd7ea032a34"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring process QuickCheck stm ]; + homepage = "http://github.com/takano-akio/fast-builder"; + description = "Fast ByteString Builder"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-digits" = callPackage ({ mkDerivation, base, digits, integer-gmp, QuickCheck, smallcheck , tasty, tasty-quickcheck, tasty-smallcheck @@ -78466,8 +78687,8 @@ self: { pname = "fay"; version = "0.23.1.12"; sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727"; - revision = "2"; - editedCabalFile = "8b1d2491a1f85893a14f5212460ec030b22e47e2da680f275f7ff619ad15b4b0"; + revision = "3"; + editedCabalFile = "eed2ee7a483cbde7f743e6f4cd880fa2ddbf72364159cce09d6c5ad963221c28"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78613,6 +78834,8 @@ self: { pname = "fay-builder"; version = "0.2.0.5"; sha256 = "116dea6dc304834be81d70faec7e3de1fd867ebbda0d02d3c1c6a0f96d2b31a2"; + revision = "1"; + editedCabalFile = "09fb1a4f71c11547dadf8859e302ede4d65aed7437ed1da16376811724a6b1ef"; libraryHaskellDepends = [ base Cabal data-default directory fay filepath safe split text ]; @@ -80180,6 +80403,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "file-embed_0_0_10" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.10"; + sha256 = "f751925cec5773a4fad5a48ca0a86a21091ee5f1efccf618a64a89fa2cf5f711"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base filepath ]; + homepage = "https://github.com/snoyberg/file-embed"; + description = "Use Template Haskell to embed file contents directly"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "file-location_0_4_5_3" = callPackage ({ mkDerivation, base, containers, lifted-base, process , template-haskell, transformers @@ -85969,6 +86210,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "geniplate-mirror_0_7_4" = callPackage + ({ mkDerivation, base, mtl, template-haskell }: + mkDerivation { + pname = "geniplate-mirror"; + version = "0.7.4"; + sha256 = "1bbfc296d598d604e0cf4da0b4a23e36e73f019f83b7911e18621443f04e2c5f"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "geniserver" = callPackage ({ mkDerivation, base, bytestring, cmdargs, GenI, http-types, json , snap-core, snap-server, text, transformers, utf8-string @@ -90590,8 +90844,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.1.6"; - sha256 = "3d88c38c096cd3887a18acb6b8947436b9b5a6f64e7d2168e946387b817a0993"; + version = "0.1.7"; + sha256 = "282402385403fad10b750146f28f41d447a77592ef23d94b287edf51b7336679"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96363,25 +96617,26 @@ self: { }) {}; "hackage-security" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, Cabal - , containers, cryptohash, directory, ed25519, filepath, ghc-prim - , HUnit, mtl, network, network-uri, parsec, tar, tasty, tasty-hunit - , template-haskell, temporary, time, transformers, zlib + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, Cabal, containers, cryptohash-sha256, directory + , ed25519, filepath, ghc-prim, HUnit, mtl, network, network-uri + , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, time, transformers + , zlib }: mkDerivation { pname = "hackage-security"; - version = "0.5.0.2"; - sha256 = "4135221bb74e899fde71ff5e878d0401b8c274af6ade996ca7ac15d2b77dbd98"; - revision = "1"; - editedCabalFile = "8b92101ca8da9bb27668763565eaf3c2e461c9c0c429003b196b64dbbd5c0af0"; + version = "0.5.1.0"; + sha256 = "5b2effb1e342f00c57db0b1390c46f9c6142e8039bb062ddab589ba438c88eba"; libraryHaskellDepends = [ - base base64-bytestring bytestring Cabal containers cryptohash - directory ed25519 filepath ghc-prim mtl network network-uri parsec - tar template-haskell time transformers zlib + base base16-bytestring base64-bytestring bytestring Cabal + containers cryptohash-sha256 directory ed25519 filepath ghc-prim + mtl network network-uri parsec pretty tar template-haskell time + transformers zlib ]; testHaskellDepends = [ - base bytestring Cabal containers HUnit network-uri tar tasty - tasty-hunit temporary time zlib + base bytestring Cabal containers HUnit network-uri QuickCheck tar + tasty tasty-hunit tasty-quickcheck temporary time zlib ]; homepage = "https://github.com/well-typed/hackage-security"; description = "Hackage security library"; @@ -96587,27 +96842,30 @@ self: { }) {}; "hackport" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, extensible-exceptions, filepath, HTTP, HUnit - , MissingH, network, network-uri, old-locale, old-time, parsec - , pretty, process, random, regex-compat, stm, tar, time, unix, xml - , zlib + ({ mkDerivation, array, base, base64-bytestring, binary, bytestring + , containers, cryptohash, deepseq, directory, ed25519 + , extensible-exceptions, filepath, ghc-prim, hashable, HTTP, HUnit + , MissingH, mtl, network, network-uri, old-locale, old-time, parsec + , pretty, process, random, regex-compat, split, stm, tar + , template-haskell, time, transformers, unix, xml, zlib }: mkDerivation { pname = "hackport"; - version = "0.4.7"; - sha256 = "17dc05163b456dceeb00180a03bb56f4218e5c5e1145c7ad12af13a261b0cf36"; + version = "0.5"; + sha256 = "90594dc1ff022a8fd2779548835555576df134feaf875cadca24378ece7fd97f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base binary bytestring containers deepseq directory - extensible-exceptions filepath HTTP MissingH network network-uri - old-locale old-time parsec pretty process random regex-compat stm - tar time unix xml zlib + array base base64-bytestring binary bytestring containers + cryptohash deepseq directory ed25519 extensible-exceptions filepath + ghc-prim hashable HTTP MissingH mtl network network-uri old-locale + old-time parsec pretty process random regex-compat split stm tar + template-haskell time transformers unix xml zlib ]; testHaskellDepends = [ base binary bytestring containers deepseq directory - extensible-exceptions filepath HUnit pretty process time unix xml + extensible-exceptions filepath HUnit pretty process split time unix + xml ]; description = "Hackage and Portage integration tool"; license = "GPL"; @@ -97652,7 +97910,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hakyll_4_8_0_0" = callPackage + "hakyll_4_8_0_1" = callPackage ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring , cmdargs, containers, cryptohash, data-default, deepseq, directory , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache @@ -97664,8 +97922,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.8.0.0"; - sha256 = "5e150418e8dd4caef4f9eca372140c7d5b0791166760d011cc11df8f0c7a3fcb"; + version = "4.8.0.1"; + sha256 = "c5e860cd6cf8bc525e032da106fbe44667bc5bdc5d3023ca77cc32b3c6bc41d5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106314,6 +106572,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "heredocs" = callPackage + ({ mkDerivation, base, doctest, parsec, template-haskell }: + mkDerivation { + pname = "heredocs"; + version = "0.1.1.0"; + sha256 = "fb6779b1eba4fade43b1c25d0289152390d37027e9e79f072331e175dbee7fa6"; + libraryHaskellDepends = [ base doctest parsec template-haskell ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/cutsea110/heredoc.git"; + description = "heredocument"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "herf-time" = callPackage ({ mkDerivation, base, doctest, time }: mkDerivation { @@ -108083,6 +108354,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hindley-milner" = callPackage + ({ mkDerivation, base, containers, data-fix, hspec, mtl + , transformers + }: + mkDerivation { + pname = "hindley-milner"; + version = "0.1.0.0"; + sha256 = "d29f6fd4871c953fa016dd8cb8dadcf0ed0535947bb8e89c8acb12a78d6964ac"; + libraryHaskellDepends = [ + base containers data-fix mtl transformers + ]; + testHaskellDepends = [ base containers hspec ]; + description = "Template for Hindley-Milner based languages"; + license = stdenv.lib.licenses.mit; + }) {}; + "hinduce-associations-apriori" = callPackage ({ mkDerivation, base, containers, deepseq, hinduce-missingh , parallel, vector @@ -117506,6 +117793,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hspec-slow" = callPackage + ({ mkDerivation, base, hspec, mtl, stm, time, transformers }: + mkDerivation { + pname = "hspec-slow"; + version = "0.1.0.0"; + sha256 = "18bacf99cc3f081b65a0c3317ba8b291c1279bcba92c00e53f6fd25d71df70db"; + libraryHaskellDepends = [ base hspec mtl stm time transformers ]; + testHaskellDepends = [ base hspec mtl stm ]; + homepage = "https://github.com/bobjflong/hspec-slow#readme"; + description = "Find slow test cases"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-smallcheck_0_3_0" = callPackage ({ mkDerivation, base, hspec, QuickCheck, smallcheck }: mkDerivation { @@ -121914,31 +122214,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-bits_0_0_0_6" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap + , parsec, QuickCheck, resourcet, vector + }: + mkDerivation { + pname = "hw-bits"; + version = "0.0.0.6"; + sha256 = "8cfe76cdfe568fb392abe90e1f362c340d32729baa47c113d027657c85ef6c37"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; + executableHaskellDepends = [ + base criterion mmap resourcet vector + ]; + testHaskellDepends = [ base hspec QuickCheck vector ]; + homepage = "http://github.com/haskell-works/hw-bits#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-conduit" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, conduit - , criterion, deepseq, ghc-prim, hspec, hw-bits, hw-prim, lens, mmap - , mono-traversable, parsec, QuickCheck, random, resourcet, safe - , text, transformers, vector, word8 + ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec + , hw-bits, resourcet }: mkDerivation { pname = "hw-conduit"; - version = "0.0.0.6"; - sha256 = "4099d43952a4555b18264c3da34b39983d3078375011d7458f978c1e2b17213e"; + version = "0.0.0.8"; + sha256 = "574c7d719bd647f03b6b8f3942c45027ac0a4e49507c38330876507ce2d8b301"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array attoparsec base bytestring conduit deepseq ghc-prim hw-bits - hw-prim lens mmap mono-traversable parsec QuickCheck random - resourcet safe text vector word8 - ]; - executableHaskellDepends = [ - base bytestring conduit criterion hw-bits hw-prim mmap resourcet - vector - ]; - testHaskellDepends = [ - attoparsec base bytestring conduit hspec hw-bits hw-prim mmap - parsec QuickCheck resourcet transformers vector + array base bytestring conduit hw-bits resourcet ]; + executableHaskellDepends = [ base criterion ]; + testHaskellDepends = [ base bytestring hspec ]; homepage = "http://github.com/haskell-works/hw-conduit#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; @@ -121969,6 +122280,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-diagnostics_0_0_0_2" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "hw-diagnostics"; + version = "0.0.0.2"; + sha256 = "f90d28865ebd4fd0116270a47ed13f6b2a91255b8ec71c6d04a1cd5675237569"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, random , vector @@ -121987,6 +122315,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-prim_0_0_0_8" = callPackage + ({ mkDerivation, base, bytestring, hspec, QuickCheck, random + , vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.0.0.8"; + sha256 = "47c84f878d396475590223529fd9d70b277e8345a1f1b2c0d7956d968a5b14b1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring random vector ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "http://github.com/haskell-works/hw-prim#readme"; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hw-rankselect" = callPackage + ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector + }: + mkDerivation { + pname = "hw-rankselect"; + version = "0.0.0.2"; + sha256 = "ad79b1fca42093c3db8c7196ab144a2a618c22e4368cc5ccf0d548a15fdc186a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hw-bits hw-prim vector ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hspec hw-bits hw-prim QuickCheck vector + ]; + homepage = "http://github.com/haskell-works/hw-rankselect#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-succinct" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, conduit , criterion, deepseq, ghc-prim, hspec, hw-bits, hw-prim, lens, mmap @@ -122017,6 +122383,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-succinct_0_0_0_8" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit, criterion + , hspec, hw-bits, hw-conduit, hw-diagnostics, hw-prim + , hw-rankselect, mmap, mono-traversable, parsec, QuickCheck + , resourcet, text, transformers, vector + }: + mkDerivation { + pname = "hw-succinct"; + version = "0.0.0.8"; + sha256 = "70b1e52059a18d9ce9f6b5735f4497bf341cce4ec9265858584a4eea0d7215a2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring conduit hw-bits hw-conduit hw-prim + hw-rankselect mono-traversable text vector + ]; + executableHaskellDepends = [ + base bytestring conduit criterion hw-bits hw-conduit hw-diagnostics + hw-prim hw-rankselect mmap resourcet vector + ]; + testHaskellDepends = [ + attoparsec base bytestring conduit hspec hw-bits hw-conduit hw-prim + hw-rankselect mmap parsec QuickCheck resourcet transformers vector + ]; + homepage = "http://github.com/haskell-works/hw-succinct#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hwall-auth-iitk" = callPackage ({ mkDerivation, base, bytestring, haskeline, http-conduit , http-types, mtl, regex-compat, unix @@ -123052,21 +123448,21 @@ self: { }) {}; "hylogen" = callPackage - ({ mkDerivation, base, bytestring, filepath, fsnotify, network - , process, random, text, vector-space, websockets + ({ mkDerivation, base, bytestring, filepath, fsnotify, http-types + , process, text, vector-space, wai, warp, websockets }: mkDerivation { pname = "hylogen"; - version = "0.1.0.8"; - sha256 = "f2b3be1868b32af6d12b50be5ef5c7145d0e7aa7c9052a9d8b87fea2b686b08d"; + version = "0.1.0.10"; + sha256 = "a8e59008ec5d4293ae14b52b900a8182f02640e6e5724d56f856e94cd1e5d40a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base vector-space ]; executableHaskellDepends = [ - base bytestring filepath fsnotify network process random text + base bytestring filepath fsnotify http-types process text wai warp websockets ]; - homepage = "https://github.com/sleexyz/hylogen"; + homepage = "https://hylogen.com"; description = "an EDSL for live-coding fragment shaders"; license = stdenv.lib.licenses.mit; }) {}; @@ -126668,6 +127064,22 @@ self: { license = "GPL"; }) {}; + "interlude-l" = callPackage + ({ mkDerivation, aeson, base, exceptions, lens, mtl, protolude + , string-conv, witherable + }: + mkDerivation { + pname = "interlude-l"; + version = "0.1.0.1"; + sha256 = "0128de332aa2b5520f96555921197e14db1e07990cd1ac5a05fd2618b49e9813"; + libraryHaskellDepends = [ + aeson base exceptions lens mtl protolude string-conv witherable + ]; + jailbreak = true; + description = "Prelude replacement based on protolude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "intern" = callPackage ({ mkDerivation, array, base, bytestring, hashable, text , unordered-containers @@ -128025,8 +128437,8 @@ self: { }: mkDerivation { pname = "iridium"; - version = "0.1.5.2"; - sha256 = "97709297aae761e274de08e9d47cab14e87065e9787357a0e45f817cfefaa640"; + version = "0.1.5.3"; + sha256 = "7713b11ea4ea643fbbc99eef0c2bb52cb0968c8d645bf176e196a738e7b18644"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128038,7 +128450,6 @@ self: { executableHaskellDepends = [ base extra multistate text transformers unordered-containers yaml ]; - jailbreak = true; homepage = "https://github.com/lspitzner/iridium"; description = "Automated Testing and Package Uploading"; license = stdenv.lib.licenses.bsd3; @@ -130930,8 +131341,8 @@ self: { }: mkDerivation { pname = "jsontsv"; - version = "0.1.5.0"; - sha256 = "85756b958fa6655fc3d438609a4e3dfe45715db91fccae7f1b2f144cc2863462"; + version = "0.1.6.1"; + sha256 = "d84484e71b4fd577aafb4674fb5ba6f2aece4f3ed1eb152cef9b50d4cf025ef5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130939,7 +131350,6 @@ self: { optparse-applicative scientific string-qq text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/danchoi/jsontsv"; description = "JSON to TSV transformer"; license = stdenv.lib.licenses.mit; @@ -131494,6 +131904,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "katip_0_2_0_0" = callPackage + ({ mkDerivation, aeson, auto-update, base, bytestring, containers + , directory, either, exceptions, hostname, microlens, microlens-th + , monad-control, mtl, old-locale, quickcheck-instances + , regex-tdfa-rc, resourcet, string-conv, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unix, unordered-containers + }: + mkDerivation { + pname = "katip"; + version = "0.2.0.0"; + sha256 = "bd947874e92da876603c1cbb3bc521e8f33cd08a59c2714d0e35e8dd15ad53b9"; + libraryHaskellDepends = [ + aeson auto-update base bytestring containers either exceptions + hostname microlens microlens-th monad-control mtl old-locale + resourcet string-conv template-haskell text time time-locale-compat + transformers transformers-base transformers-compat unix + unordered-containers + ]; + testHaskellDepends = [ + aeson base directory quickcheck-instances regex-tdfa-rc tasty + tasty-hunit tasty-quickcheck template-haskell temporary text time + unordered-containers + ]; + homepage = "https://github.com/Soostone/katip"; + description = "A structured logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, containers , enclosed-exceptions, exceptions, http-client, http-types, katip @@ -131521,6 +131962,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip-elasticsearch_0_2_0_0" = callPackage + ({ mkDerivation, aeson, async, base, bloodhound, containers + , enclosed-exceptions, exceptions, http-client, http-types, katip + , lens, lens-aeson, quickcheck-instances, random, retry, scientific + , stm, stm-chans, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "katip-elasticsearch"; + version = "0.2.0.0"; + sha256 = "3d7c1326c749b41635b4dbd6044f8ff1e94dc0209a30faca69a2808e91564f0e"; + libraryHaskellDepends = [ + aeson async base bloodhound enclosed-exceptions exceptions + http-client http-types katip random retry scientific stm stm-chans + text time transformers unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base bloodhound containers http-client http-types katip lens + lens-aeson quickcheck-instances scientific stm tasty tasty-hunit + tasty-quickcheck text time transformers unordered-containers vector + ]; + jailbreak = true; + description = "ElasticSearch scribe for the Katip logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katt" = callPackage ({ mkDerivation, aeson, base, bytestring, ConfigFile, containers , directory, errors, filepath, lens, mtl, parsec, text, url, wreq @@ -132380,6 +132848,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "keycode_0_2" = callPackage + ({ mkDerivation, base, containers, ghc-prim }: + mkDerivation { + pname = "keycode"; + version = "0.2"; + sha256 = "93f09542fa79993e46a263ff11c3a3c5368c00aa5a11e53bdccf7fbe885459ae"; + libraryHaskellDepends = [ base containers ghc-prim ]; + homepage = "https://github.com/RyanGlScott/keycode"; + description = "Maps web browser keycodes to their corresponding keyboard keys"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "keyed" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -133129,14 +133610,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "lackey_0_3_0" = callPackage + "lackey_0_3_1" = callPackage ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec , text }: mkDerivation { pname = "lackey"; - version = "0.3.0"; - sha256 = "36f40425c39a7a214d5932b9f2c005335e61c2e95f2dc6fe4cf1172bf45d84c3"; + version = "0.3.1"; + sha256 = "a7b552e3c24fbb6e272cabb897b6788712da789a3934d0ad3bae6fe9857d1d2a"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base servant tasty tasty-hspec text ]; jailbreak = true; @@ -136059,22 +136540,22 @@ self: { }) {}; "learn-physics" = callPackage - ({ mkDerivation, base, gloss, gnuplot, not-gloss, spatial-math - , vector-space + ({ mkDerivation, base, gloss, gnuplot, hmatrix, linear, not-gloss + , polynomial, spatial-math, vector-space }: mkDerivation { pname = "learn-physics"; - version = "0.5.2"; - sha256 = "473585c2c6c8c3503bba1dcbfc308dcb402a67c942a8edb5ed3bfbad1e91830d"; + version = "0.6.0.0"; + sha256 = "6403b807172ceebb2081a580489e4e9a5d7a451f07f0228863db7ac46fdec8de"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base gloss gnuplot not-gloss spatial-math vector-space + base gloss gnuplot hmatrix linear not-gloss polynomial spatial-math + vector-space ]; executableHaskellDepends = [ base gloss gnuplot not-gloss spatial-math ]; - jailbreak = true; description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -140214,6 +140695,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "located" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "located"; + version = "0.1.0.0"; + sha256 = "80c2fe4b858243b164b9491c0caa97f46108893743c1f18468ea8c805bb756ab"; + libraryHaskellDepends = [ base text ]; + homepage = "https://github.com/elliottt/located"; + description = "Source location helpers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "located-base" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -144288,6 +144781,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "math-functions_0_1_6_0" = callPackage + ({ mkDerivation, base, deepseq, erf, HUnit, ieee754, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.1.6.0"; + sha256 = "3cb90fc750d28c8f6096ee083aff77dfa4dcf4a4938497957860d222e4436199"; + libraryHaskellDepends = [ + base deepseq erf vector vector-th-unbox + ]; + testHaskellDepends = [ + base HUnit ieee754 QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector + ]; + homepage = "https://github.com/bos/math-functions"; + description = "Special functions and Chebyshev polynomials"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mathblog" = callPackage ({ mkDerivation, base, bytestring, ConfigFile, containers , data-default, deepseq, directory, either, filepath, fsnotify @@ -146546,15 +147061,14 @@ self: { }: mkDerivation { pname = "midi-music-box"; - version = "0.0"; - sha256 = "ae5ae1f9db61d56ee17035a04e8d1d9a8c68f4bfdb213f619e159d619fb4d442"; + version = "0.0.0.1"; + sha256 = "1e830c1f871cbf8f5b478c5923d52f76457b15eda2d64a4bf9e6c2016ed47de9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers diagrams-lib diagrams-postscript event-list midi non-empty optparse-applicative utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/midi-music-box"; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; @@ -147035,6 +147549,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mime-types_0_1_0_7" = callPackage + ({ mkDerivation, base, bytestring, containers, text }: + mkDerivation { + pname = "mime-types"; + version = "0.1.0.7"; + sha256 = "83164a24963a7ef37543349df095155b30116c208e602a159a5cd3722f66e9b9"; + libraryHaskellDepends = [ base bytestring containers text ]; + homepage = "https://github.com/yesodweb/wai"; + description = "Basic mime-type handling types and functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mines" = callPackage ({ mkDerivation, base, directory, mtl, random }: mkDerivation { @@ -150579,6 +151106,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "morte_1_6_0" = callPackage + ({ mkDerivation, alex, array, base, binary, containers, deepseq + , Earley, http-client, http-client-tls, microlens, microlens-mtl + , mtl, optparse-applicative, pipes, QuickCheck, system-fileio + , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text + , text-format, transformers + }: + mkDerivation { + pname = "morte"; + version = "1.6.0"; + sha256 = "c182fc6f3bdaa4f0ecfaeaf95812bfaa4a170227489940400967a6e6b6e4445a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary containers deepseq Earley http-client + http-client-tls microlens microlens-mtl pipes system-fileio + system-filepath text text-format transformers + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ base optparse-applicative text ]; + testHaskellDepends = [ + base mtl QuickCheck system-filepath tasty tasty-hunit + tasty-quickcheck text transformers + ]; + description = "A bare-bones calculus of constructions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mosaico-lib" = callPackage ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels @@ -152248,6 +152804,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mutable-containers_0_3_2_1" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec + , mono-traversable, primitive, QuickCheck, vector + }: + mkDerivation { + pname = "mutable-containers"; + version = "0.3.2.1"; + sha256 = "fb83475c6a755d1998906f37a71b6aa6f414fd0b5d41b16567c2219fb43e4e4d"; + libraryHaskellDepends = [ + base containers ghc-prim mono-traversable primitive vector + ]; + testHaskellDepends = [ + base containers hspec primitive QuickCheck vector + ]; + homepage = "https://github.com/fpco/mutable-containers"; + description = "Abstactions and concrete implementations of mutable containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mutable-iter" = callPackage ({ mkDerivation, base, iteratee, MonadCatchIO-transformers , transformers, vector @@ -153182,6 +153758,25 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "native" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , optparse-applicative, process, shelly, text + }: + mkDerivation { + pname = "native"; + version = "0.1.0.1"; + sha256 = "7f18590d63af1dbb134f1768b2173009283865f35bb47eaa04e98377ee66ecaf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory filepath process shelly text + ]; + executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ base ]; + description = "Native library manager for Windows"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nats_1" = callPackage ({ mkDerivation }: mkDerivation { @@ -157245,6 +157840,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "octane_0_4_18" = callPackage + ({ mkDerivation, aeson, aeson-pretty, autoexporter, base, binary + , binary-bits, bytestring, containers, data-binary-ieee754, deepseq + , newtype-generics, tasty, tasty-hspec, text + }: + mkDerivation { + pname = "octane"; + version = "0.4.18"; + sha256 = "75662d122bf7eb1f552cda017e45d74b2f0364a45ac0a11eb3af1687d8ce8f44"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty autoexporter base binary binary-bits bytestring + containers data-binary-ieee754 deepseq newtype-generics text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base binary bytestring containers tasty tasty-hspec + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -158111,13 +158731,17 @@ self: { }) {}; "open-witness" = callPackage - ({ mkDerivation, base, mtl, witness }: + ({ mkDerivation, base, hashable, random, template-haskell + , transformers, witness + }: mkDerivation { pname = "open-witness"; - version = "0.1.1"; - sha256 = "74dc0d586b21116cc47ba8614e52301a869c4e30c0f9c51eee40511e3ca468c4"; - libraryHaskellDepends = [ base mtl witness ]; - jailbreak = true; + version = "0.3.1"; + sha256 = "f217e4585e706cef7ab7aa3419f56205a929c350dbeb6c868972d7c25e7b82cb"; + libraryHaskellDepends = [ + base hashable random template-haskell transformers witness + ]; + homepage = "https://github.com/AshleyYakeley/open-witness"; description = "open witnesses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -160613,6 +161237,8 @@ self: { pname = "pandoc"; version = "1.17.0.3"; sha256 = "7b14e1bcb78a7e2ad1e585f127be7efd20225c9f9b5131d507b376b62cd77e32"; + revision = "1"; + editedCabalFile = "23dfb2513b8b5352d16fc331cb1b6b4989df239e62905f9cf341c9f519191891"; configureFlags = [ "-fhttps" ]; isLibrary = true; isExecutable = true; @@ -164204,16 +164830,20 @@ self: { "persistent-database-url" = callPackage ({ mkDerivation, base, bytestring, fail, hspec - , persistent-postgresql, uri-bytestring + , persistent-postgresql, string-conversions, text, uri-bytestring }: mkDerivation { pname = "persistent-database-url"; - version = "1.0.0"; - sha256 = "4f75cb61373267bbc8a6c7e59312c83c7b60a90373f06158ee50c5222ec4742a"; + version = "1.1.0"; + sha256 = "a3e1c0bc2592593beb3bdae36a7b880bda5e38e3b288a71d88e2c99b8f4ec4d1"; libraryHaskellDepends = [ - base bytestring fail persistent-postgresql uri-bytestring + base bytestring fail persistent-postgresql string-conversions text + uri-bytestring ]; - testHaskellDepends = [ base hspec persistent-postgresql ]; + testHaskellDepends = [ + base bytestring hspec persistent-postgresql text + ]; + jailbreak = true; description = "Parse DATABASE_URL into configuration types for Persistent"; license = stdenv.lib.licenses.mit; }) {}; @@ -165556,7 +166186,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_5" = callPackage + "persistent-template_2_5_1" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger , path-pieces, persistent, QuickCheck, tagged, template-haskell @@ -165564,8 +166194,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.5"; - sha256 = "17c50172ed2b9f77480dcc616aa248dd62cf1b8e909b6b452ac503c9c8799b1f"; + version = "2.5.1"; + sha256 = "24776c5690023cebc85bda7c2cc8b0ebeb6cc87884ac83800f6891b1b32975fa"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -165805,6 +166435,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pg-store" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec + , postgresql-libpq, QuickCheck, template-haskell, text + , transformers + }: + mkDerivation { + pname = "pg-store"; + version = "0.0.1"; + sha256 = "27032e33207c53c65452bfc3ea3d90620069850297e3edb5aa3e9274e6130c7f"; + libraryHaskellDepends = [ + attoparsec base bytestring postgresql-libpq template-haskell text + transformers + ]; + testHaskellDepends = [ + base bytestring hspec postgresql-libpq QuickCheck text + ]; + homepage = "https://github.com/vapourismo/pg-store"; + description = "Dead simple storage interface to PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pgdl" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, configurator , directory, filepath, HTTP, http-conduit, network-uri, process @@ -170768,8 +171419,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "prelude-edsl"; - version = "0.3.1"; - sha256 = "7b6233ca1eeb916185f87a7ba9ba8007a3b3f3307b795e52b32444fbcce44658"; + version = "0.4"; + sha256 = "2ef0353e4386cb64d8911fa2315b24a3581082e9ec8046b148364686df1b4657"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/emilaxelsson/prelude-edsl"; description = "An EDSL-motivated subset of the Prelude"; @@ -173159,6 +173810,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psqueues_0_2_2_1" = callPackage + ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit + , QuickCheck, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "psqueues"; + version = "0.2.2.1"; + sha256 = "1428771180a34c2258bc9ca0f0c12f1df530be018e870c91348975cc7d33ae9b"; + libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; + testHaskellDepends = [ + array base deepseq ghc-prim hashable HUnit QuickCheck tagged + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Pure priority search queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pub" = callPackage ({ mkDerivation, base, bytestring, cmdargs, ConfigFile, containers , groom, hedis, hslogger, mtl, network, pipes, pipes-bytestring @@ -173886,7 +174556,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "purescript_0_8_4_0" = callPackage + "purescript_0_8_5_0" = callPackage ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base , base-compat, bower-json, boxes, bytestring, containers, directory , dlist, edit-distance, filepath, fsnotify, Glob, haskeline, hspec @@ -173894,13 +174564,14 @@ self: { , lifted-base, monad-control, monad-logger, mtl, network , optparse-applicative, parallel, parsec, pattern-arrows, pipes , pipes-http, process, regex-tdfa, safe, semigroups, sourcemap - , split, stm, syb, text, time, transformers, transformers-base - , transformers-compat, unordered-containers, utf8-string, vector + , spdx, split, stm, syb, text, time, transformers + , transformers-base, transformers-compat, unordered-containers + , utf8-string, vector }: mkDerivation { pname = "purescript"; - version = "0.8.4.0"; - sha256 = "cb0f75b7c4a9f926b6e183fe825153abdde6170f5da9c2b0ccef27575e3e264e"; + version = "0.8.5.0"; + sha256 = "75a253d113b33e79abceff9d280988c1a4cb46eb84547a82eda1ec4bdad60d04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173908,9 +174579,9 @@ self: { bytestring containers directory dlist edit-distance filepath fsnotify Glob http-types language-javascript lifted-base monad-control monad-logger mtl parallel parsec pattern-arrows pipes - pipes-http process regex-tdfa safe semigroups sourcemap split stm - syb text time transformers transformers-base transformers-compat - unordered-containers utf8-string vector + pipes-http process regex-tdfa safe semigroups sourcemap spdx split + stm syb text time transformers transformers-base + transformers-compat unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson ansi-wl-pprint base base-compat boxes bytestring containers @@ -176342,6 +177013,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel_0_1_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, http-client, http-client-tls, http-types, tasty + , tasty-hspec, text, uuid + }: + mkDerivation { + pname = "ratel"; + version = "0.1.3"; + sha256 = "49fee52e108c70551438f75f997b8c0a3053ee15476422c77509918bfb3ca9b3"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types text uuid + ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + homepage = "https://github.com/tfausak/ratel#readme"; + description = "Notify Honeybadger about exceptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -176358,6 +177049,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel-wai_0_1_2" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "0.1.2"; + sha256 = "f8aad4c4f57e58bda51edc56521e095e03810c825ef2333069e9151f51e1468e"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + homepage = "https://github.com/tfausak/ratel-wai#readme"; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ratio-int" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -180867,8 +181575,8 @@ self: { pname = "rest-core"; version = "0.38"; sha256 = "b491b734c2d74729f427ca02370f12b839dd92347fea44b5fb66c66a39b11cec"; - revision = "1"; - editedCabalFile = "edcbe69d770149b6e3aeb47cc7ae2a9f4e589fa3cd1c928f1538504ac24b8b2c"; + revision = "2"; + editedCabalFile = "ed51d0cdb0e2562b3d3d03bc87c0da6d8da947ccec0f66307cf9455e82bd39dc"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -181290,8 +181998,8 @@ self: { pname = "rest-gen"; version = "0.19.0.2"; sha256 = "12caa70e7b29b073cb0e066cf7d5c590b13e0fb5b2f924944cd1ae5217c79330"; - revision = "1"; - editedCabalFile = "afca13957f1b186ba5922659d6275cdf5c8d49ec2bca6f2319d89c213afa5c4d"; + revision = "2"; + editedCabalFile = "e4e4528467c593e7cfc6ae2180bfa4a255097f1921a9daa70b46c48c0e84763a"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -181533,8 +182241,8 @@ self: { pname = "rest-stringmap"; version = "0.2.0.6"; sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a"; - revision = "2"; - editedCabalFile = "286ce136699cc8dffad47ead93fdaf0538e465edafde510ff7697f96e470ea1d"; + revision = "3"; + editedCabalFile = "33fa62a06fc1c77f4e77c603b0a19678eab9695402e20e56556c6fd090e332dd"; libraryHaskellDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -184734,12 +185442,12 @@ self: { , conduit-combinators, conduit-extra, data-binary-ieee754, lens , monad-loops, QuickCheck, resourcet, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, unordered-containers - , yaml, yaml-light + , yaml }: mkDerivation { pname = "sbp"; - version = "0.52.1"; - sha256 = "72e53ab77cf026fc5bde9899a5a49a35bbe6a2e3853022b9d62e238eee8450f6"; + version = "0.52.2"; + sha256 = "e3510bf821f2af6bc73221a0c35cce3e3436f8651bdddc08db190d389992fa41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184753,7 +185461,7 @@ self: { ]; testHaskellDepends = [ aeson base base64-bytestring basic-prelude bytestring QuickCheck - tasty tasty-hunit tasty-quickcheck yaml-light + tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/swift-nav/libsbp"; description = "SwiftNav's SBP Library"; @@ -188369,6 +189077,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-csharp" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , haskell-src-exts, heredocs, http-types, lens, servant + , servant-foreign, text, time, uuid, uuid-types + }: + mkDerivation { + pname = "servant-csharp"; + version = "0.0.7.1"; + sha256 = "98bb40bf02a4ed672fe50c1c5c90901e61ebe5ade8d639a1dfdee215ce1de4ff"; + libraryHaskellDepends = [ + base bytestring directory filepath haskell-src-exts heredocs + http-types lens servant servant-foreign text time uuid uuid-types + ]; + jailbreak = true; + homepage = "https://github.com/cutsea110/servant-csharp.git"; + description = "Generate servant client library for C#"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-docs_0_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable , lens, servant, string-conversions, system-filepath, text @@ -191084,6 +191811,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_8_2" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.8.2"; + sha256 = "30797f10420f70164443ba4167fb3901f84d235cb419fd0d0442e746c835b114"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -191476,8 +192230,8 @@ self: { pname = "shelltestrunner"; version = "1.3.5"; sha256 = "4265eb9cc87c352655099da26f49fb7829f5163edd03a20105b7a25609d3a829"; - revision = "1"; - editedCabalFile = "4ccce28f099594a89bbb8ff9c8f6408955b4be02a01eb2d552e1ce7165dce3aa"; + revision = "2"; + editedCabalFile = "647017bad45490fe4d5f549d21583d80c8ce69f3e4e8e4476c55707126b2e2b4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -191717,6 +192471,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shelly_1_6_6" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async + , lifted-base, monad-control, mtl, process, system-fileio + , system-filepath, text, time, transformers, transformers-base + , unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.6.6"; + sha256 = "9c89e1ed25de9ede0ee6d6a4094ff72ca6af5b1a1f67503ea40a87beb796e1c5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions hspec HUnit lifted-async lifted-base monad-control mtl + process system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + homepage = "https://github.com/yesodweb/Shelly.hs"; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shelly-extra" = callPackage ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore , shelly, text @@ -191734,6 +192519,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shine" = callPackage + ({ mkDerivation, base, ghcjs-dom, ghcjs-prim, keycode, mtl, time + , transformers + }: + mkDerivation { + pname = "shine"; + version = "0.1.0.0"; + sha256 = "b20ef3b3c40df6f53bf4eefeaf8d53482f3729562626744095c101641ae469a0"; + revision = "1"; + editedCabalFile = "650580b5783e188ebeda9d052966052dba2fad5a971cbe078e5046b120ed1f1a"; + libraryHaskellDepends = [ + base ghcjs-dom ghcjs-prim keycode mtl time transformers + ]; + testHaskellDepends = [ base ghcjs-dom ]; + jailbreak = true; + homepage = "https://github.com/fgaz/shine"; + description = "Declarative graphics for the browser using GHCJS"; + license = stdenv.lib.licenses.mit; + broken = true; + }) {ghcjs-prim = null;}; + + "shine-varying" = callPackage + ({ mkDerivation, base, ghcjs-dom, keycode, shine, varying }: + mkDerivation { + pname = "shine-varying"; + version = "0.1.0.0"; + sha256 = "80301d12099fa02193881457cf80603b00d8c0fe59ef3a8e75f1f81491fbb68e"; + libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ]; + testHaskellDepends = [ base ghcjs-dom keycode shine varying ]; + homepage = "https://github.com/fgaz/shine-varying"; + description = "FRP interface for shine using the varying package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shivers-cfg" = callPackage ({ mkDerivation, base, containers, directory, HPDF, language-dot , mtl, pretty, process @@ -200059,6 +200879,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stateWriter_0_2_7" = callPackage + ({ mkDerivation, base, free, hspec, mtl, QuickCheck, transformers + }: + mkDerivation { + pname = "stateWriter"; + version = "0.2.7"; + sha256 = "b8c23d83157fef157c44e46190267c5a16e9e6b479066abc1219708726c24da8"; + libraryHaskellDepends = [ base mtl transformers ]; + testHaskellDepends = [ base free hspec mtl QuickCheck ]; + description = "A faster variant of the RWS monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "statechart" = callPackage ({ mkDerivation, base, polyparse }: mkDerivation { @@ -201934,6 +202768,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streaming-commons_0_1_15_4" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , deepseq, directory, hspec, network, process, QuickCheck, random + , stm, text, transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.1.15.4"; + sha256 = "910831609225700605b9e0111c9f0dd214015b54c0dddb6f29069dc03624afbb"; + libraryHaskellDepends = [ + array async base blaze-builder bytestring directory network process + random stm text transformers unix zlib + ]; + testHaskellDepends = [ + array async base blaze-builder bytestring deepseq hspec network + QuickCheck text unix zlib + ]; + homepage = "https://github.com/fpco/streaming-commons"; + description = "Common lower-level functions needed by various streaming data libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-histogram" = callPackage ({ mkDerivation, base, containers, criterion, tasty, tasty-hunit , tasty-quickcheck @@ -205625,6 +206482,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagged_0_8_4" = callPackage + ({ mkDerivation, base, deepseq, template-haskell }: + mkDerivation { + pname = "tagged"; + version = "0.8.4"; + sha256 = "20c861d299445ea810ba39d9d0529fb0b3862f4d0271a4fb168ccd493a234d5e"; + libraryHaskellDepends = [ base deepseq template-haskell ]; + homepage = "http://github.com/ekmett/tagged"; + description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagged-binary" = callPackage ({ mkDerivation, base, binary, bytestring, pureMD5 }: mkDerivation { @@ -208402,6 +209272,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "testing-feat_0_4_0_3" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, tagshare, template-haskell + }: + mkDerivation { + pname = "testing-feat"; + version = "0.4.0.3"; + sha256 = "34ca9c7849c4054b951cb359dc55ec1d24f5c2f7cf31d6211959778ad35407ce"; + libraryHaskellDepends = [ + base mtl QuickCheck tagshare template-haskell + ]; + description = "Functional Enumeration of Algebraic Types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "testing-type-modifiers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -208841,6 +209726,31 @@ self: { license = "GPL"; }) {}; + "texmath_0_8_6_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, network-uri, pandoc-types, parsec, process, split, syb + , temporary, text, utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.8.6.2"; + sha256 = "a9aabd507733c80ae86bcaa7129cf43056904047e27571c65606f158fe0f3b05"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + executableHaskellDepends = [ network-uri ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -211446,16 +212356,13 @@ self: { }: mkDerivation { pname = "time-recurrence"; - version = "0.9.2"; - sha256 = "f5e73d98da00b48422719bc8243809314d1ad92adf6174e0aa91ebfad4ac38ab"; - revision = "1"; - editedCabalFile = "7f1fe44ec61160e3fba86a04942d056ac91faa0002817e107e3d8399b71fe427"; + version = "0.9.3"; + sha256 = "316db4760478346fa0d0081e00be9b73b873ec2b644e3ea6ea28f4175ffd530d"; libraryHaskellDepends = [ base data-ordlist mtl time ]; testHaskellDepends = [ base data-ordlist HUnit mtl old-locale test-framework test-framework-hunit time ]; - jailbreak = true; homepage = "http://github.com/hellertime/time-recurrence"; description = "Generate recurring dates"; license = stdenv.lib.licenses.gpl3; @@ -213282,6 +214189,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "transformers-eff" = callPackage + ({ mkDerivation, base, free, mmorph, pipes, transformers }: + mkDerivation { + pname = "transformers-eff"; + version = "0.1.0.0"; + sha256 = "577f7ce07459239b1039d9f8c2935c02cc55bc585a5a4d21f5a81ac758f20037"; + libraryHaskellDepends = [ base free mmorph pipes transformers ]; + homepage = "https://github.com/ocharles/transformers-eff"; + description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-free" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -216309,6 +217228,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uber" = callPackage + ({ mkDerivation, aeson, base, hspec, text, webapi }: + mkDerivation { + pname = "uber"; + version = "0.1.0.0"; + sha256 = "ab7ecef408cc04b51c1253d5c19274f8e92e974d114b434e48cc7814ecc0da30"; + libraryHaskellDepends = [ aeson base text webapi ]; + testHaskellDepends = [ base hspec text ]; + homepage = "https://github.com/byteally/webapi-uber.git"; + description = "Uber client for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uberlast" = callPackage ({ mkDerivation, base, lens, tagged, template-haskell }: mkDerivation { @@ -217107,6 +218039,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "union_0_1_1_0" = callPackage + ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }: + mkDerivation { + pname = "union"; + version = "0.1.1.0"; + sha256 = "d83b04349288fe9b73c254312da9850e1c05717beb7f8db6f7fefed83f1a82e6"; + libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; + description = "Extensible type-safe unions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "union-find" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { @@ -220499,6 +221443,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-binary-instances_0_2_3_2" = callPackage + ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }: + mkDerivation { + pname = "vector-binary-instances"; + version = "0.2.3.2"; + sha256 = "e42cf4c80a69c6d661c6be152d43b39291fe22e7e55f4694709266692b50e049"; + libraryHaskellDepends = [ base binary vector ]; + testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; + homepage = "https://github.com/bos/vector-binary-instances"; + description = "Instances of Data.Binary and Data.Serialize for vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-buffer" = callPackage ({ mkDerivation, base, deepseq, vector }: mkDerivation { @@ -220939,6 +221897,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.1.4"; sha256 = "a765f8a679d2c59d0ab73d8c158cb020a362ab9e825c845f8202cd11ba660551"; + revision = "1"; + editedCabalFile = "5df99c83217a702f6b8e5c8ecce8f74bbaf0b8a7d90d0764c74aca88221140b8"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -220952,12 +221912,27 @@ self: { pname = "vector-th-unbox"; version = "0.2.1.5"; sha256 = "f5be54bc96d922bb48d3d1b5b127f88477ade064042f9ced4e5f9d74e75b68e0"; + revision = "1"; + editedCabalFile = "88ee583a97da72239a2a931684c4ceab10516f963793858bc553ee0c628c893d"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; + "vector-th-unbox_0_2_1_6" = callPackage + ({ mkDerivation, base, data-default, template-haskell, vector }: + mkDerivation { + pname = "vector-th-unbox"; + version = "0.2.1.6"; + sha256 = "be87d4a6f1005ee2d0de6adf521e05c9e83c441568a8a8b60c79efe24ae90235"; + libraryHaskellDepends = [ base template-haskell vector ]; + testHaskellDepends = [ base data-default vector ]; + description = "Deriver for Data.Vector.Unboxed using Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "verbalexpressions" = callPackage ({ mkDerivation, base, regex-pcre }: mkDerivation { @@ -223420,6 +224395,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-handler-launch_3_0_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, http-types + , process, streaming-commons, transformers, wai, warp + }: + mkDerivation { + pname = "wai-handler-launch"; + version = "3.0.1"; + sha256 = "73cfe38f74f37085e3d8ca355fa32d2773b4d1298ca391fa2678aa956d3f453d"; + libraryHaskellDepends = [ + base blaze-builder bytestring http-types process streaming-commons + transformers wai warp + ]; + description = "Launch a web app in the default browser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-handler-scgi" = callPackage ({ mkDerivation, base, bytestring, wai, wai-extra }: mkDerivation { @@ -226864,8 +227856,8 @@ self: { }: mkDerivation { pname = "webapi"; - version = "0.2.1.0"; - sha256 = "3c3a93a48f25e809601b9f20f16327f7fb730747e441824e53b3b0d83f260233"; + version = "0.2.2.0"; + sha256 = "b908d6b1a03750fa6ef45a2ac445eb9d52afb2fd3de73898081d80a791d843eb"; libraryHaskellDepends = [ aeson base binary blaze-builder bytestring bytestring-lexing bytestring-trie case-insensitive containers cookie exceptions @@ -226876,7 +227868,6 @@ self: { aeson base bytestring case-insensitive hspec hspec-wai http-media http-types QuickCheck text time vector wai wai-extra warp ]; - jailbreak = true; homepage = "http://byteally.github.io/webapi/"; description = "WAI based library for web api"; license = stdenv.lib.licenses.bsd3; @@ -228321,8 +229312,8 @@ self: { ({ mkDerivation, base, categories, constraints, transformers }: mkDerivation { pname = "witness"; - version = "0.3"; - sha256 = "21345b658dfe646b1753658117e92753fa9164259dd426f47825f74857490364"; + version = "0.3.0.1"; + sha256 = "dcff8801b082b6805912ed8924c2ab62175d531d6e68f699419123d987a32851"; libraryHaskellDepends = [ base categories constraints transformers ]; @@ -232203,6 +233194,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xss-sanitize_0_3_5_7" = callPackage + ({ mkDerivation, attoparsec, base, containers, css-text, hspec + , HUnit, network-uri, tagsoup, text, utf8-string + }: + mkDerivation { + pname = "xss-sanitize"; + version = "0.3.5.7"; + sha256 = "955856413e70375c794766d04ac9ab7f0d3337dbb04a412c9b7ff5c415acac00"; + libraryHaskellDepends = [ + attoparsec base containers css-text network-uri tagsoup text + utf8-string + ]; + testHaskellDepends = [ + attoparsec base containers css-text hspec HUnit network-uri tagsoup + text utf8-string + ]; + homepage = "http://github.com/yesodweb/haskell-xss-sanitize"; + description = "sanitize untrusted HTML to prevent XSS attacks"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xtc" = callPackage ({ mkDerivation, base, wx, wxcore }: mkDerivation { @@ -234322,6 +235335,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth-hashdb_1_5" = callPackage + ({ mkDerivation, base, bytestring, cryptohash, hspec, persistent + , pwstore-fast, text, yesod-auth, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth-hashdb"; + version = "1.5"; + sha256 = "396fbe836c291d9d1dce70c18ce39f82671a7e40af3fc743efb14a7faefb7259"; + libraryHaskellDepends = [ + base bytestring cryptohash persistent pwstore-fast text yesod-auth + yesod-core yesod-form yesod-persistent + ]; + testHaskellDepends = [ base hspec text ]; + homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; + description = "Authentication plugin for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-kerberos" = callPackage ({ mkDerivation, authenticate-kerberos, base, bytestring , shakespeare, text, transformers, yesod-auth, yesod-core @@ -237357,8 +238390,8 @@ self: { }: mkDerivation { pname = "yesod-job-queue"; - version = "0.1.0.1"; - sha256 = "6097526e6fe7167ad2a16ecd883515ec8895581075fc5c6fb01ba82c8906b077"; + version = "0.2.0.0"; + sha256 = "42e294394434fcca8ee048a6f6cd365e1979761e24078eb0cc8f090ffcf4070c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 6700ed5f4838a4b8d56ca7a65ca6df34c1c65d50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 Apr 2016 19:20:21 +0200 Subject: [PATCH 171/210] configuration-hackage2nix.yaml: update list of broken builds --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2eb897d799c..e6be3acaf53 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -123,6 +123,9 @@ dont-distribute-packages: Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] XInput: [ i686-linux, x86_64-linux, x86_64-darwin ] + # Depens on shine, which is a ghcjs project. + shine-varying: [ i686-linux, x86_64-linux, x86_64-darwin ] + # The build succeeds, but takes insanely long (> 2 hours). sharc-timbre: [ i686-linux, x86_64-linux, x86_64-darwin ] From 9eb107dc52409c5f438402eadf48b5dcd64da6ac Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 23 Apr 2016 07:31:02 -0500 Subject: [PATCH 172/210] Revert "dbus: 1.8.20 -> 1.10.8" This reverts commit d088e0621e11a03cd50b27863f883fb0f8d3db36. The D-Bus update breaks logind and polkit. (cherry picked from commit 2e06e5eb3669408f5b0fa6c64ac50ca54f8a6ee9) Hydra had rebuilt this on staging, fixing many test problems. There were also phonon changes in these rebuilds, but the amount of binaries affected by them is relatively low and I'm not yet fully convinced of their stability. --- pkgs/development/libraries/dbus/default.nix | 7 +++--- .../dbus/ignore-missing-includedirs.patch | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/dbus/ignore-missing-includedirs.patch diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index dd86ca54081..83635d9739f 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.10.8"; - sha256 = "0560y3hxpgh346w6avcrcz79c8ansmn771y5xpcvvlr6m8mx5wxs"; + version = "1.8.20"; + sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw"; self = stdenv.mkDerivation { name = "dbus-${version}"; @@ -17,7 +17,8 @@ self = stdenv.mkDerivation { inherit sha256; }; - patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + patches = [ ./ignore-missing-includedirs.patch ] + ++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; postPatch = '' substituteInPlace tools/Makefile.in \ --replace 'install-localstatelibDATA:' 'disabled:' \ diff --git a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch new file mode 100644 index 00000000000..2781f4ae3de --- /dev/null +++ b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch @@ -0,0 +1,23 @@ +diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c +--- dbus-1.2.24-orig/bus/config-parser.c 2010-03-23 20:01:27.000000000 +0100 ++++ dbus-1.2.24/bus/config-parser.c 2010-07-20 14:17:20.000000000 +0200 +@@ -2159,12 +2159,16 @@ + + retval = FALSE; + +- dir = _dbus_directory_open (dirname, error); ++ dbus_error_init (&tmp_error); ++ ++ dir = _dbus_directory_open (dirname, &tmp_error); + + if (dir == NULL) +- goto failed; ++ { ++ retval = TRUE; ++ goto failed; ++ } + +- dbus_error_init (&tmp_error); + while (_dbus_directory_get_next_file (dir, &filename, &tmp_error)) + { + DBusString full_path; From cf4a69e2ec73c5abf5812e20a558bf45b9646e56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Apr 2016 20:12:23 +0200 Subject: [PATCH 173/210] haskell-tinc: move the tool into the haskellPackages hierarchy like all other Haskell packages --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../tools/{misc/tinc-haskell => haskell/tinc}/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/tools/{misc/tinc-haskell => haskell/tinc}/default.nix (98%) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 90cef5e92a0..ecae4cb8eb6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1006,4 +1006,8 @@ self: super: { c2hs_0_27_1 = if pkgs.stdenv.isDarwin then dontCheck super.c2hs_0_27_1 else super.c2hs_0_27_1; + + # tinc is a new build driver a la Stack that's not yet available from Hackage. + tinc = self.callPackage ../tools/haskell/tinc {}; + } diff --git a/pkgs/development/tools/misc/tinc-haskell/default.nix b/pkgs/development/tools/haskell/tinc/default.nix similarity index 98% rename from pkgs/development/tools/misc/tinc-haskell/default.nix rename to pkgs/development/tools/haskell/tinc/default.nix index 4efdc909673..44491fa0ef9 100644 --- a/pkgs/development/tools/misc/tinc-haskell/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -6,7 +6,7 @@ , ghc, cabal2nix, cabal-install, makeWrapper }: mkDerivation { - pname = "tinc-haskell"; + pname = "tinc"; version = "20160419"; src = fetchFromGitHub { owner = "sol"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ef9afe98ef..f4de0702e2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6306,8 +6306,6 @@ in texi2html = callPackage ../development/tools/misc/texi2html { }; - tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc-haskell { }; - travis = callPackage ../development/tools/misc/travis { }; tweak = callPackage ../applications/editors/tweak { }; From 68691d31b1376417e7d822d031de1ccb72c4748a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 24 Apr 2016 20:48:27 +0200 Subject: [PATCH 174/210] rsync: fix version typo Typo introduced at c3b4dd920b50d6fd7625ada250d042b47fbd0217; went undetected because the checksum was not changed. Reported by m4t__ on IRC --- pkgs/applications/networking/sync/rsync/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index 86b90ea22ef..a95835610d5 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: rec { - version = "3.2.1"; + version = "3.1.2"; src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; From 8601f6907249f3fbc6128893e0526d96d0f3671b Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sun, 24 Apr 2016 21:51:39 +0200 Subject: [PATCH 175/210] xpra: 0.16.2 -> 0.17.0 --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index ae869cfb1c4..643e4664f71 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -6,11 +6,11 @@ , libfakeXinerama }: buildPythonApplication rec { - name = "xpra-0.16.2"; + name = "xpra-0.17.0"; namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "0h55rv46byzv2g8g77bm0a0py8jpz3gbr5fhr5jy9sisyr0vk6ff"; + sha256 = "0abli2gc174v8zh1dsc3nq8c5aivnni67cjrr8yhsqsl8fwj0c2l"; }; buildInputs = [ From e252e59a1a3a495ed9facb10e143d986ddd2ed64 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Apr 2016 15:32:05 +0200 Subject: [PATCH 176/210] golden-cheetah: fix version format and tarball name --- pkgs/applications/misc/golden-cheetah/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 56b1d2a0029..8d4339516a6 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -2,9 +2,10 @@ , qttools, yacc, flex, zlib, config, qmakeHook, makeQtWrapper }: stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; - version = "V4.0-DEV1603"; + version = "4.0-DEV1603"; src = fetchurl { - url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/${version}.tar.gz"; + name = "${name}.tar.gz"; + url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz"; sha256 = "12knlzqmq8b3nyl3kvcsnzrbjksgd83mzwzj97wccyfiffjl4wah"; }; buildInputs = [ From fe5f52599bff0f7dda5846da68c4dc86fa19b98a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Apr 2016 16:04:25 +0200 Subject: [PATCH 177/210] debian-devscripts: 2.16.3 -> 2.16.4 --- pkgs/tools/misc/debian-devscripts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index edc527484c6..3818b1be134 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.16.3"; + version = "2.16.4"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "0w030zdvcwaxpashdd6zvqgmy89h107p7gvd3lqx9vdy9zv0agd2"; + sha256 = "0hxvxf8fc76lmrf57l9liwx1xjbxk2ldamln8xnwqlg37laxi3v2"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile From 23e3cbeca4331507f4c54a4020b6573d89883480 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sun, 24 Apr 2016 21:56:15 +0200 Subject: [PATCH 178/210] kerberos_server: fix evaluation (closes #14928) --- nixos/modules/services/system/kerberos.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix index 347302c6090..4f2e2fdf662 100644 --- a/nixos/modules/services/system/kerberos.nix +++ b/nixos/modules/services/system/kerberos.nix @@ -4,7 +4,7 @@ let inherit (lib) mkOption mkIf singleton; - inherit (pkgs) heimdal; + inherit (pkgs) heimdalFull; stateDir = "/var/heimdal"; in @@ -33,7 +33,7 @@ in config = mkIf config.services.kerberos_server.enable { - environment.systemPackages = [ heimdal ]; + environment.systemPackages = [ heimdalFull ]; services.xinetd.enable = true; services.xinetd.services = lib.singleton @@ -42,7 +42,7 @@ in protocol = "tcp"; user = "root"; server = "${pkgs.tcp_wrappers}/sbin/tcpd"; - serverArgs = "${pkgs.heimdal}/sbin/kadmind"; + serverArgs = "${pkgs.heimdalFull}/sbin/kadmind"; }; systemd.services.kdc = { @@ -51,13 +51,13 @@ in preStart = '' mkdir -m 0755 -p ${stateDir} ''; - script = "${heimdal}/sbin/kdc"; + script = "${heimdalFull}/sbin/kdc"; }; systemd.services.kpasswdd = { description = "Kerberos Password Changing daemon"; wantedBy = [ "multi-user.target" ]; - script = "${heimdal}/sbin/kpasswdd"; + script = "${heimdalFull}/sbin/kpasswdd"; }; }; From cd6e0814363e3ab5cb221a1dfcc408eee98bff5f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 24 Apr 2016 21:54:54 +0200 Subject: [PATCH 179/210] perl-Math-BigInt: 1.999717 -> 1.999718 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c2c291e0979..a50a6a088de 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7352,10 +7352,10 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999717"; + name = "Math-BigInt-1.999718"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "871c936cbd943b95c5561b82f077cbb1bbb4c85bdae14b668eca985e2a051fb6"; + sha256 = "3edb44123d6c03a4031057f449b41a0d05ebc48d25ad64b08a5fe2f4ae2ac240"; }; meta = { description = "Arbitrary size integer/float math package"; From 620eb5e30855d16028ae68bde1ad438c1bcc2f3c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 24 Apr 2016 21:55:10 +0200 Subject: [PATCH 180/210] perl-Math-BigRat: 0.260802 -> 0.260803 --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a50a6a088de..ca29b937c95 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7377,11 +7377,12 @@ let self = _self // overrides; _self = with self; { }; MathBigRat = buildPerlPackage rec { - name = "Math-BigRat-0.260802"; + name = "Math-BigRat-0.260803"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "1b1ed448c355677bf6403705f8428fee5bdf2bb138a3fe721bf51414c1695508"; + sha256 = "0558fab8ffe0de8751ccfa3bd129d6f34b82cf75454de82b051d4ddffd4ec99b"; }; + propagatedBuildInputs = [ MathBigInt ]; meta = { description = "Arbitrary big rational numbers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 095e57ab76c67f59228e5f16a3c1491aaaedcdc0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 24 Apr 2016 21:55:39 +0200 Subject: [PATCH 181/210] perl-MouseXGetopt: fix Perl 5.22 build Also rename attribute (keeping old as redirect). --- pkgs/top-level/perl-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ca29b937c95..4c8e6f80624 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8222,13 +8222,15 @@ let self = _self // overrides; _self = with self; { }; }; - MouseXGetOpt = buildPerlModule { - name = "mousex-getopt-0.36"; + MouseXGetOpt = self.MouseXGetopt; + + MouseXGetopt = buildPerlModule rec { + name = "MouseX-Getopt-0.36"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.36.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; sha256 = "172ab0609f1638c6d8800d2dff1bdaa044e305aaa2e9b1fbb8a9dc722a3bf430"; }; - buildInputs = [ MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; + buildInputs = [ ModuleBuild Mouse MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; meta = { homepage = https://github.com/gfx/mousex-getopt; From 5d356d58984002b20f40062f139ba0f6a84ea440 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 24 Apr 2016 21:56:34 +0200 Subject: [PATCH 182/210] perl-MooseX-Getopt: 0.68 -> 0.69 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4c8e6f80624..db45322462e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8325,12 +8325,12 @@ let self = _self // overrides; _self = with self; { }; MooseXGetopt = buildPerlPackage rec { - name = "MooseX-Getopt-0.68"; + name = "MooseX-Getopt-0.69"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "acb5118b4666352e58d4268040869d7dc2b68968fe26b5dd6715f51ebd784483"; + sha256 = "0ef348a5edb8aca9a8bf4aff9dbcc2ac4281682fdc65b210b3c87cffd7501308"; }; - buildInputs = [ CPANMeta ModuleBuildTiny ModuleRuntime Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings if_ ]; + buildInputs = [ ModuleBuildTiny Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings self."if" ]; propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized TryTiny namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Getopt; From 6763b27959d4ea8dd1382f2d0fbca99be53d619e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 24 Apr 2016 21:57:46 +0200 Subject: [PATCH 183/210] perl-Pod-Elemental-PerlMunger: 0.200003 -> 0.200005 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index db45322462e..83887a2ff05 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10051,14 +10051,14 @@ let self = _self // overrides; _self = with self; { }; }; - PodElementalPerlMunger = buildPerlPackage { - name = "Pod-Elemental-PerlMunger-0.200003"; + PodElementalPerlMunger = buildPerlPackage rec { + name = "Pod-Elemental-PerlMunger-0.200005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200003.tar.gz; - sha256 = "94b3abe6894c96b7990cb324a3789af05489dc2b5d1ec8961d37309cc6e8c243"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "35146bdcf0d3ac271f9ba2a4d4611b98373215c43de43dd4f012f46c44004d57"; }; buildInputs = [ Moose PodElemental ]; - propagatedBuildInputs = [ ListMoreUtils Moose PPI ParamsUtil PodElemental namespaceautoclean ]; + propagatedBuildInputs = [ Moose PPI PodElemental namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger; description = "A thing that takes a string of Perl and rewrites its documentation"; From 1826c37acae9b6f332b850f95251dc77ebdb6419 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 24 Apr 2016 21:59:09 +0200 Subject: [PATCH 184/210] perl-Role-Tiny: 2.000001 -> 2.000003 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 83887a2ff05..af33ee2f596 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10457,12 +10457,11 @@ let self = _self // overrides; _self = with self; { }; RoleTiny = buildPerlPackage rec { - name = "Role-Tiny-2.000001"; + name = "Role-Tiny-2.000003"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "31883410a7c85d6dc7501c718b1f83edba013a7b9bbccf0338a1033c391f296d"; + sha256 = "6e6c967e1154f290a40c9c60a762cc3b2ec5438107a4fbadddbe55a55b393434"; }; - buildInputs = [ TestFatal ]; meta = { description = "Roles. Like a nouvelle cuisine portion size slice of Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 43ce7ac340d151a32353b487a9a2ca847c27d829 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 24 Apr 2016 21:59:22 +0200 Subject: [PATCH 185/210] perl-Software-License: 0.103011 -> 0.103012 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index af33ee2f596..b5f7f50b8d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10692,10 +10692,10 @@ let self = _self // overrides; _self = with self; { }; SoftwareLicense = buildPerlPackage rec { - name = "Software-License-0.103011"; + name = "Software-License-0.103012"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "03dyc5sx0asq1m3276l224q5776ng24fw5llf3gr9mbgklkgj05s"; + sha256 = "47f9acb7f4eeed35e38c1bec37a71b61e651965233d67dadfae6390571517db1"; }; propagatedBuildInputs = [ DataSection TextTemplate TryTiny ]; meta = { From b3ccc826ee728037aa195bb87c1544f2fea6c475 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 24 Apr 2016 21:59:43 +0200 Subject: [PATCH 186/210] gpsprune: 18.3 -> 18.4 --- pkgs/applications/misc/gpsprune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index a6ea5b054c3..789f2d7c3fa 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gpsprune-${version}"; - version = "18.3"; + version = "18.4"; src = fetchurl { url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "1sas5n4k3afryg3k6y40w39kifs3d0yrnnk46nqp7axs4ay2aqim"; + sha256 = "0wrkvff3c1w66373m2w2ib07rkn3rmbp3n7ixz72qd1swvbk6xx1"; }; phases = [ "installPhase" ]; From 40ea584903d0b68eebb5040c615220567dfc8051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 24 Apr 2016 22:33:30 +0200 Subject: [PATCH 187/210] kodi: 16.0 -> 16.1 --- pkgs/applications/video/kodi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 6b21f0f6516..bca0551c001 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -40,16 +40,16 @@ assert rtmpSupport -> rtmpdump != null; let rel = "Jarvis"; ffmpeg_2_8_6 = fetchurl { - url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.0.tar.gz"; - sha256 = "00cvjwfpz6ladmln4yny4d4viwflrbgrid1na412g5pif70qv3dh"; + url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.1.tar.gz"; + sha256 = "1qp8b97298l2pnhhcp7xczdfwr7q7ibxlk4vp8pfmxli2h272wan"; }; in stdenv.mkDerivation rec { name = "kodi-" + version; - version = "16.0"; + version = "16.1"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884"; + sha256 = "047xpmz78k3d6nhk1x9s8z0bw1b1w9kca46zxkg86p3iyapwi0kx"; }; buildInputs = [ From 693942b61a0007b420a78f268e02d1c14f23fde6 Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Sat, 23 Apr 2016 09:19:49 +0200 Subject: [PATCH 188/210] emacs25pre: 25.0.92 -> 25.0.93 joachifm: also update the name & re-use it in the url --- pkgs/applications/editors/emacs-25/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix index 93baa43abc3..99343624129 100644 --- a/pkgs/applications/editors/emacs-25/default.nix +++ b/pkgs/applications/editors/emacs-25/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { - name = "emacs-25.0.92"; + name = "emacs-25.0.93"; builder = ./builder.sh; src = fetchurl { - url = "ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-25.0.92.tar.xz"; - sha256 = "13jnj1js2l90k4yk219r3z67fff90r6mniprsp0sgip2kaak75y2"; + url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz"; + sha256 = "1wbr2n723ycg16rlg81v9x17w9ciy7qyckxplnwghlyfj6j9k4dk"; }; patches = lib.optionals stdenv.isDarwin [ From ba71263545e7bd4c2b5a280d04621b04407e3c2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Apr 2016 15:09:17 +0200 Subject: [PATCH 189/210] workrave: fix version format and tarball name --- pkgs/applications/misc/workrave/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 045767eb413..f8ec86dd2b3 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -10,11 +10,15 @@ gdome2, gstreamer, libsigcxx }: stdenv.mkDerivation rec { - version = "v1_10_6"; + version = "1.10.6"; name = "workrave-${version}"; - src = fetchurl { - url = "http://github.com/rcaelers/workrave/archive/${version}.tar.gz"; + src = let + version_ = with stdenv.lib; + concatStringsSep "_" (splitString "." version); + in fetchurl { + name = "${name}.tar.gz"; + url = "http://github.com/rcaelers/workrave/archive/v${version_}.tar.gz"; sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq"; }; From bea31c31f269594dc70b33e3d08e4cfad9c22019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20=C5=81asocha?= Date: Mon, 25 Apr 2016 01:55:07 +0200 Subject: [PATCH 190/210] pws: Init at 1.0.6 --- lib/maintainers.nix | 1 + pkgs/tools/misc/pws/Gemfile | 3 +++ pkgs/tools/misc/pws/Gemfile.lock | 19 ++++++++++++++++++ pkgs/tools/misc/pws/default.nix | 33 +++++++++++++++++++++++++++++++ pkgs/tools/misc/pws/gemset.nix | 34 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 92 insertions(+) create mode 100644 pkgs/tools/misc/pws/Gemfile create mode 100644 pkgs/tools/misc/pws/Gemfile.lock create mode 100644 pkgs/tools/misc/pws/default.nix create mode 100644 pkgs/tools/misc/pws/gemset.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 63b79ccab0b..6dad71ad564 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -340,6 +340,7 @@ spwhitt = "Spencer Whitt "; stephenmw = "Stephen Weinberg "; steveej = "Stefan Junker "; + swistak35 = "Rafał Łasocha "; szczyp = "Szczyp "; sztupi = "Attila Sztupak "; taeer = "Taeer Bar-Yam "; diff --git a/pkgs/tools/misc/pws/Gemfile b/pkgs/tools/misc/pws/Gemfile new file mode 100644 index 00000000000..43b6b931860 --- /dev/null +++ b/pkgs/tools/misc/pws/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'pws' diff --git a/pkgs/tools/misc/pws/Gemfile.lock b/pkgs/tools/misc/pws/Gemfile.lock new file mode 100644 index 00000000000..c9cf6a3157c --- /dev/null +++ b/pkgs/tools/misc/pws/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + clipboard (1.0.6) + paint (1.0.1) + pbkdf2-ruby (0.2.1) + pws (1.0.6) + clipboard (~> 1.0.5) + paint (>= 0.8.7) + pbkdf2-ruby + +PLATFORMS + ruby + +DEPENDENCIES + pws + +BUNDLED WITH + 1.11.2 diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix new file mode 100644 index 00000000000..811e57c0a08 --- /dev/null +++ b/pkgs/tools/misc/pws/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, bundlerEnv, ruby, xsel, makeWrapper }: + +stdenv.mkDerivation rec { + name = "pws-1.0.6"; + + env = bundlerEnv { + name = "${name}-gems"; + + inherit ruby; + + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + + buildInputs = [ makeWrapper ]; + + phases = ["installPhase"]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/pws $out/bin/pws \ + --set PATH '"${xsel}/bin/:$PATH"' + ''; + + meta = with lib; { + description = "Command-line password safe"; + homepage = https://github.com/janlelis/pws; + license = licenses.mit; + maintainers = maintainers.swistak35; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/pws/gemset.nix b/pkgs/tools/misc/pws/gemset.nix new file mode 100644 index 00000000000..2aa26f9a020 --- /dev/null +++ b/pkgs/tools/misc/pws/gemset.nix @@ -0,0 +1,34 @@ +{ + clipboard = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11r5xi1fhll4qxna2sg83vmnphjzqc4pzwdnmc5qwvdps5jbz7cq"; + type = "gem"; + }; + version = "1.0.6"; + }; + paint = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z1fqyyc2jiv6yabv467h652cxr2lmxl5gqqg7p14y28kdqf0nhj"; + type = "gem"; + }; + version = "1.0.1"; + }; + pbkdf2-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "014vb5k8klvh192idqrda2571dxsp7ai2v72hj265zd2awy0zyg1"; + type = "gem"; + }; + version = "0.2.1"; + }; + pws = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1brn123mmrw09ji60sa13ylgfjjp7aicz07hm9h0dc3162zlw5wn"; + type = "gem"; + }; + version = "1.0.6"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4de0702e2b..45f937bac19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2930,6 +2930,8 @@ in proxytunnel = callPackage ../tools/misc/proxytunnel { }; + pws = callPackage ../tools/misc/pws { }; + cntlm = callPackage ../tools/networking/cntlm { }; pastebinit = callPackage ../tools/misc/pastebinit { }; From 3db3355c835622123245515cdba65edb274e9e7b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Apr 2016 09:12:24 +0200 Subject: [PATCH 191/210] dosbox: pass mesa explicitly (needed for glu.h) --- pkgs/misc/emulators/dosbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 2525cafc28b..00202f85df7 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, makeDesktopItem }: +{ stdenv, fetchurl, SDL, makeDesktopItem, mesa }: stdenv.mkDerivation rec { name = "dosbox-0.74"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; - buildInputs = [ SDL ]; + buildInputs = [ SDL mesa ]; desktopItem = makeDesktopItem { name = "dosbox"; From 7cf8daa2bbf7e9ac1b57305a22547271dca28a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 25 Apr 2016 11:00:26 +0200 Subject: [PATCH 192/210] nixos: rename chroot* to sandbox* On Nix side this was done months ago: https://github.com/NixOS/nix/pull/682 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- nixos/modules/rename.nix | 4 ++++ nixos/modules/services/misc/nix-daemon.nix | 16 ++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ceea615d5d7..324c5f17f7a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ ###### Things done -- [ ] Tested using sandboxing (`nix-build --option build-use-chroot true` or [nix.useChroot](http://nixos.org/nixos/manual/options.html#opt-nix.useChroot) on NixOS) +- [ ] Tested using sandboxing (`nix-build --option build-use-sandbox true` or [nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS) - Built on platform(s) - [ ] NixOS - [ ] OS X diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 84eccfd5129..6b02446d53b 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -68,6 +68,10 @@ with lib; # proxy (mkRenamedOptionModule [ "nix" "proxy" ] [ "networking" "proxy" "default" ]) + # sandboxing + (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ]) + (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ]) + # KDE (mkRenamedOptionModule [ "kde" "extraPackages" ] [ "environment" "systemPackages" ]) (mkRenamedOptionModule [ "environment" "kdePackages" ] [ "environment" "systemPackages" ]) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 10ac6f93cfd..c84c67ff287 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -24,8 +24,8 @@ let nixConf = let - # If we're using a chroot for builds, then provide /bin/sh in - # the chroot as a bind-mount to bash. This means we also need to + # If we're using sandbox for builds, then provide /bin/sh in + # the sandbox as a bind-mount to bash. This means we also need to # include the entire closure of bash. sh = pkgs.stdenv.shell; binshDeps = pkgs.writeReferencesToFile sh; @@ -39,8 +39,8 @@ let build-users-group = nixbld build-max-jobs = ${toString (cfg.maxJobs)} build-cores = ${toString (cfg.buildCores)} - build-use-chroot = ${if (builtins.isBool cfg.useChroot) then (if cfg.useChroot then "true" else "false") else cfg.useChroot} - build-chroot-dirs = ${toString cfg.chrootDirs} /bin/sh=${sh} $(echo $extraPaths) + build-use-sandbox = ${if (builtins.isBool cfg.useSandbox) then (if cfg.useSandbox then "true" else "false") else cfg.useSandbox} + build-sandbox-paths = ${toString cfg.sandboxPaths} /bin/sh=${sh} $(echo $extraPaths) binary-caches = ${toString cfg.binaryCaches} trusted-binary-caches = ${toString cfg.trustedBinaryCaches} binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys} @@ -98,25 +98,25 @@ in ''; }; - useChroot = mkOption { + useSandbox = mkOption { type = types.either types.bool (types.enum ["relaxed"]); default = false; description = " - If set, Nix will perform builds in a chroot-environment that it + If set, Nix will perform builds in a sandboxed environment that it will set up automatically for each build. This prevents impurities in builds by disallowing access to dependencies outside of the Nix store. "; }; - chrootDirs = mkOption { + sandboxPaths = mkOption { type = types.listOf types.str; default = []; example = [ "/dev" "/proc" ]; description = '' Directories from the host filesystem to be included - in the chroot. + in the sandbox. ''; }; From d1d779fcbc94c7252a95ec0b98dc823d5964585a Mon Sep 17 00:00:00 2001 From: Tiago de Paula Peixoto Date: Mon, 25 Apr 2016 12:37:18 +0200 Subject: [PATCH 193/210] graph-tool: 2.12 -> 2.16 (#14848) * graph-tool: 2.12 -> 2.16 * graph-tool: Use correct upstream source * graph-tool: Use correct hash --- pkgs/development/python-modules/graph-tool/2.x.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index be1592f864f..4f39d1097b1 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -3,7 +3,7 @@ pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, gobjectIntrospection, pygobject3, gtk3, matplotlib }: stdenv.mkDerivation rec { - version = "2.12"; + version = "2.16"; name = "${python.libPrefix}-graph-tool-${version}"; meta = with stdenv.lib; { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://github.com/count0/graph-tool/archive/release-${version}.tar.gz"; - sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl"; + url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; + sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p"; }; configureFlags = [ From ddc401ed0a8c768ee784aff3d50dc97f8ba8e279 Mon Sep 17 00:00:00 2001 From: jraygauthier Date: Mon, 25 Apr 2016 07:16:47 -0400 Subject: [PATCH 194/210] icon-conv-tools: init at 0.0.0 (#13905) A nix specific set of tools for converting icon files that are not in a freedesktop ready format. I plan on using these tools for both `keepass` and `retroarch` packages. It may benifit many other packages. --- .../extractWinRscIconsToStdFreeDesktopDir.sh | 74 +++++++++++++++++++ .../icon-conv-tools/bin/icoFileToHiColorTheme | 28 +++++++ .../build-support/icon-conv-tools/default.nix | 31 ++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 135 insertions(+) create mode 100755 pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh create mode 100755 pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme create mode 100644 pkgs/build-support/icon-conv-tools/default.nix diff --git a/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh new file mode 100755 index 00000000000..994adbd91da --- /dev/null +++ b/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh @@ -0,0 +1,74 @@ +#!/bin/sh + +# The file from which to extract *.ico files or a particular *.ico file. +# (e.g.: './KeePass.exe', './myLibrary.dll', './my/path/to/app.ico'). +# As you notived, the utility can extract icons from a windows executable or +# dll. +rscFile=$1 + +# A regexp that can extract the image size from the file name. Because we +# use 'icotool', this value should usually be set to something like +# '[^\.]+\.exe_[0-9]+_[0-9]+_[0-9]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png'. +# A reg expression may be written at some point that relegate this to +# an implementation detail. +sizeRegex=$2 + +# A regexp replace expression that will be used with 'sizeRegex' to create +# a proper size directory (e.g.: '48x48'). Usually this is left to '\1'. +sizeReplaceExp=$3 + +# A regexp that can extract the name of the target image from the file name +# of the image (usually png) extracted from the *.ico file(s). A good +# default is '([^\.]+).+' which gets the basename without extension. +nameRegex=$4 + +# A regexp replace expression that will be used alongside 'nameRegex' to create +# a icon file name. Note that you usually put directly you icon name here +# without any extension (e.g.: 'my-app'). But in case you've got something +# fancy, it will usually be '\1'. +nameReplaceExp=$5 + +# The +# out=./myOut +out=$6 + +# An optional temp dir. +if [ "" != "$7" ]; then + tmp=$7 + isOwnerOfTmpDir=false +else + tmp=`mktemp -d` + isOwnerOfTmpDir=true +fi + +rm -rf $tmp/png $tmp/ico +mkdir -p $tmp/png $tmp/ico + +# Extract the ressource file's extension. +rscFileExt=`echo "$rscFile" | sed -re 's/.+\.(.+)$/\1/'` + +if [ "ico" = "$rscFileExt" ]; then + cp -p $rscFile $tmp/ico +else + wrestool -x --output=$tmp/ico -t14 $rscFile +fi + +icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico + +mkdir -p $out + +for i in $tmp/png/*.png; do + fn=`basename "$i"` + size=$(echo $fn | sed -re 's/'${sizeRegex}'/'${sizeReplaceExp}'/') + name=$(echo $fn | sed -re 's/'${nameRegex}'/'${nameReplaceExp}'/') + targetDir=$out/share/icons/hicolor/$size/apps + targetFile=$targetDir/$name.png + mkdir -p $targetDir + mv $i $targetFile +done + +rm -rf "$tmp/png" "$tmp/ico" + +if $isOwnerOfTmpDir; then + rm -rf "$tmp" +fi diff --git a/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme b/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme new file mode 100755 index 00000000000..192f3bb54c2 --- /dev/null +++ b/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme @@ -0,0 +1,28 @@ +#!/bin/sh + +SCRIPT_DIR=`cd "$(dirname $0)" && pwd` + +# The '*.ico' file that needs to be converted (e.g.: "./my/path/to/file.ico"). +icoFile="$1" + +# The desired name of created icon files without extension. (e.g.: "my-app"). +targetIconName="$2" + +# The output directory where the free desktop hierarchy will be created. +# (e.g.: "./path/to/my/out" or usually in nix "$out"). Note that the +# whole directory hierarchy to the icon will be created in the specified +# output directory (e.g.: "$out/share/icons/hicolor/48x48/apps/my-app.png"). +out="$3" + +# An optional temp directory location (e.g.: ./tmp). If not specified +# a random '/tmp' directory will be created. +tmp="$4" + +$SCRIPT_DIR/extractWinRscIconsToStdFreeDesktopDir.sh \ + "$icoFile" \ + '[^\.]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png' \ + '\1' \ + '([^\.]+).+' \ + "$targetIconName" \ + "$out" \ + "$tmp" diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix new file mode 100644 index 00000000000..739ec485159 --- /dev/null +++ b/pkgs/build-support/icon-conv-tools/default.nix @@ -0,0 +1,31 @@ +{ stdenv, icoutils }: + +stdenv.mkDerivation { + name = "icon-conv-tools-0.0.0"; + + src = ./.; + + buildInputs = [ icoutils ]; + + patchPhase = '' + substituteInPlace "./bin/extractWinRscIconsToStdFreeDesktopDir.sh" \ + --replace "icotool" "${icoutils}/bin/icotool" \ + --replace "wrestool" "${icoutils}/bin/wrestool" + ''; + + buildPhase = '' + mkdir -p "$out/bin" + cp -p "./bin/"* "$out/bin" + ''; + + installPhase = "true"; + + dontPatchELF = true; + dontStrip = true; + + meta = { + description = "Tools for icon conversion specific to nix package manager"; + maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e634ac0f47..0851c5fb941 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -328,6 +328,8 @@ in useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh; + iconConvTools = callPackage ../build-support/icon-conv-tools {}; + ### TOOLS From 130078a73abb2bf334ba11027ac20c75d43f662e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= Date: Thu, 21 Apr 2016 13:56:20 +0200 Subject: [PATCH 195/210] pythonPackages.repeated_test : init at 0.1a3 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1232f7a58fd..56a42db00ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26588,4 +26588,27 @@ in modules // { maintainers = with maintainers; []; }; }; + + repeated_test = buildPythonPackage rec { + name = "repeated_test-${version}"; + version = "0.1a3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/repeated-test/${name}.tar.gz"; + sha256 = "062syp7kl2g0x6qx3z8zb5sdycpi7qcpxp9iml2v8dqzqnij9bpg"; + }; + + buildInputs = with self; [ + unittest2 + ]; + propagatedBuildInputs = with self; [ + six + ]; + + meta = { + description = "A quick unittest-compatible framework for repeating a test function over many fixtures"; + homepage = "https://github.com/epsy/repeated_test"; + license = licenses.mit; + }; + }; } From f770fe47683f477667b61c921f1eaf8f39388385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= Date: Wed, 20 Apr 2016 07:20:35 +0200 Subject: [PATCH 196/210] pythonPackages.sigtool : init at 1.1a3 --- pkgs/top-level/python-packages.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 56a42db00ca..99d4c911c52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26611,4 +26611,34 @@ in modules // { license = licenses.mit; }; }; + + sigtools = buildPythonPackage rec { + name = "sigtools-${version}"; + version = "1.1a3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/sigtools/${name}.tar.gz"; + sha256 = "190w14vzbiyvxcl9jmyyimpahar5b0bq69v9iv7chi852yi71w6w"; + }; + + buildInputs = with self; [ + repeated_test + sphinx + mock + coverage + unittest2 + ]; + propagatedBuildInputs = with self; [ + funcsigs + six + ]; + + patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py''; + + meta = { + description = "Utilities for working with 3.3's inspect.Signature objects."; + homepage = "https://pypi.python.org/pypi/sigtools"; + license = licenses.mit; + }; + }; } From 21f6437365a16f57ba221ef2b24c8511b7293284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= Date: Wed, 20 Apr 2016 07:21:10 +0200 Subject: [PATCH 197/210] pythonPackages.clize : init at 3.0 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99d4c911c52..8a0f2a34253 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26641,4 +26641,27 @@ in modules // { license = licenses.mit; }; }; + + clize = buildPythonPackage rec { + name = "clize-${version}"; + version = "3.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/clize/${name}.tar.gz"; + sha256 = "1xkr3h404d7pgj5gdpg6bddv3v3yq2hgx8qlwkgw5abg218k53hm"; + }; + + buildInputs = with self; [ + dateutil + ]; + propagatedBuildInputs = with self; [ + sigtools + ]; + + meta = { + description = "Command-line argument parsing for Python"; + homepage = "https://github.com/epsy/clize"; + license = licenses.mit; + }; + }; } From 22e2cfe92bbdb94d2722008c25967a3e9136a3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= Date: Wed, 20 Apr 2016 07:21:36 +0200 Subject: [PATCH 198/210] pythonPackages.zerobin : init at 20160108 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a0f2a34253..304c4932d8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26664,4 +26664,28 @@ in modules // { license = licenses.mit; }; }; + + zerobin = buildPythonPackage rec { + name = "zerobin-${version}"; + version = "20160108"; + + src = pkgs.fetchFromGitHub { + owner = "sametmax"; + repo = "0bin"; + rev = "7da1615"; + sha256 = "1pzcwy454kn5216pvwjqzz311s6jbh7viw9s6kw4xps6f5h44bid"; + }; + + propagatedBuildInputs = with self; [ + cherrypy + bottle + lockfile + clize + ]; + meta = { + description = "A client side encrypted pastebin"; + homepage = "http://0bin.net/"; + license = licenses.wtfpl; + }; + }; } From 201590fd97d44a56ebcc8ac487c6f8899fd3c153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= Date: Wed, 20 Apr 2016 09:32:11 +0200 Subject: [PATCH 199/210] zerobin service : init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/zerobin.nix | 102 ++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 nixos/modules/services/networking/zerobin.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 972802b2341..b238003dd0c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -401,6 +401,7 @@ ./services/networking/wicd.nix ./services/networking/wpa_supplicant.nix ./services/networking/xinetd.nix + ./services/networking/zerobin.nix ./services/networking/zerotierone.nix ./services/networking/znc.nix ./services/printing/cupsd.nix diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix new file mode 100644 index 00000000000..1c524602f8e --- /dev/null +++ b/nixos/modules/services/networking/zerobin.nix @@ -0,0 +1,102 @@ +{ config, pkgs, lib, nodes, ... }: +with lib; +let + cfg = config.services.zerobin; + + zerobin_config = pkgs.writeText "zerobin-config.py" '' + PASTE_FILES_ROOT = "${cfg.dataDir}" + ${cfg.extraConfig} + ''; + +in + { + options = { + services.zerobin = { + enable = mkEnableOption "0bin"; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/zerobin"; + description = '' + Path to the 0bin data directory + ''; + }; + + user = mkOption { + type = types.str; + default = "zerobin"; + description = '' + The user 0bin should run as + ''; + }; + + group = mkOption { + type = types.str; + default = "zerobin"; + description = '' + The group 0bin should run as + ''; + }; + + listenPort = mkOption { + type = types.int; + default = 8000; + example = 1357; + description = '' + The port zerobin should listen on + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "localhost"; + example = "127.0.0.1"; + description = '' + The address zerobin should listen to + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + MENU = ( + ('Home', '/'), + ) + COMPRESSED_STATIC_FILE = True + ''; + description = '' + Extra configuration to be appended to the 0bin config file + (see https://0bin.readthedocs.org/en/latest/en/options.html) + ''; + }; + }; + }; + + config = mkIf (cfg.enable) { + users.users."${cfg.user}" = + if cfg.user == "zerobin" then { + isSystemUser = true; + group = cfg.group; + home = cfg.dataDir; + createHome = true; + } + else {}; + users.groups."${cfg.group}" = {}; + + systemd.services.zerobin = { + enable = true; + after = [ "network-interfaces.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${pkgs.pythonPackages.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}"; + serviceConfig.PrivateTmp="yes"; + serviceConfig.User = cfg.user; + serviceConfig.Group = cfg.group; + preStart = '' + mkdir -p ${cfg.dataDir} + chown ${cfg.user} ${cfg.dataDir} + ''; + }; + }; + } + From 364181b3173c7a8616efc86f374c91cd778b372a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 Apr 2016 13:26:16 +0200 Subject: [PATCH 200/210] fatrace: add patch to fix crash Will be included in next release. --- pkgs/os-specific/linux/fatrace/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index ca864091d4b..5a34eee85e4 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, which }: +{ stdenv, fetchurl, fetchpatch, python3, which }: stdenv.mkDerivation rec { name = "fatrace-${version}"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1f77v222nlfbf8fv7d28cnpm7x8xz0mhxavgz19c2jc51pjlv84s"; }; + patchFlags = "-p0"; + patches = [ + (fetchpatch { + sha256 = "0gym1zg42vb4czpbkz4shnc7z3lskn1ny6dpx10ykwf145xyf9m2"; + name = "fatrace-fix-crash-when-using-p-option.patch"; + url = "http://bazaar.launchpad.net/~pitti/fatrace/trunk/diff/67?context=3"; + }) + ]; + buildInputs = [ python3 which ]; postPatch = '' From 0f479e3016e443a84b156898fd2dd612e3327c93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 Apr 2016 13:32:04 +0200 Subject: [PATCH 201/210] geolite-legacy: 2016-04-19 -> 2016-04-25 --- pkgs/data/misc/geolite-legacy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 79c22354aff..051c7de107d 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; - version = "2016-04-19"; + version = "2016-04-25"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { "11igx6r0fypih5i3f0mrcv044pivnl45mq6pkq81i81cv28hfcn8"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "0xf5ciqclk9pb82kz9zkv15wb8vm32i456jcwkf6rjv18h3wjl74"; + "1b7w8sdazxq5sv3nz1s28420374vf4wn6h2zasbg68kc2cxwdh2w"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "0bgxw4xdkvpwhg7fdillnk8qk14hgld4icvp81d15pz4j0b9jwq9"; + "1iy6myanmx8h4ha493bz80q6wjwgjlbk7cmliyw1806dd7fhqvwi"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; From 0472cc82ea4c4199016732f08a793f49bc3696e2 Mon Sep 17 00:00:00 2001 From: artuuge Date: Sun, 24 Apr 2016 00:14:04 +0200 Subject: [PATCH 202/210] beignet: init at 1.1.2 --- .../libraries/beignet/clang_llvm.patch | 62 +++++++++ .../development/libraries/beignet/default.nix | 123 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++ 3 files changed, 193 insertions(+) create mode 100644 pkgs/development/libraries/beignet/clang_llvm.patch create mode 100644 pkgs/development/libraries/beignet/default.nix diff --git a/pkgs/development/libraries/beignet/clang_llvm.patch b/pkgs/development/libraries/beignet/clang_llvm.patch new file mode 100644 index 00000000000..88876f157cd --- /dev/null +++ b/pkgs/development/libraries/beignet/clang_llvm.patch @@ -0,0 +1,62 @@ +diff --git a/./CMake/FindLLVM.cmake b/../Beignet-1.1.2-Source_new/CMake/FindLLVM.cmake +index a148321..96cafb8 100644 +--- a/./CMake/FindLLVM.cmake ++++ b/../Beignet-1.1.2-Source_new/CMake/FindLLVM.cmake +@@ -22,6 +22,7 @@ if (LLVM_CONFIG_EXECUTABLE) + else (LLVM_CONFIG_EXECUTABLE) + message(FATAL_ERROR "Could NOT find LLVM executable, please add -DLLVM_INSTALL_DIR=/path/to/llvm-config/ in cmake command") + endif (LLVM_CONFIG_EXECUTABLE) ++ + execute_process( + COMMAND ${LLVM_CONFIG_EXECUTABLE} --version + OUTPUT_VARIABLE LLVM_VERSION +@@ -44,10 +45,16 @@ if (LLVM_FIND_VERSION_MAJOR AND LLVM_FIND_VERSION_MINOR) + endif (LLVM_VERSION_NODOT VERSION_LESS LLVM_FIND_VERSION_NODOT) + endif (LLVM_FIND_VERSION_MAJOR AND LLVM_FIND_VERSION_MINOR) + +-if (LLVM_INSTALL_DIR) ++if (CLANG_INSTALL_DIR) + find_program(CLANG_EXECUTABLE + NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang +- PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) ++ PATHS ${CLANG_INSTALL_DIR} NO_DEFAULT_PATH) ++else (CLANG_INSTALL_DIR) ++ find_program(CLANG_EXECUTABLE ++ NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang) ++endif (CLANG_INSTALL_DIR) ++ ++if (LLVM_INSTALL_DIR) + find_program(LLVM_AS_EXECUTABLE + NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as + PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) +@@ -55,8 +62,6 @@ if (LLVM_INSTALL_DIR) + NAMES llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link + PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) + else (LLVM_INSTALL_DIR) +- find_program(CLANG_EXECUTABLE +- NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang) + find_program(LLVM_AS_EXECUTABLE + NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as) + find_program(LLVM_LINK_EXECUTABLE +@@ -105,7 +110,7 @@ endif (LLVM_VERSION_NODOT VERSION_GREATER 34) + macro(add_one_lib name) + FIND_LIBRARY(CLANG_LIB + NAMES ${name} +- PATHS ${LLVM_LIBRARY_DIR} NO_DEFAULT_PATH) ++ PATHS ${CLANG_LIBRARY_DIR} NO_DEFAULT_PATH) + set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB}) + unset(CLANG_LIB CACHE) + endmacro() +diff --git a/./CMakeLists.txt b/../Beignet-1.1.2-Source_new/CMakeLists.txt +index 88985d7..01bca9e 100644 +--- a/./CMakeLists.txt ++++ b/../Beignet-1.1.2-Source_new/CMakeLists.txt +@@ -205,7 +205,7 @@ IF(OCLIcd_FOUND) + "intel-beignet.icd.in" + "${ICD_FILE_NAME}" + ) +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors) ++ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors) + ELSE(OCLIcd_FOUND) + MESSAGE(STATUS "Looking for OCL ICD header file - not found") + ENDIF(OCLIcd_FOUND) diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix new file mode 100644 index 00000000000..5d5c834b4ac --- /dev/null +++ b/pkgs/development/libraries/beignet/default.nix @@ -0,0 +1,123 @@ +{ stdenv +, fetchurl +, cmake +, pkgconfig +, clang-unwrapped +, llvm +, libdrm +, libX11 +, libXfixes +, libpthreadstubs +, libXdmcp +, libXdamage +, libXxf86vm +, python +, gl +, ocl-icd +}: + +stdenv.mkDerivation rec { + name = "beignet-${version}"; + version = "1.1.2"; + + src = fetchurl { + url = "https://01.org/sites/default/files/${name}-source.tar.gz"; + sha256 = "6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96"; + }; + + patches = [ ./clang_llvm.patch ]; + + postPatch = '' + patchShebangs src/git_sha1.sh; + + for f in $(find utests -type f) + do + sed -e "s@isnan(@std::isnan(@g" -i $f + sed -e "s@_std::isnan@_isnan@g" -i $f + + sed -e "s@isinf(@std::isinf(@g" -i $f + sed -e "s@_std::isinf@_isinf@g" -i $f + done + ''; + + configurePhase = '' + cmake . -DCMAKE_INSTALL_PREFIX=$out \ + -DCLANG_LIBRARY_DIR="${clang-unwrapped}/lib" \ + -DLLVM_INSTALL_DIR="${llvm}/bin" \ + -DCLANG_INSTALL_DIR="${clang-unwrapped}/bin" + ''; + + postInstall = '' + mkdir -p $out/utests/kernels + mkdir -p $out/utests/lib + + cp -r kernels $out/utests + cp src/libcl.so $out/utests/lib + + cat > $out/utests/setenv.sh << EOF +#!/bin/sh +export OCL_BITCODE_LIB_PATH=$out/lib/beignet/beignet.bc +export OCL_HEADER_FILE_DIR=$out/lib/beignet/include +export OCL_PCH_PATH=$out/lib/beignet/beignet.pch +export OCL_GBE_PATH=$out/lib/beignet/libgbe.so +export OCL_INTERP_PATH=$out/lib/beignet/libgbeinterp.so +export OCL_KERNEL_PATH=$out/utests/kernels +export OCL_IGNORE_SELF_TEST=1 +EOF + + function fixRunPath { + p0=$(patchelf --print-rpath $1) + p1=$(echo $p0 | sed -e "s@$(pwd)/src@$out/utests/lib@g" -) + p2=$(echo $p1 | sed -e "s@$(pwd)/utests@$out/utests@g" -) + patchelf --set-rpath $p2 $1 + } + + fixRunPath utests/utest_run + fixRunPath utests/libutests.so + + cp utests/utest_run $out/utests + cp utests/libutests.so $out/utests + + mkdir -p $out/bin + ln -s $out/utests/setenv.sh $out/bin/beignet_setenv.sh + ln -s $out/utests/utest_run $out/bin/beignet_utest_run + ''; + + # To run the unit tests, the user must be in "video" group. + # The nix builders are members of only "nixbld" group, so + # they are able to compile the tests, but not to run them. + # To verify the installation, add yourself to "video" group, + # switch to a working directory which has both read and write + # permissions, run: nix-shell -p pkgs.beignet, and execute: + # . beignet_setenv.sh && beignet_utest_run + doCheck = false; + + buildInputs = [ + llvm + clang-unwrapped + cmake + libX11 + pkgconfig + libdrm + gl + libXfixes + libpthreadstubs + libXdmcp + libXdamage + libXxf86vm + python + ocl-icd + ]; + + meta = with stdenv.lib; { + homepage = https://cgit.freedesktop.org/beignet/; + description = "OpenCL Library for Intel Ivy Bridge and newer GPUs"; + longDescription = '' + The package provides an open source implementation of the OpenCL specification for Intel GPUs. + It supports the Intel OpenCL runtime library and compiler. + ''; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0851c5fb941..4c9fcef8710 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6449,6 +6449,14 @@ in beecrypt = callPackage ../development/libraries/beecrypt { }; + beignet = callPackage ../development/libraries/beignet { + inherit (llvmPackages) clang-unwrapped; + inherit (xlibs) libX11; + inherit (xorg) libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; + inherit (python3Packages) python; + inherit (purePackages) gl; + }; + belle-sip = callPackage ../development/libraries/belle-sip { }; bobcat = callPackage ../development/libraries/bobcat { }; From a51da701890fea2d41b58ec1c7142225060f6775 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Mon, 25 Apr 2016 10:15:44 -0300 Subject: [PATCH 203/210] the-powder-toy: 90.2.322 -> 91.3.328 --- pkgs/games/the-powder-toy/default.nix | 4 ++-- pkgs/games/the-powder-toy/fix-env.patch | 23 +++++++++-------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index f79d31c7c5c..14f05f8f1a8 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat }: -let version = "90.2.322"; +let version = "91.3.328"; in stdenv.mkDerivation rec { name = "the-powder-toy-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "simtr"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "1rlxnk8icymalnr3j4bgpklq1dhhs0rpsyjx97isqqcwm2ys03q3"; + sha256 = "0krg4d2m8cnfabm5qq7wr1y53h21i49xjcggzg98xjd0972zvfrk"; }; patches = [ ./fix-env.patch ]; diff --git a/pkgs/games/the-powder-toy/fix-env.patch b/pkgs/games/the-powder-toy/fix-env.patch index 79d2bb2a2e0..b09fd4dcbe9 100644 --- a/pkgs/games/the-powder-toy/fix-env.patch +++ b/pkgs/games/the-powder-toy/fix-env.patch @@ -1,16 +1,11 @@ -diff --git a/SConscript b/SConscript -index fd08935..4d879b2 100644 --- a/SConscript +++ b/SConscript -@@ -93,9 +93,9 @@ if msvc and platform != "Windows": - - #Create SCons Environment - if platform == "Windows" and not GetOption('msvc'): -- env = Environment(tools = ['mingw'], ENV = {'PATH' : os.environ['PATH']}) -+ env = Environment(tools = ['mingw'], ENV = os.environ) - else: -- env = Environment(tools = ['default'], ENV = {'PATH' : os.environ['PATH']}) -+ env = Environment(tools = ['default'], ENV = os.environ) - - #attempt to automatically find cross compiler - if not tool and compilePlatform == "Linux" and compilePlatform != platform: +@@ -99,7 +99,7 @@ + elif platform == "Windows" and not GetOption('msvc'): + env = Environment(tools=['mingw'], ENV={'PATH' : os.environ['PATH']}) + else: +- env = Environment(tools=['default'], ENV={'PATH' : os.environ['PATH']}) ++ env = Environment(tools=['default'], ENV = os.environ) + + #attempt to automatically find cross compiler + if not tool and compilePlatform == "Linux" and compilePlatform != platform: From b6e63fba6deebd3b65b3db0fbcb7f2a18e162f0d Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 25 Apr 2016 01:00:06 -0430 Subject: [PATCH 204/210] phonon : fix configuration paths --- pkgs/development/libraries/phonon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 3c731ca19e3..db4c237c989 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { postPatch = '' sed -i PhononConfig.cmake.in \ -e "/get_filename_component(rootDir/ s/^.*$//" \ - -e "s,\\(set(PHONON_INCLUDE_DIR\\).*$,\\1 \"''${!outputDev}/include\")," \ - -e "s,\\(set(PHONON_LIBRARY_DIR\\).*$,\\1 \"''${!outputLib}/lib\")," \ - -e "s,\\(set(PHONON_BUILDSYSTEM_DIR\\).*$,\\1 \"''${!outputDev}/share/phonon${if withQt5 then "4qt5" else ""}/buildsystem\")," + -e "/^set(PHONON_INCLUDE_DIR/ s,\''${rootDir},''${!outputDev}," \ + -e "/^set(PHONON_LIBRARY_DIR/ s,\''${rootDir}/,," \ + -e "/^set(PHONON_BUILDSYSTEM_DIR/ s,\''${rootDir},''${!outputDev}," ''; } From ecf75f1b4f9d92a632c7903bece848713dcd6185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 25 Apr 2016 15:53:59 +0200 Subject: [PATCH 205/210] perlPackages.EncodeJIS2K: fix build --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b5f7f50b8d3..aed9a82d85b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4433,6 +4433,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.02.tar.gz; sha256 = "5d718add5857f37fc270f24360bc9d100b72e0e13a11ca3149fe4e4d7c7cc4bf"; }; + outputs = [ "out" ]; meta = { }; }; From 1c9234fd6cbd1cd674bed069b2e7190d52e5447f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 25 Apr 2016 16:16:21 +0200 Subject: [PATCH 206/210] foswiki, egypt, wml: fix build --- pkgs/development/tools/analysis/egypt/default.nix | 2 ++ pkgs/development/web/wml/default.nix | 2 ++ pkgs/servers/foswiki/default.nix | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index fc63247468c..572e2f74471 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -9,6 +9,8 @@ buildPerlPackage rec { url = "http://www.gson.org/egypt/download/${name}.tar.gz"; }; + outputs = [ "out" ]; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 22cc5001c92..3d47d32f1c8 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -8,6 +8,8 @@ perlPackages.buildPerlPackage rec { sha256 = "0jjxpq91x7y2mgixz7ghqp01m24qa37wl3zz515rrzv7x8cyy4cf"; }; + setOutputFlags = false; + # Getting lots of Non-ASCII character errors from pod2man. # Inserting =encoding utf8 before the first =head occurrence. # Wasn't able to fix mp4h. diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix index c5831325958..5bfeef6f1fc 100644 --- a/pkgs/servers/foswiki/default.nix +++ b/pkgs/servers/foswiki/default.nix @@ -9,6 +9,8 @@ perlPackages.buildPerlPackage rec { sha256 = "03286pb966h99zgickm2f20rgnqwp9wga5wfkdvirv084kjdh8vp"; }; + outputs = [ "out" ]; + buildInputs = with perlPackages; [ # minimum requirements from INSTALL.html#System_Requirements AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5 @@ -30,7 +32,7 @@ perlPackages.buildPerlPackage rec { # there's even no makefile doCheck = false; - installPhase = ''cp -r . "$out" ''; # TODO: some fixups will be needed for running it + installPhase = ''cp -r . "$out" ''; meta = with stdenv.lib; { description = "An open, programmable collaboration platform"; From 70f5c840af9ecdb57ec97f6c56e5ce1f3939be1a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Apr 2016 14:01:40 +0300 Subject: [PATCH 207/210] nix-daemon service: Don't have the output in the `nix.package' option 1) It unnecessarily exposes implementation details. 2) It breaks all existing configs that have e.g. `nix.package = pkgs.nixUnstable;`. --- nixos/modules/services/misc/nix-daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index c84c67ff287..5400588d027 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -65,8 +65,8 @@ in package = mkOption { type = types.package; - default = pkgs.nix.out; - defaultText = "pkgs.nix.out"; + default = pkgs.nix; + defaultText = "pkgs.nix"; description = '' This option specifies the Nix package instance to use throughout the system. ''; From bee04a37ad9157fa7992b80df53919759b1ebffd Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Apr 2016 14:00:31 +0300 Subject: [PATCH 208/210] amazon-init.nix: Use makeBinPath This also fixes the incorrect use of 'dev' outputs from config.nix.package and pkgs.systemd. --- nixos/modules/virtualisation/amazon-init.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index 886552f33c2..c9356c9b4ea 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -8,7 +8,7 @@ let echo "attempting to fetch configuration from EC2 user data..." - export PATH=${config.nix.package}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH + export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels userData=/etc/ec2-metadata/user-data From 60f5659dad9ee8dc8b55f5ec814cd50cd6a8ca96 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Apr 2016 13:57:19 +0300 Subject: [PATCH 209/210] treewide: Use correct output in ${config.nix.package}/bin --- nixos/lib/make-disk-image.nix | 6 +++--- nixos/modules/installer/cd-dvd/channel.nix | 2 +- nixos/modules/installer/cd-dvd/iso-image.nix | 4 ++-- nixos/modules/installer/cd-dvd/sd-image.nix | 4 ++-- nixos/modules/installer/cd-dvd/system-tarball.nix | 4 ++-- nixos/modules/profiles/docker-container.nix | 4 ++-- nixos/modules/services/misc/nix-gc.nix | 2 +- nixos/modules/services/misc/nix-ssh-serve.nix | 2 +- nixos/modules/virtualisation/azure-image.nix | 4 ++-- nixos/modules/virtualisation/brightbox-image.nix | 4 ++-- nixos/modules/virtualisation/google-compute-image.nix | 4 ++-- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index caf0ab4c07b..63666c99b23 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -81,14 +81,14 @@ pkgs.vmTools.runInLinuxVM ( # Register the paths in the Nix database. printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group "" + chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" # Add missing size/hash fields to the database. FIXME: # exportReferencesGraph should provide these directly. - chroot /mnt ${config.nix.package}/bin/nix-store --verify --check-contents + chroot /mnt ${config.nix.package.out}/bin/nix-store --verify --check-contents # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package}/bin/nix-env --option build-users-group "" \ + chroot /mnt ${config.nix.package.out}/bin/nix-env --option build-users-group "" \ -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} # `nixos-rebuild' requires an /etc/NIXOS. diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 1e5e2b2615c..cd6e72755de 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -34,7 +34,7 @@ in if ! [ -e /var/lib/nixos/did-channel-init ]; then echo "unpacking the NixOS/Nixpkgs sources..." mkdir -p /nix/var/nix/profiles/per-user/root - ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \ + ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \ -i ${channelSources} --quiet --option build-use-substitutes false mkdir -m 0700 -p /root/.nix-defexpr ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 5702e2d9a1e..c31ded977e6 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -364,12 +364,12 @@ in '' # After booting, register the contents of the Nix store on the # CD in the Nix database in the tmpfs. - ${config.nix.package}/bin/nix-store --load-db < /nix/store/nix-path-registration + ${config.nix.package.out}/bin/nix-store --load-db < /nix/store/nix-path-registration # nixos-rebuild also requires a "system" profile and an # /etc/NIXOS tag. touch /etc/NIXOS - ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system + ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; # Add vfat support to the initrd to enable people to copy the diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 9eba542d8c9..23312c073d5 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -113,11 +113,11 @@ in ${pkgs.e2fsprogs}/bin/resize2fs $rootPart # Register the contents of the initial Nix store - ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration + ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration # nixos-rebuild also requires a "system" profile and an /etc/NIXOS tag. touch /etc/NIXOS - ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system + ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system # Prevents this from running on later boots. rm -f /nix-path-registration diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix index 90e9b98a457..1962a1959ea 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball.nix @@ -78,14 +78,14 @@ in # After booting, register the contents of the Nix store on the # CD in the Nix database in the tmpfs. if [ -f /nix-path-registration ]; then - ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration && + ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration && rm /nix-path-registration fi # nixos-rebuild also requires a "system" profile and an # /etc/NIXOS tag. touch /etc/NIXOS - ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system + ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; }; diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix index df762b7ac58..433492b9613 100644 --- a/nixos/modules/profiles/docker-container.nix +++ b/nixos/modules/profiles/docker-container.nix @@ -37,12 +37,12 @@ in { # After booting, register the contents of the Nix store in the Nix # database. if [ -f /nix-path-registration ]; then - ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration && + ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration && rm /nix-path-registration fi # nixos-rebuild also requires a "system" profile - ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system + ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; # Install new init script diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 6a7a7f4cee7..5c13da6e83d 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -52,7 +52,7 @@ in systemd.services.nix-gc = { description = "Nix Garbage Collector"; - script = "exec ${config.nix.package}/bin/nix-collect-garbage ${cfg.options}"; + script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}"; startAt = optionalString cfg.automatic cfg.dates; }; diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index d70bd855c7f..66148431709 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -41,7 +41,7 @@ with lib; PermitTTY no PermitTunnel no X11Forwarding no - ForceCommand ${config.nix.package}/bin/nix-store --serve + ForceCommand ${config.nix.package.out}/bin/nix-store --serve Match All ''; diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 9dc0ce11992..9fac543b03d 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -62,10 +62,10 @@ in echo Register the paths in the Nix database. printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group "" + chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" echo Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package}/bin/nix-env \ + chroot /mnt ${config.nix.package.out}/bin/nix-env \ -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} --option build-users-group "" echo nixos-rebuild requires an /etc/NIXOS. diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index b6b2bd4f69b..bcafc06e47c 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -62,10 +62,10 @@ in # Register the paths in the Nix database. printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group "" + chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package}/bin/nix-env \ + chroot /mnt ${config.nix.package.out}/bin/nix-env \ -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \ --option build-users-group "" diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 77074b88246..38417315df5 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -66,10 +66,10 @@ in # Register the paths in the Nix database. printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group "" + chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package}/bin/nix-env \ + chroot /mnt ${config.nix.package.out}/bin/nix-env \ -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \ --option build-users-group "" diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index d9b866d2e55..8aa64368755 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -403,7 +403,7 @@ in boot.postBootCommands = '' if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then - ${config.nix.package}/bin/nix-store --load-db < ''${BASH_REMATCH[1]} + ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]} fi ''; From 1d4b21ef42a41fcecc254f61f279ad306f41e6b3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Apr 2016 14:06:04 +0300 Subject: [PATCH 210/210] treewide: Use correct output of config.nix.package in non-string contexts --- nixos/modules/installer/tools/auto-upgrade.nix | 2 +- nixos/modules/installer/tools/nixos-rebuild.sh | 2 +- nixos/modules/installer/tools/tools.nix | 6 +++--- nixos/modules/services/misc/nix-daemon.nix | 2 +- nixos/modules/services/networking/nix-serve.nix | 2 +- nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix index 79ccb5c3d18..b21b80c666a 100644 --- a/nixos/modules/installer/tools/auto-upgrade.nix +++ b/nixos/modules/installer/tools/auto-upgrade.nix @@ -78,7 +78,7 @@ let cfg = config.system.autoUpgrade; in HOME = "/root"; }; - path = [ pkgs.gnutar pkgs.xz.bin config.nix.package ]; + path = [ pkgs.gnutar pkgs.xz.bin config.nix.package.out ]; script = '' ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags} diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index cd30958d9e8..5ecdcdb3cdb 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -271,7 +271,7 @@ remotePATH= if [ -n "$buildNix" ]; then echo "building Nix..." >&2 nixDrv= - if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then + if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then nixStorePath="$(prebuiltNix "$(uname -m)")" diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 9ac3b7a5b16..b8fd9deaf1e 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -22,17 +22,17 @@ let src = ./nixos-install.sh; inherit (pkgs) perl pathsFromGraph; - nix = config.nix.package; + nix = config.nix.package.out; nixClosure = pkgs.runCommand "closure" - { exportReferencesGraph = ["refs" config.nix.package]; } + { exportReferencesGraph = ["refs" config.nix.package.out]; } "cp refs $out"; }; nixos-rebuild = makeProg { name = "nixos-rebuild"; src = ./nixos-rebuild.sh; - nix = config.nix.package; + nix = config.nix.package.out; }; nixos-generate-config = makeProg { diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 5400588d027..d71837737ab 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -6,7 +6,7 @@ let cfg = config.nix; - nix = cfg.package; + nix = cfg.package.out; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 8f6881441cf..3e865e3b76a 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -50,7 +50,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ config.nix.package pkgs.bzip2.bin ]; + path = [ config.nix.package.out pkgs.bzip2.bin ]; environment.NIX_REMOTE = "daemon"; environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile; diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix index 6c201eb8212..69ad2c6d44f 100644 --- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix +++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix @@ -14,7 +14,7 @@ let inherit (pkgs) python gummiboot; - nix = config.nix.package; + nix = config.nix.package.out; timeout = if cfg.timeout != null then cfg.timeout else "";