diff options
165 files changed, 2577 insertions, 2052 deletions
diff --git a/doc/default.nix b/doc/default.nix index 0d95d3f04573..f99aaff5f8a6 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -44,5 +44,6 @@ pkgs.stdenv.mkDerivation { mkdir -p $out/nix-support/ echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products + echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products ''; } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e11e7edcc691..50ac45adc252 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -562,6 +562,11 @@ github = "basvandijk"; name = "Bas van Dijk"; }; + bbarker = { + email = "brandon.barker@gmail.com"; + github = "bbarker"; + name = "Brandon Elam Barker"; + }; bcarrell = { email = "brandoncarrell@gmail.com"; github = "bcarrell"; @@ -2176,6 +2181,11 @@ github = "limeytexan"; name = "Michael Brantley"; }; + linc01n = { + email = "git@lincoln.hk"; + github = "linc01n"; + name = "Lincoln Lee"; + }; linquize = { email = "linquize@yahoo.com.hk"; github = "linquize"; @@ -2289,6 +2299,11 @@ github = "madjar"; name = "Georges Dubus"; }; + mafo = { + email = "Marc.Fontaine@gmx.de"; + github = "MarcFontaine"; + name = "Marc Fontaine"; + }; magnetophon = { email = "bart@magnetophon.nl"; github = "magnetophon"; @@ -3950,6 +3965,11 @@ github = "uralbash"; name = "Svintsov Dmitry"; }; + uri-canva = { + email = "uri@canva.com"; + github = "uri-canva"; + name = "Uri Baghin"; + }; utdemir = { email = "me@utdemir.com"; github = "utdemir"; diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 6502aaec83e5..f4d697c42dbd 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -67,6 +67,57 @@ nixpkgs.config.packageOverrides = pkgs: parameters, run <command>sysctl -a</command>. </para> <section> + <title>Customize your kernel</title> + + <para> + The first step before compiling the kernel is to generate an appropriate + <literal>.config</literal> configuration. Either you pass your own config via + the <literal>configfile</literal> setting of <literal>linuxManualConfig</literal>: + <screen><![CDATA[ + custom-kernel = super.linuxManualConfig { + inherit (super) stdenv hostPlatform; + inherit (linux_4_9) src; + version = "${linux_4_9.version}-custom"; + + configfile = /home/me/my_kernel_config; + allowImportFromDerivation = true; + }; + ]]></screen> + +You can edit the config with this snippet (by default <command>make menuconfig</command> won't work + out of the box on nixos): + <screen><![CDATA[ + nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})' + ]]></screen> + + + or you can let nixpkgs generate the configuration. + Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>. + The answers depend on parameters passed to <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> + (which you can influence by overriding <literal>extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig</literal>). +<screen><![CDATA[ + + mptcp93.override ({ + name="mptcp-local"; + + ignoreConfigErrors = true; + autoModules = false; + kernelPreferBuiltin = true; + + enableParallelBuilding = true; + + extraConfig = '' + DEBUG_KERNEL y + FRAME_POINTER y + KGDB y + KGDB_SERIAL_CONSOLE y + DEBUG_INFO y + ''; + }); + ]]></screen> + </para> + </section> + <section> <title>Developing kernel modules</title> <para> diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 429ce09ea68f..0ee105e4c6f1 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -130,11 +130,13 @@ in default = false; description = " 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. This isn't enabled by default for - performance. It doesn't affect derivation hashes, so changing - this option will not trigger a rebuild of packages. + will set up automatically for each build. This prevents impurities + in builds by disallowing access to dependencies outside of the Nix + store by using network and mount namespaces in a chroot environment. + This isn't enabled by default for possible performance impacts due to + the initial setup time of a sandbox for each build. It doesn't affect + derivation hashes, so changing this option will not trigger a rebuild + of packages. "; }; diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index 843f0d986877..7ead33483ea4 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -85,7 +85,7 @@ in ''; serviceConfig = { PermissionsStartOnly = true; - ExecStart = "${cfg.package}/bin/minio server --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}"; + ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}"; Type = "simple"; User = "minio"; Group = "minio"; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 989764874c48..66b253c230f1 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -88,12 +88,14 @@ in rec { (all nixos.tests.env) (all nixos.tests.ipv6) (all nixos.tests.i3wm) - (all nixos.tests.keymap.azerty) - (all nixos.tests.keymap.colemak) - (all nixos.tests.keymap.dvorak) - (all nixos.tests.keymap.dvp) - (all nixos.tests.keymap.neo) - (all nixos.tests.keymap.qwertz) + # 2018-06-06: keymap tests temporarily removed from tested job + # since non-deterministic failure are blocking the channel (#41538) + #(all nixos.tests.keymap.azerty) + #(all nixos.tests.keymap.colemak) + #(all nixos.tests.keymap.dvorak) + #(all nixos.tests.keymap.dvp) + #(all nixos.tests.keymap.neo) + #(all nixos.tests.keymap.qwertz) (all nixos.tests.plasma5) #(all nixos.tests.lightdm) (all nixos.tests.login) diff --git a/nixos/release.nix b/nixos/release.nix index 8777d85c5d46..d2eaa22dc6fc 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -305,6 +305,7 @@ in rec { tests.home-assistant = callTest tests/home-assistant.nix { }; tests.hound = callTest tests/hound.nix {}; tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {}; + tests.hydra = callTest tests/hydra {}; tests.i3wm = callTest tests/i3wm.nix {}; tests.iftop = callTest tests/iftop.nix {}; tests.initrd-network-ssh = callTest tests/initrd-network-ssh {}; diff --git a/nixos/tests/hydra.nix b/nixos/tests/hydra.nix deleted file mode 100644 index 6abd7a5ad300..000000000000 --- a/nixos/tests/hydra.nix +++ /dev/null @@ -1,32 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "hydra-init-localdb"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ pstn ]; - }; - - machine = - { config, pkgs, ... }: - - { - services.hydra = { - enable = true; - - #Hydra needs those settings to start up, so we add something not harmfull. - hydraURL = "example.com"; - notificationSender = "example@example.com"; - }; - }; - - testScript = - '' - # let the system boot up - $machine->waitForUnit("multi-user.target"); - # test whether the database is running - $machine->succeed("systemctl status postgresql.service"); - # test whether the actual hydra daemons are running - $machine->succeed("systemctl status hydra-queue-runner.service"); - $machine->succeed("systemctl status hydra-init.service"); - $machine->succeed("systemctl status hydra-evaluator.service"); - $machine->succeed("systemctl status hydra-send-stats.service"); - ''; -}) diff --git a/nixos/tests/hydra/create-trivial-project.sh b/nixos/tests/hydra/create-trivial-project.sh new file mode 100755 index 000000000000..3cca5665acc5 --- /dev/null +++ b/nixos/tests/hydra/create-trivial-project.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env bash +# +# This script creates a project, a jobset with an input of type local +# path. This local path is a directory that contains a Nix expression +# to define a job. +# The EXPR-PATH environment variable must be set with the local path. + +set -e + +URL=http://localhost:3000 +USERNAME="admin" +PASSWORD="admin" +PROJECT_NAME="trivial" +JOBSET_NAME="trivial" +EXPR_PATH=${EXPR_PATH:-} + +if [ -z $EXPR_PATH ]; then + echo "Environment variable EXPR_PATH must be set" + exit 1 +fi + +mycurl() { + curl --referer $URL -H "Accept: application/json" -H "Content-Type: application/json" $@ +} + +cat >data.json <<EOF +{ "username": "$USERNAME", "password": "$PASSWORD" } +EOF +mycurl -X POST -d '@data.json' $URL/login -c hydra-cookie.txt + +cat >data.json <<EOF +{ + "displayname":"Trivial", + "enabled":"1" +} +EOF +mycurl --silent -X PUT $URL/project/$PROJECT_NAME -d @data.json -b hydra-cookie.txt + +cat >data.json <<EOF +{ + "description": "Trivial", + "checkinterval": "60", + "enabled": "1", + "visible": "1", + "keepnr": "1", + "nixexprinput": "trivial", + "nixexprpath": "trivial.nix", + "inputs": { + "trivial": { + "value": "$EXPR_PATH", + "type": "path" + } + } +} +EOF +mycurl --silent -X PUT $URL/jobset/$PROJECT_NAME/$JOBSET_NAME -d @data.json -b hydra-cookie.txt diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix new file mode 100644 index 000000000000..74919444c16d --- /dev/null +++ b/nixos/tests/hydra/default.nix @@ -0,0 +1,78 @@ +import ../make-test.nix ({ pkgs, ...} : + +let + trivialJob = pkgs.writeTextDir "trivial.nix" '' + with import <nix/config.nix>; + + { trivial = builtins.derivation { + name = "trivial"; + system = "x86_64-linux"; + PATH = coreutils; + builder = shell; + args = ["-c" "touch $out; exit 0"]; + }; + } + ''; + + createTrivialProject = pkgs.stdenv.mkDerivation { + name = "create-trivial-project"; + unpackPhase = ":"; + buildInputs = [ pkgs.makeWrapper ]; + installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; + postFixup = '' + wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} + ''; + }; + +in { + name = "hydra-init-localdb"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ pstn lewo ]; + }; + + machine = + { config, pkgs, ... }: + + { + virtualisation.memorySize = 1024; + time.timeZone = "UTC"; + + environment.systemPackages = [ createTrivialProject pkgs.jq ]; + services.hydra = { + enable = true; + + #Hydra needs those settings to start up, so we add something not harmfull. + hydraURL = "example.com"; + notificationSender = "example@example.com"; + }; + nix = { + buildMachines = [{ + hostName = "localhost"; + systems = [ "x86_64-linux" ]; + }]; + }; + }; + + testScript = + '' + # let the system boot up + $machine->waitForUnit("multi-user.target"); + # test whether the database is running + $machine->succeed("systemctl status postgresql.service"); + # test whether the actual hydra daemons are running + $machine->succeed("systemctl status hydra-queue-runner.service"); + $machine->succeed("systemctl status hydra-init.service"); + $machine->succeed("systemctl status hydra-evaluator.service"); + $machine->succeed("systemctl status hydra-send-stats.service"); + + $machine->succeed("hydra-create-user admin --role admin --password admin"); + + # create a project with a trivial job + $machine->waitForOpenPort(3000); + + # make sure the build as been successfully built + $machine->succeed("create-trivial-project.sh"); + + $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'); + ''; +}) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 9915e0a301a1..1a0e77dc12f1 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -85,7 +85,6 @@ rec { }; parity = callPackage ./parity { }; - parity-beta = callPackage ./parity/beta.nix { }; parity-ui = callPackage ./parity-ui { }; particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; }; diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix deleted file mode 100644 index 9cbab6ad0955..000000000000 --- a/pkgs/applications/altcoins/parity/beta.nix +++ /dev/null @@ -1,7 +0,0 @@ -let - version = "1.10.2"; - sha256 = "1a1rbwlwi60nfv6m1rdy5baq5lcafc8nw96y45pr1674i48gkp0l"; - cargoSha256 = "0l3rjkinzppfq8fi8h24r35rb552fzzman5a6yk33wlsdj2lv7yh"; - patches = [ ./patches/vendored-sources-1.10.patch ]; -in - import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index d85fc25355c8..3ba2495d45a2 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.9.7"; - sha256 = "1h9rmyqkdv2v83g12dadgqflq1n1qqgd5hrpy20ajha0qpbiv3ph"; - cargoSha256 = "0ss5jw43850r8l34prai5vk1zd5d5fjyg4rcav1asbq6v683bww0"; - patches = [ ./patches/vendored-sources-1.9.patch ]; + version = "1.10.6"; + sha256 = "1x2sm262z8fdkx8zin6r8nwbb7znziw9nm224pr6ap3p0jmv7fcq"; + cargoSha256 = "1wf1lh32f9dlhv810gdcssv92g1yximx09lw63m0mxcjbn9813bs"; + patches = [ ./patches/vendored-sources-1.10.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch deleted file mode 100644 index 3e1ba2429f2d..000000000000 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/.cargo/config b/.cargo/config -new file mode 100644 -index 000000000..0efb69724 ---- /dev/null -+++ b/.cargo/config -@@ -0,0 +1,94 @@ -+[source."https://github.com/alexcrichton/mio-named-pipes"] -+git = "https://github.com/alexcrichton/mio-named-pipes" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"] -+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"] -+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/nikvolf/parity-tokio-ipc"] -+git = "https://github.com/nikvolf/parity-tokio-ipc" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/nikvolf/tokio-named-pipes"] -+git = "https://github.com/nikvolf/tokio-named-pipes" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/app-dirs-rs"] -+git = "https://github.com/paritytech/app-dirs-rs" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/bn"] -+git = "https://github.com/paritytech/bn" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/hidapi-rs"] -+git = "https://github.com/paritytech/hidapi-rs" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/hyper"] -+git = "https://github.com/paritytech/hyper" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/jsonrpc.git"] -+git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.9" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/libusb-rs"] -+git = "https://github.com/paritytech/libusb-rs" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/libusb-sys"] -+git = "https://github.com/paritytech/libusb-sys" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-ctrlc.git"] -+git = "https://github.com/paritytech/rust-ctrlc.git" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-rocksdb"] -+git = "https://github.com/paritytech/rust-rocksdb" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-secp256k1"] -+git = "https://github.com/paritytech/rust-secp256k1" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-snappy"] -+git = "https://github.com/paritytech/rust-snappy" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/trezor-sys"] -+git = "https://github.com/paritytech/trezor-sys" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/tailhook/rotor"] -+git = "https://github.com/tailhook/rotor" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/tomusdrw/ws-rs"] -+git = "https://github.com/tomusdrw/ws-rs" -+branch = "master" -+replace-with = "vendored-sources" -+ diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix new file mode 100644 index 000000000000..293d1b0b6c82 --- /dev/null +++ b/pkgs/applications/audio/midas/generic.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, sha256, ... }: +stdenv.mkDerivation rec { + inherit type; + baseName = "${type}-Edit"; + name = "${lib.toLower baseName}-${version}"; + + src = fetchurl { + url = "http://downloads.music-group.com/software/behringer/${type}/${type}-Edit_LINUX_64bit_${version}.tar.gz"; + inherit sha256; + }; + + sourceRoot = "."; + dontBuild = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin + cp ${baseName} $out/bin + ''; + preFixup = let + # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation + libPath = lib.makeLibraryPath [ + libX11 # libX11.so.6 + libXext # libXext.so.6 + alsaLib # libasound.so.2 + freetype # libfreetype.so.6 + stdenv.cc.cc.lib # libstdc++.so.6 + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + $out/bin/${baseName} + ''; + + meta = with stdenv.lib; { + inherit homepage; + description = "Editor for the ${brand} ${type} digital mixer"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = [ maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/midas/m32edit.nix b/pkgs/applications/audio/midas/m32edit.nix new file mode 100644 index 000000000000..c8a751c235b1 --- /dev/null +++ b/pkgs/applications/audio/midas/m32edit.nix @@ -0,0 +1,9 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + brand = "Midas"; + type = "M32"; + version = "3.2"; + sha256 = "1cds6qinz37086l6pmmgrzrxadygjr2z96sjjyznnai2wz4z2nrd"; + homepage = http://www.musictri.be/Categories/Midas/Mixers/Digital/M32/p/P0B3I/downloads; +}) diff --git a/pkgs/applications/audio/midas/x32edit.nix b/pkgs/applications/audio/midas/x32edit.nix new file mode 100644 index 000000000000..4aacfcc89a36 --- /dev/null +++ b/pkgs/applications/audio/midas/x32edit.nix @@ -0,0 +1,9 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + brand = "Behringer"; + type = "X32"; + version = "3.2"; + sha256 = "1lzmhd0sqnlzc0khpwm82sfi48qhv7rg153a57qjih7hhhy41mzk"; + homepage = http://www.musictri.be/Categories/Behringer/Mixers/Digital/X32/p/P0ASF/downloads; +}) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index e2218f477a59..dc12baefed14 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.2.1"; + name = "qmmp-1.2.2"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "1ag8wh11dq394zjqdyz5g1srjnm4fnq4cwlhpb9k89gpmlk42cdr"; + sha256 = "01nnyg8m3p3px1fj3lfsqqv9zh1388dwx1bm2qv4v87jywimgp79"; }; buildInputs = diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 972da4f773f6..e7073d0c95e9 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -9,7 +9,7 @@ let optionals = stdenv.lib.optionals; in python3.pkgs.buildPythonApplication rec { name = "quodlibet${tag}-${version}"; - version = "4.0.2"; + version = "4.1.0"; # XXX, tests fail # https://github.com/quodlibet/quodlibet/issues/2820 @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchurl { url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; - sha256 = "072s983p3n84yl807pbdxsy5vrgs8jzzfl648gsri6kpwsp6w5fz"; + sha256 = "1vcxx4sz5i4ag74pjpdfw7jkwxfb8jhvn8igcjwd5cccw4gscm2z"; }; nativeBuildInputs = [ wrapGAppsHook gettext intltool ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 339a1ce7c6f1..5e37ba47fa5f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,14 +8,14 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.1.2.0"; # "Android Studio 3.1.2" - build = "173.4720617"; - sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk"; + version = "3.1.3.0"; # "Android Studio 3.1.3" + build = "173.4819257"; + sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq"; }; latestVersion = { - version = "3.2.0.15"; # "Android Studio 3.2 Canary 16" - build = "181.4802120"; - sha256Hash = "0ch9jjq58k83dpnq65xyxchyik24w3fmh2v9q3kx1s028iavmpym"; + version = "3.2.0.16"; # "Android Studio 3.2 Canary 17" + build = "181.4823740"; + sha256Hash = "04282zd28kn2a4rjsi0ikx4bc9ab668xm7cc87ga60pzyg5gmmgk"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index f80a14c1e0f3..a68c841d53bc 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -63,7 +63,7 @@ in stdenv.lib.mapAttrs common { }; atom-beta = { - version = "1.28.0-beta2"; - sha256 = "0fc9j1l776hv057dirw2bv9wmvhcaba5c4nq1cgs5rb5whxir2n6"; + version = "1.28.0-beta3"; + sha256 = "07mmzkbc7xzcwh6ylrs2w1g3l5gmyfk0gdmr2kzr6jdr00cq73y0"; }; } diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 6f998300290a..6b10766bedb7 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo }: +# Use "emacsMelpa.haskell-mode" instead. + let version = "13.14-169-g0d3569d"; # git describe --tags in @@ -35,5 +37,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; + broken = true; # no longer compiles and this package is obsolete anyway }; } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 8064ffeb7f55..f6c446da35d1 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -237,12 +237,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.1.2"; /* updated by script */ + version = "2018.1.3"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "158ydbr0bbzm1nqi4xhrcp6bwk7kmiw78v959h7bxg3y7z55hbwa"; /* updated by script */ + sha256 = "0daj1ha7d9kxgb60mx2yzyj01m6ahw5d6wzs0vvwp5fh5qf4mpw5"; }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 29de230d38c7..4b1d26742d69 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.23.1"; + version = "1.24.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0vqaxyg6r6mfm1gz8j7wxgg426hjsmv2ybyi8rfjcm9s8d23y9n6"; - "x86_64-linux" = "0zycl8zqf5yiqq6k6mr28a20yg37whb8iw527pavvm74knzx3lgk"; - "x86_64-darwin" = "03r2cvim7swq1fjxh6m9f7rifww3hddnyzpzniqb5132nnq4mrmc"; + "i686-linux" = "17dvyp31kf12mfs6z3cm8rxfrvrmbrk9gbsk3z7v284z64dry9vz"; + "x86_64-linux" = "11m50lb0hvnmvb3qdixgpvdzcljzm94qxl41240g4qh4a36qvr1j"; + "x86_64-darwin" = "1wm6h3f8b33rky5nlrvwx4qx0k9h72aabiz6sm27x1wrs486p3lf"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 630834fc9e99..120fc1174cdf 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, - pkgconfig, python2Packages, scons, swig, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobjectIntrospection, hicolor-icon-theme +, gdk_pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }: let inherit (python2Packages) python pycairo pygobject3 numpy; @@ -15,9 +15,14 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ intltool pkgconfig scons swig wrapGAppsHook ]; + nativeBuildInputs = [ + intltool pkgconfig scons swig wrapGAppsHook + gobjectIntrospection # for setup hook + ]; - buildInputs = [ gtk3 json_c lcms2 libpng librsvg pycairo pygobject3 python ]; + buildInputs = [ + gtk3 gdk_pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme + ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index cb2121553ace..70d457028292 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "29.0.0.171"; + version = "30.0.0.113"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1j7w81wjfrpkir11m719jdahnbnw4sph448hs90hvai6rsn3imib"; + sha256 = "0bcsrsz2dd12xs9vn2977k4s6hag1cknkrsgxz3c9pxk4jz99f3k"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 6c19b684aaa5..507697f0c2c3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,25 +73,25 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "29.0.0.171"; + version = "30.0.0.113"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_npapi_linux_debug.${arch}.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_npapi_linux_debug.${arch}.tar.gz" else "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; sha256 = if debug then if arch == "x86_64" then - "140galarr38lmfnd2chl2msvxizx96kdi000gbikir9xnd7bx1hc" + "1s4i9lmlydm8b373pi8jw5xf3fhcq75fgqyp7xd7aava8hay7x0j" else - "0wzmf12xrmyq8vqqyii932yx4nadrvkn2j9s86xcw67lb40xj5ig" + "1jhzvrn6f9zcynx3zq0vxidaps946aymm7l16c42p1f7q9s8msb4" else if arch == "x86_64" then - "17c57xgs0w71p4xsjw5an7dg484769wanq3kx86ppaqw8vqhnqc3" + "05dv4cn9i3zz5fmy16dxs9m1rpvlaih4gzsrf0q1zfjn46jbyw2l" else - "06pjbc9050fgi2njzf9vm6py7c22i6chw852rbm8flx3cmplw23b"; + "0pn159rzx6nb6lmkghccl0ynnc9ihfbr4rvfp14gm4n6jzbl6vg8"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index fa9c89b442bb..8664b20e82d7 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,19 +55,19 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "29.0.0.171"; + version = "30.0.0.113"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux_debug.x86_64.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux_debug.x86_64.tar.gz" else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz"; + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1q2lmsb9g2cxbwxb712javmadk6vmcgkihd244394nr10isdzw67" + "0vdzmk9l04jq9mfkdddsqrga7ndikq910indl7wa3vndghrahmn0" else - "0qj5qdc9k53pgqxb5jpcbgfsgavmlyzp0cpz468c4zacsvxgq502"; + "10rm48i3h6x1dygjivv2mvd0jq6n40j5c2ik090s7i0ily5z97m8"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix new file mode 100644 index 000000000000..fd067936efdf --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -0,0 +1,36 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }: + +buildGoPackage rec { + pname = "docker-machine-kvm2"; + name = "${pname}-${version}"; + version = "0.27.0"; + + goPackagePath = "k8s.io/minikube"; + subPackages = [ "cmd/drivers/kvm" ]; + + src = fetchFromGitHub { + owner = "kubernetes"; + repo = "minikube"; + rev = "v${version}"; + sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt ]; + + preBuild = '' + export buildFlagsArray=(-ldflags="-X k8s.io/minikube/pkg/drivers/kvm/version.VERSION=v${version}") + ''; + + postInstall = '' + mv $bin/bin/kvm $bin/bin/docker-machine-driver-kvm2 + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md; + description = "KVM2 driver for docker-machine."; + license = licenses.asl20; + maintainers = with maintainers; [ tadfisher ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 577252bc69e0..2612e2d9240b 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -2,11 +2,11 @@ , geoip, gperftools, python, swig }: stdenv.mkDerivation rec { - name = "bro-2.5.3"; + name = "bro-2.5.4"; src = fetchurl { url = "http://www.bro.org/downloads/${name}.tar.gz"; - sha256 = "09b227j1c0ggihbhbyphd7lnh26mpz07z1s0h148dg6fwqagm13k"; + sha256 = "07sz1i4ly30257677b8vfrbsvxhz2awijyzn5ihg4m567x1ymnl0"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 707e78459efe..929277996c5e 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "1z9dbvcgwafxr131a8447qkx97x8l93k32xa8xvajgvjlimqphqk"; + sha256 = "0qjia42nam3hj835k2jb5b6j6n56rdkb8rn67yqf45xdz8ypmbmv"; }; # This patch is likely not strictly speaking needed, but will help detect when diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index e305a4927204..1cf7243476cf 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3 -, gtk2, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, pango, systemd, xorg }: +, gtk2, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }: let @@ -25,7 +25,7 @@ let gnome3.gconf gdk_pixbuf gtk2 - + gnome3.gnome-keyring @@ -36,7 +36,6 @@ let pango stdenv.cc.cc systemd - libstdcxx5 libv4l xorg.libxkbfile diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index b6f91f02f833..071f82a8cbec 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -14,7 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; - version = "1.3.1"; - sha256Hash = "084zrdx3w1yq53r53zjbqpz7s8fc3ga26ffwyfxj07ysmyn7ck25"; + version = "1.3.4"; + sha256Hash = "17xdzyl7jb5g69a2h6fyk67z7s6h2dqjg8j478px6n0br1n420wk"; }); } diff --git a/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch b/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch new file mode 100644 index 000000000000..d9b994d9b37c --- /dev/null +++ b/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch @@ -0,0 +1,157 @@ +Date: Wed, 6 Jun 2018 20:46:38 +0200 + +This reverts commit eceda92a16f1f4e5c5b584acd745398571df2bd6. +--- + src/application/mainapplication.cpp | 3 --- + src/application/mainwindow.cpp | 11 ----------- + src/application/mainwindow.h | 2 -- + src/newstabwidget.cpp | 6 +----- + src/newstabwidget.h | 2 +- + src/optionsdialog.cpp | 2 -- + src/webview/webpage.cpp | 13 +------------ + src/webview/webpage.h | 3 --- + 8 files changed, 3 insertions(+), 39 deletions(-) + +diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp +index e93ec9c1..a5913bdf 100644 +--- a/src/application/mainapplication.cpp ++++ b/src/application/mainapplication.cpp +@@ -566,9 +566,6 @@ void MainApplication::c2fLoadSettings() + settings.beginGroup("ClickToFlash"); + c2fWhitelist_ = settings.value("whitelist", QStringList()).toStringList(); + c2fEnabled_ = settings.value("enabled", true).toBool(); +-#if QT_VERSION >= 0x050900 +- c2fEnabled_ = false; +-#endif + settings.endGroup(); + } + +diff --git a/src/application/mainwindow.cpp b/src/application/mainwindow.cpp +index 337a7c4e..42255d2c 100644 +--- a/src/application/mainwindow.cpp ++++ b/src/application/mainwindow.cpp +@@ -8140,14 +8140,3 @@ void MainWindow::createBackup() + QFile::copy(settings.fileName(), backupFileName); + } + } +- +-void MainWindow::webViewFullScreen(bool on) +-{ +- setFullScreen(); +- feedsWidget_->setVisible(!on); +- pushButtonNull_->setVisible(!on); +- tabBarWidget_->setVisible(!on); +- currentNewsTab->newsWidget_->setVisible(!on); +- pushButtonNull_->setVisible(!on); +- statusBar()->setVisible(!on); +-} +diff --git a/src/application/mainwindow.h b/src/application/mainwindow.h +index 995f96dc..93b75c11 100644 +--- a/src/application/mainwindow.h ++++ b/src/application/mainwindow.h +@@ -271,8 +271,6 @@ public: + + AdBlockIcon *adBlockIcon() { return adblockIcon_; } + +- void webViewFullScreen(bool on); +- + public slots: + void restoreFeedsOnStartUp(); + void addFeed(); +diff --git a/src/newstabwidget.cpp b/src/newstabwidget.cpp +index 77d74d3b..c6c130f7 100644 +--- a/src/newstabwidget.cpp ++++ b/src/newstabwidget.cpp +@@ -1842,12 +1842,8 @@ void NewsTabWidget::loadNewspaper(int refresh) + *----------------------------------------------------------------------------*/ + void NewsTabWidget::slotSetHtmlWebView(const QString &html, const QUrl &baseUrl) + { +- QUrl url = baseUrl; +-#if QT_VERSION >= 0x050900 +- url.setScheme(""); +-#endif + webView_->history()->setMaximumItemCount(0); +- webView_->setHtml(html, url); ++ webView_->setHtml(html, baseUrl); + webView_->history()->setMaximumItemCount(100); + } + +diff --git a/src/newstabwidget.h b/src/newstabwidget.h +index 7f5c3957..8d1266ac 100644 +--- a/src/newstabwidget.h ++++ b/src/newstabwidget.h +@@ -127,7 +127,6 @@ public: + QToolBar *newsToolBar_; + QSplitter *newsTabWidgetSplitter_; + +- QWidget *newsWidget_; + WebView *webView_; + QToolBar *webToolBar_; + LocationBar *locationBar_; +@@ -199,6 +198,7 @@ private: + + MainWindow *mainWindow_; + QSqlDatabase db_; ++ QWidget *newsWidget_; + + FeedsModel *feedsModel_; + FeedsProxyModel *feedsProxyModel_; +diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp +index 73136dec..c082bc30 100644 +--- a/src/optionsdialog.cpp ++++ b/src/optionsdialog.cpp +@@ -741,9 +741,7 @@ void OptionsDialog::createBrowserWidget() + browserWidget_ = new QTabWidget(); + browserWidget_->addTab(generalBrowserWidget, tr("General")); + browserWidget_->addTab(historyBrowserWidget_, tr("History")); +-#if QT_VERSION < 0x050900 + browserWidget_->addTab(click2FlashWidget_, tr("Click to Flash")); +-#endif + browserWidget_->addTab(downloadsWidget, tr("Downloads")); + } + +diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp +index 6401ec87..0254a167 100644 +--- a/src/webview/webpage.cpp ++++ b/src/webview/webpage.cpp +@@ -51,10 +51,7 @@ WebPage::WebPage(QObject *parent) + this, SLOT(downloadRequested(QNetworkRequest))); + connect(this, SIGNAL(printRequested(QWebFrame*)), + mainApp->mainWindow(), SLOT(slotPrint(QWebFrame*))); +-#if QT_VERSION >= 0x050900 +- connect(this, SIGNAL(fullScreenRequested(QWebFullScreenRequest)), +- this, SLOT(slotFullScreenRequested(QWebFullScreenRequest))); +-#endif ++ + livingPages_.append(this); + } + +@@ -286,11 +283,3 @@ void WebPage::cleanBlockedObjects() + mainFrame()->scrollToAnchor(mainFrame()->url().fragment()); + } + } +- +-#if QT_VERSION >= 0x050900 +-void WebPage::slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest) +-{ +- fullScreenRequest.accept(); +- mainApp->mainWindow()->webViewFullScreen(fullScreenRequest.toggleOn()); +-} +-#endif +diff --git a/src/webview/webpage.h b/src/webview/webpage.h +index 5c376c50..91e72758 100644 +--- a/src/webview/webpage.h ++++ b/src/webview/webpage.h +@@ -68,9 +68,6 @@ private slots: + void downloadRequested(const QNetworkRequest &request); + void cleanBlockedObjects(); + void urlChanged(const QUrl &url); +-#if QT_VERSION >= 0x050900 +- void slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest); +-#endif + + private: + NetworkManagerProxy *networkManagerProxy_; +-- +2.16.2 + diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 7bd50a47f813..6bd42183d038 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -1,17 +1,24 @@ -{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, pkgconfig, sqlite }: +{ stdenv, fetchFromGitHub, qmake, pkgconfig +, qtbase, qttools, qtwebkit, sqlite +}: stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.10"; + version = "0.18.11"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "1bv5aw6fscrwlycirvzm6fvbwmg8lbd1ycldkwbvybhjyfjaxkpm"; + sha256 = "0n9byhibi2qpgrb7x08knvqnmyn5c7vm24cl6y3zcvz52pz8y2yc"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + # Revert this commit until qt5.qtwebkit (currently an older version) from + # nixpkgs supports it (the commit states WebKit 602.1 while the current + # version in nixos-unstable is 538.1) + patches = [ ./0001-Revert-change-WebKit-602.1-c2f.patch ]; + + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qttools qtwebkit sqlite.dev ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix new file mode 100644 index 000000000000..5f276a1b3c70 --- /dev/null +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, xorg }: +stdenv.mkDerivation rec { + name = "xearth-${version}"; + version = "1.1"; + + src = fetchurl { + url = "http://xearth.org/${name}.tar.gz"; + sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c"; + }; + + buildInputs = with xorg; [ imake libXt libXext ]; + + dontAddPrefix = true; + configureScript="xmkmf"; + + installFlags=[ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"]; + installTargets="install install.man"; + + meta = with stdenv.lib; { + description = "sets the X root window to an image of the Earth"; + homepage = "http://xplanet.org"; + longDescription = + '' Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space, + correctly shaded for the current position of the Sun. + By default, xearth updates the displayed image every five minutes. + ''; + maintainers = [ maintainers.mafo ]; + license = "xearth"; + platforms=platforms.unix; + }; + +} diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 4ca489c40b3f..3583c3dbd19c 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.90"; + version = "3.3.91"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1q1fi0nqja9d8xj24h7ykvnpms6zqgn24jmyj1mxn48qig301c6m"; + sha256 = "1vp9qj3wyfwm36jk3pajvi09xvc1m1crf3d4gphfbs6nkyx2z942"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 3257977f5b5a..df9e58af08bb 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cryptoverif-${version}"; - version = "1.28"; + version = "2.00"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "0vssz751g1nn8wclkiwgghpm475jl00xkivc164vgbr9acxsr7n7"; + sha256 = "0g8pkj58b48zk4c0sgpln0qhbj82v75mz3w6cl3w5bvmxsbkwvy1"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 5eda2da60566..54c9799a01b8 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "z3-${version}"; - version = "4.6.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; - rev = "b0aaa4c6d7a739eb5e8e56a73e0486df46483222"; - sha256 = "1cgwlmjdbf4rsv2rriqi2sdpz9qxihxrcpm6a4s37ijy437xg78l"; + rev = "3b1b82bef05a1b5fd69ece79c80a95fb6d72a990"; + sha256 = "1s850r6qifwl83zzgvrb5l0jigvmymzpv18ph71hg2bcpk7kjw3d"; }; buildInputs = [ python fixDarwinDylibNames ]; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 46d33d1944ca..1a6e8bc56f40 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "hub-${version}"; - version = "2.3.0"; + version = "2.4.0"; src = fetchgit { url = https://github.com/github/hub.git; rev = "refs/tags/v${version}"; - sha256 = "0rx5izxgjxh4jdn991x90xvgbc7nhwx15pkmmzc8rkdzf0hnas1s"; + sha256 = "1lr6vg0zhg2air9bnzcl811g97jraxq05l3cs46wqqflwy57xpz2"; }; diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix new file mode 100644 index 000000000000..289c0ffd7074 --- /dev/null +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -0,0 +1,48 @@ +# We don't have a wrapper which can supply obs-studio plugins so you have to +# somewhat manually install this: + +# nix-env -f . -iA obs-linuxbrowser +# mkdir -p ~/.config/obs-studio/plugins +# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/ + +{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef +}: + +stdenv.mkDerivation rec { + name = "obs-linuxbrowser-${version}"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "bazukas"; + repo = "obs-linuxbrowser"; + rev = version; + sha256 = "0dql7wxyhksqa08j1dn5d09v2jwhgywc1p7psifhhvh97rkp4z7j"; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + postUnpack = '' + mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ + for i in ${libcef}/share/cef/*; do + ln -s $i cef/Release/ + ln -s $i cef/Resources/ + done + ln -s ${libcef}/lib/libcef.so cef/Release/ + ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ + ln -s ${libcef}/include cef/ + ''; + cmakeFlags = [ + "-DCEF_DIR=../../cef" + "-DOBS_INCLUDE=${obs-studio}/include/obs" + ]; + installPhase = '' + mkdir -p $out/share/obs/obs-plugins + cp -r build/obs-linuxbrowser $out/share/obs/obs-plugins/ + ''; + + meta = with stdenv.lib; { + description = "Browser source plugin for obs-studio based on Chromium Embedded Framework"; + homepage = https://github.com/bazukas/obs-linuxbrowser; + maintainers = with maintainers; [ puffnfresh ]; + license = licenses.gpl2; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index ead78bf4efd9..8c6926dd2c69 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -6,22 +6,26 @@ stdenv.mkDerivation rec { name = "openbox-${version}"; version = "3.6.1"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - libxml2 - libXinerama libXcursor libXau libXrandr libICE libSM - libstartup_notification makeWrapper + nativeBuildInputs = [ + pkgconfig + makeWrapper python2.pkgs.wrapPython ]; - pythonPath = with python2.pkgs; [ - pyxdg + buildInputs = [ + libxml2 + libXinerama libXcursor libXau libXrandr libICE libSM + libstartup_notification ]; propagatedBuildInputs = [ pango imlib2 ]; + pythonPath = with python2.pkgs; [ + pyxdg + ]; + src = fetchurl { url = "http://openbox.org/dist/openbox/${name}.tar.gz"; sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb"; @@ -41,7 +45,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share" - wrapPythonPrograms + wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" ''; meta = { diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 0f9d7603d48f..f40cdcf4cadf 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -15,6 +15,7 @@ findElfs() { while [ -n "$1" ]; do mimeType="$(file -b -N --mime-type "$1")" if [ "$mimeType" = application/x-executable \ + -o "$mimeType" = application/x-pie-executable \ -o "$mimeType" = application/x-sharedlib ]; then echo "$1" fi diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index e56807a434e8..5e658e458fd5 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "10.0.06"; + version = "11.0.01"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "1h4scl4l6503n8ghzd35dxfbai773csjrgdziqm86334zdj9g6k6"; + sha256 = "03nnfnh4j60a4hy0d4hqpnvhlfx437hp4g1wjfjy91vzrcbmvkwi"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "0ypkmwyfrsnag69h1c0mx89ranz4f6jc9y1sqkpq2rbzg64maik0"; + sha256 = "03bqqz2ipy3afhwsfy30c2v97cc27grw11lc0vzcvrgvin9ys2v1"; }; nativeBuildInputs = [ mkfontscale mkfontdir ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1qz7qr6lrwcn47vn0hbbgqnhz3agdl7q7x4l4yd5ard0idv3jj98"; + outputHash = "1ncllq42x1mlblf6h44garc3b5hkxv9dkpgbaipzll22p1l29yrf"; meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index c9537f497690..f55be458addf 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "epiphany-${version}"; - version = "3.28.1.1"; + version = "3.28.2.1"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "15d4dr4dwb1dyw3mvs7wp5gik57kdg0rxdc49n92wx46wfh6lhlr"; + sha256 = "0ba0qqsbg3cv1k1pcj971y7l8kqib5l7kbr743x9a7hbmkqfk95s"; }; # Tests need an X display diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 247d3566d6f3..2f7452dbc572 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gdm-${version}"; - version = "3.28.1"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1yxjjyrp0ywrc25cp81bsdhp79zn0c0jag48hlp00b5wfnkqy1kp"; + sha256 = "0wdm1503x66n1crdlmzmincbd2hccpxsdgjsl5anx3yjpdzs0hb0"; }; # Only needed to make it build diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix index 910ef01fcb9d..f48e9b3b1218 100644 --- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix +++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "geocode-glib-${version}"; - version = "3.25.4.1"; + version = "3.26.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0y6p5l2jrr78p7l4hijjhclzbap005y6h06g3aiglg9i5hk6j0gi"; + sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"; }; nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 55ac087cfa2c..6d5777614118 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -9,13 +9,13 @@ let pname = "gnome-control-center"; - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0f2p91bzbl39q3cb1qj5vi55km7wxb2fibx07vciz39g5va5cpn6"; + sha256 = "0d6pjdbsra16nav8201kaadja5yma92bhziki9601ilk2ry3v7pz"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 38f105bfcb0f..2eb66b02627b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-disk-utility-${version}"; - version = "3.28.2"; + version = "3.28.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1j3l4b1prbnixzy6srvcsjfg1dx5nqys2lmygm31ygfdq7svp3m6"; + sha256 = "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 6f80fe0c90bf..d224f0561703 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; - version = "3.28.1"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1hqwh12hiy73mazqgvyrq8jk4c669x2fb4nh8mwby3qbk8ca19pp"; + sha256 = "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 6577ba3ae587..ed313221e56a 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vte-${version}"; - version = "0.52.1"; + version = "0.52.2"; src = fetchurl { url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1lva70inb5y8p42rg95fb88z2ybwcz0lybla3ixbgp2sj0s4rzdh"; + sha256 = "1br6kg0wzf1wmww1hadihhcpqbamalqmbppfdzjvzk1ayp75f9hg"; }; passthru = { diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 579af7a8d232..d6453d1d1071 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.3.9" ; + versionPkg = "0.3.11" ; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ; - sha256 = "627bb99ecf2e3d5976f95f2faa13c7c330726601e8bb05a2113c9b69c98749b5"; + sha256 = "300884eca8a54cb9b0daa19bd04a86252160cc8ad6ef494198babd56d5a579bc"; }; postInstallContrib = stdenv.lib.optionalString withContrib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "c69a7c58964df26227e77656659129ca4c05205d2ebcacc7084edba818fb6e81"; + sha256 = "feba71f37e9688b8ff0a72c4eb21914ce59f19421350d9dc3f15ad6f8c28428a"; }; buildInputs = [ gmp ]; @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "http://www.ats-lang.org"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice ttuegel ]; + maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ]; }; } diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index d569e2401b6d..b7c310cf01d2 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -151,35 +151,35 @@ let in { - cudatoolkit6 = common { + cudatoolkit_6 = common { version = "6.0.37"; url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run"; sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40"; gcc = gcc48; }; - cudatoolkit65 = common { + cudatoolkit_6_5 = common { version = "6.5.19"; url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run"; sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj"; gcc = gcc48; }; - cudatoolkit7 = common { + cudatoolkit_7 = common { version = "7.0.28"; url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run"; sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi"; gcc = gcc49; }; - cudatoolkit75 = common { + cudatoolkit_7_5 = common { version = "7.5.18"; url = "http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run"; sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88"; gcc = gcc49; }; - cudatoolkit8 = common { + cudatoolkit_8 = common { version = "8.0.61.2"; url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"; sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; @@ -192,7 +192,14 @@ in { gcc = gcc5; }; - cudatoolkit9 = common { + cudatoolkit_9_0 = common { + version = "9.0.176.1"; + url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; + sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; + gcc = gcc6; + }; + + cudatoolkit_9 = common { version = "9.1.85.1"; url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux"; sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4"; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 5ffb7b92b26a..1c62f79f907b 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,13 +7,13 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "152b1136.20"; + version = "152b1248.6"; name = pname + "-" + version; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz"; - sha256 = "0sqr8f3z062kwcxh3dxnan45ldas438blbc69z0pypbhc8c2sk2b"; + sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7"; } else throw "unsupported system: ${stdenv.system}"; diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 619170d4a486..08a55dc609f6 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -28,13 +28,13 @@ let }; in stdenv.mkDerivation rec { - version = "2018-05-27"; + version = "0.0.3"; name = "mint-${version}"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; - rev = "a3f0c86f54b8b3a18dda5c39c2089bdb1d774b4f"; - sha256 = "1bgs6jkwfc2ksq4gj55cl3h2l5g25f5bwlsjryiw9cbx5k4bp1kz"; + rev = "0.0.3"; + sha256 = "15aawhpagpaqrs64jnz3g6iw3dhq0rlqm92cvfd5a3hbwvxg7lm0"; }; buildInputs = [ crystal zlib openssl duktape ]; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index ee076acd8b17..ccd149bbb404 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "owl-lisp-${version}"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { owner = "aoh"; repo = "owl-lisp"; rev = "v${version}"; - sha256 = "0pczmra2x6icyz6b6g66pp5ij83cq4wszg0ssw8qm7a5314kxkq4"; + sha256 = "1qp6p48bmlyn83rqi6k3d098dg4cribavg5rd4x17z37i181vxvj"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index b7037c9b9a86..061b9b8639d2 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.22.5"; + version = "0.22.6"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1kxn4chc35h72hrblfrmmwgzb9s1sjsjazwz1dksj3hy45288lj1"; + sha256 = "05y0qcfdyzv6cgizhbg6yl7rrlbfbkcr0jmxjlzhvhz7dypk20cl"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 1904c12dfdc1..849917c4a0c4 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -14,7 +14,7 @@ let installComponents = "rustc,rust-std-${platform}" - + (optionalString bootstrapping ",rust-docs,cargo") + + (optionalString bootstrapping ",cargo") ; in diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 44d96bc4ad1d..9d67dd8f8564 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.24.1"; + version = "1.26.1"; # fetch hashes by running `print-hashes.sh 1.24.1` hashes = { - i686-unknown-linux-gnu = "a483576bb2ab237aa1ef62b66c0814f934afd8129d7c9748cb9a75da4a678c98"; - x86_64-unknown-linux-gnu = "4567e7f6e5e0be96e9a5a7f5149b5452828ab6a386099caca7931544f45d5327"; - armv7-unknown-linux-gnueabihf = "1169ab005b771c4befcdab536347a90242cae544b6b76eccd0f76796b61a534c"; - aarch64-unknown-linux-gnu = "64bb25a9689b18ddadf025b90d9bdb150b809ebfb74432dc69cc2e46120adbb2"; - i686-apple-darwin = "c96f7579e2406220895da80a989daaa194751c141e112ebe95761f2ed4ecb662"; - x86_64-apple-darwin = "9d4aacdb5849977ea619d399903c9378163bd9c76ea11dac5ef6eca27849f501"; + i686-unknown-linux-gnu = "d704ba5cbaaf93c5e2112d211630db0e460d5dc819a43464ba91581e5c821df3"; + x86_64-unknown-linux-gnu = "b7e964bace1286696d511c287b945f3ece476ba77a231f0c31f1867dfa5080e0"; + armv7-unknown-linux-gnueabihf = "34fbcebc8e60b6496f1ce7998cf0b50cd618770f039da529b65110fff1f25fa0"; + aarch64-unknown-linux-gnu = "d4a369053c2dfd5f457de6853557dab563944579fa4bb55bc919bacf259bff6d"; + i686-apple-darwin = "047c31a872161ebb1d21ef616f7658190403769a8734f84364a3cf15838b4708"; + x86_64-apple-darwin = "ebf898b9fa7e2aafc53682a41f18af5ca6660ebe82dd78f28cd9799fe4dc189a"; }; platform = diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index f191515b745c..44b43a7af542 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,16 +6,25 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.25.0"; - cargoVersion = "0.26.0"; + version = "1.26.2"; + cargoVersion = "1.26.2"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf"; + sha256 = "0047ais0fvmqvngqkdsxgrzhb0kljg8wy85b01kbbjc88hqcz7pv"; }; in rec { rustc = callPackage ./rustc.nix { inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src; + patches = [ + ./patches/net-tcp-disable-tests.patch + ./patches/stdsimd-disable-doctest.patch + # Fails on hydra - not locally; the exact reason is unknown. + # Comments in the test suggest that some non-reproducible environment + # variables such $RANDOM can make it fail. + ./patches/disable-test-inherit-env.patch + ]; + forceBundledLLVM = true; configureFlags = [ "--release-channel=stable" ]; @@ -25,11 +34,6 @@ in rec { # So we do the same. # 2. Tests run out of memory for i686 doCheck = !stdenv.isAarch64 && !stdenv.isi686; - - patches = [ - ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - }; cargo = callPackage ./cargo.nix rec { diff --git a/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch b/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch deleted file mode 100644 index f55d0badb823..000000000000 --- a/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 26d3b70abec1adf773522643b31ce9c03439916a Mon Sep 17 00:00:00 2001 -From: Joerg Thalheim <joerg@thalheim.io> -Date: Tue, 10 Oct 2017 00:40:20 +0100 -Subject: [PATCH] Disable fragile tests libstd::net::tcp on Darwin/Linux - -Signed-off-by: Joerg Thalheim <joerg@thalheim.io> ---- - src/libstd/net/tcp.rs | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs -index 8d1e7882e5..2c223fb315 100644 ---- a/src/libstd/net/tcp.rs -+++ b/src/libstd/net/tcp.rs -@@ -949,6 +949,7 @@ mod tests { - }) - } - -+ #[cfg_attr(target_os = "macos", ignore)] - #[test] - fn write_close() { - each_ip(&mut |addr| { -@@ -1421,7 +1422,10 @@ mod tests { - - // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code - // no longer has rounding errors. -- #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)] -+ #[cfg_attr(any(target_os = "bitrig", -+ target_os = "netbsd", -+ target_os = "openbsd", -+ target_os = "macos"), ignore)] - #[test] - fn timeouts() { - let addr = next_test_ip4(); -@@ -1500,6 +1504,7 @@ mod tests { - assert_eq!(false, t!(stream.nodelay())); - } - -+ #[cfg_attr(target_os = "macos", ignore)] - #[test] - fn ttl() { - let ttl = 100; -@@ -1568,6 +1573,7 @@ mod tests { - }) - } - -+ #[cfg_attr(target_os = "linux", ignore)] - #[test] - fn connect_timeout_unroutable() { - // this IP is unroutable, so connections should always time out, --- -2.14.2 - diff --git a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch new file mode 100644 index 000000000000..fcb75ed098ec --- /dev/null +++ b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch @@ -0,0 +1,10 @@ +--- rustc-1.26.2-src.org/src/libstd/process.rs 2018-06-01 21:40:11.000000000 +0100 ++++ rustc-1.26.2-src/src/libstd/process.rs 2018-06-08 07:50:23.023828658 +0100 +@@ -1745,6 +1745,7 @@ + } + + #[test] ++ #[ignore] + fn test_inherit_env() { + use env; + diff --git a/pkgs/development/compilers/rust/patches/grsec.patch b/pkgs/development/compilers/rust/patches/grsec.patch deleted file mode 100644 index b97b40c24091..000000000000 --- a/pkgs/development/compilers/rust/patches/grsec.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile -index b22f34f..c6489bd 100644 ---- a/src/test/run-make/relocation-model/Makefile -+++ b/src/test/run-make/relocation-model/Makefile -@@ -2,9 +2,11 @@ - - all: others - $(RUSTC) -C relocation-model=dynamic-no-pic foo.rs -+ paxctl -czexm $(TMPDIR)/foo - $(call RUN,foo) - - $(RUSTC) -C relocation-model=default foo.rs -+ paxctl -czexm $(TMPDIR)/foo - $(call RUN,foo) - - $(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs -@@ -16,6 +18,7 @@ others: - else - others: - $(RUSTC) -C relocation-model=static foo.rs -+ paxctl -czexm $(TMPDIR)/foo - $(call RUN,foo) - $(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs - endif diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch new file mode 100644 index 000000000000..10713b6b7aa9 --- /dev/null +++ b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch @@ -0,0 +1,104 @@ +diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs +index 0f60b5b3e..9b08415e7 100644 +--- a/src/libstd/net/tcp.rs ++++ b/src/libstd/net/tcp.rs +@@ -962,6 +962,7 @@ mod tests { + } + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn listen_localhost() { + let socket_addr = next_test_ip4(); +@@ -1020,6 +1021,7 @@ mod tests { + }) + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn read_eof() { + each_ip(&mut |addr| { +@@ -1039,6 +1041,7 @@ mod tests { + }) + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn write_close() { + each_ip(&mut |addr| { +@@ -1065,6 +1068,7 @@ mod tests { + }) + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn multiple_connect_serial() { + each_ip(&mut |addr| { +@@ -1087,6 +1091,7 @@ mod tests { + }) + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn multiple_connect_interleaved_greedy_schedule() { + const MAX: usize = 10; +@@ -1123,6 +1128,7 @@ mod tests { + } + + #[test] ++ #[cfg_attr(target_os = "macos", ignore)] + fn multiple_connect_interleaved_lazy_schedule() { + const MAX: usize = 10; + each_ip(&mut |addr| { +@@ -1401,6 +1407,7 @@ mod tests { + } + + #[test] ++ #[cfg_attr(target_os = "macos", ignore)] + fn clone_while_reading() { + each_ip(&mut |addr| { + let accept = t!(TcpListener::bind(&addr)); +@@ -1421,7 +1422,10 @@ mod tests { + + // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code + // no longer has rounding errors. +- #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)] ++ #[cfg_attr(any(target_os = "bitrig", ++ target_os = "netbsd", ++ target_os = "openbsd", ++ target_os = "macos"), ignore)] + #[test] + fn timeouts() { + let addr = next_test_ip4(); +@@ -1596,6 +1603,7 @@ mod tests { + drop(listener); + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn nodelay() { + let addr = next_test_ip4(); +@@ -1610,6 +1618,7 @@ mod tests { + assert_eq!(false, t!(stream.nodelay())); + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn ttl() { + let ttl = 100; +@@ -1647,6 +1656,7 @@ mod tests { + } + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn peek() { + each_ip(&mut |addr| { +@@ -1679,6 +1689,7 @@ mod tests { + } + + #[test] ++ #[cfg_attr(any(target_os = "linux", target_os = "macos"), ignore)] + fn connect_timeout_unroutable() { + // this IP is unroutable, so connections should always time out, + // provided the network is reachable to begin with. diff --git a/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch b/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch new file mode 100644 index 000000000000..6ef7fd0f7ce4 --- /dev/null +++ b/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch @@ -0,0 +1,20 @@ +diff --git a/src/stdsimd/coresimd/x86/mod.rs b/src/stdsimd/coresimd/x86/mod.rs +index 32915c332..7cb54f31e 100644 +--- a/src/stdsimd/coresimd/x86/mod.rs ++++ b/src/stdsimd/coresimd/x86/mod.rs +@@ -279,7 +279,6 @@ types! { + /// + /// # Examples + /// +- /// ``` + /// # #![feature(cfg_target_feature, target_feature, stdsimd)] + /// # #![cfg_attr(not(dox), no_std)] + /// # #[cfg(not(dox))] +@@ -301,7 +300,6 @@ types! { + /// # } + /// # if is_x86_feature_detected!("sse") { unsafe { foo() } } + /// # } +- /// ``` + pub struct __m256(f32, f32, f32, f32, f32, f32, f32, f32); + + /// 256-bit wide set of four `f64` types, x86-specific diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 277ffda20afd..d3dcc8e2f6c9 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -10,11 +10,7 @@ , targets , targetPatches , targetToolchains - -# Tests frequently break on Darwin -# See the rust issue: https://github.com/rust-lang/rust/issues/51006 -, doCheck ? (!stdenv.isDarwin) - +, doCheck ? true , broken ? false , buildPlatform, hostPlatform } @ args: @@ -149,10 +145,11 @@ stdenv.mkDerivation { outputs = [ "out" "man" "doc" ]; setOutputFlags = false; - # Disable codegen units for the tests. + # Disable codegen units and hardening for the tests. preCheck = '' export RUSTFLAGS= export TZDIR=${tzdata}/share/zoneinfo + export hardeningDisable=all '' + # Ensure TMPDIR is set, and disable a test that removing the HOME # variable from the environment falls back to another home diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b92ba205b843..7120d15ade7c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -342,6 +342,7 @@ self: super: { HTF = dontCheck super.HTF; htsn = dontCheck super.htsn; htsn-import = dontCheck super.htsn-import; + http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105 ihaskell = dontCheck super.ihaskell; influxdb = dontCheck super.influxdb; itanium-abi = dontCheck super.itanium-abi; @@ -437,12 +438,6 @@ self: super: { # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; - # Version 0.21.2 calls its doctest suite with incorrect paths. - haskell-gi = appendPatch super.haskell-gi (pkgs.fetchpatch { - url = https://github.com/haskell-gi/haskell-gi/pull/163/commits/b876c4f351893370d4ae597aab6ecc0422e7f665.patch; - sha256 = "03vzpvnr3vnz2zgsr504iyf0n9aw6mkz8rkj6zhazfixl3dzfkyd"; - }); - # https://github.com/basvandijk/threads/issues/10 threads = dontCheck super.threads; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 577ecd804932..c53fd35c48ec 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 11.11 + # LTS Haskell 11.12 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -79,7 +79,7 @@ default-package-overrides: - aeson-yak ==0.1.1.3 - Agda ==2.5.3 - airship ==0.9.3 - - alarmclock ==0.4.0.3 + - alarmclock ==0.4.0.4 - alerts ==0.1.0.0 - alex ==3.2.4 - algebra ==4.3.1 @@ -91,6 +91,95 @@ default-package-overrides: - alternative-vector ==0.0.0 - alternators ==0.1.2.0 - ALUT ==2.4.0.2 + - amazonka ==1.6.0 + - amazonka-apigateway ==1.6.0 + - amazonka-application-autoscaling ==1.6.0 + - amazonka-appstream ==1.6.0 + - amazonka-autoscaling ==1.6.0 + - amazonka-budgets ==1.6.0 + - amazonka-certificatemanager ==1.6.0 + - amazonka-cloudformation ==1.6.0 + - amazonka-cloudfront ==1.6.0 + - amazonka-cloudhsm ==1.6.0 + - amazonka-cloudsearch ==1.6.0 + - amazonka-cloudsearch-domains ==1.6.0 + - amazonka-cloudtrail ==1.6.0 + - amazonka-cloudwatch ==1.6.0 + - amazonka-cloudwatch-events ==1.6.0 + - amazonka-cloudwatch-logs ==1.6.0 + - amazonka-codebuild ==1.6.0 + - amazonka-codecommit ==1.6.0 + - amazonka-codedeploy ==1.6.0 + - amazonka-codepipeline ==1.6.0 + - amazonka-cognito-identity ==1.6.0 + - amazonka-cognito-idp ==1.6.0 + - amazonka-cognito-sync ==1.6.0 + - amazonka-config ==1.6.0 + - amazonka-core ==1.6.0 + - amazonka-datapipeline ==1.6.0 + - amazonka-devicefarm ==1.6.0 + - amazonka-directconnect ==1.6.0 + - amazonka-discovery ==1.6.0 + - amazonka-dms ==1.6.0 + - amazonka-ds ==1.6.0 + - amazonka-dynamodb ==1.6.0 + - amazonka-dynamodb-streams ==1.6.0 + - amazonka-ec2 ==1.6.0 + - amazonka-ecr ==1.6.0 + - amazonka-ecs ==1.6.0 + - amazonka-efs ==1.6.0 + - amazonka-elasticache ==1.6.0 + - amazonka-elasticbeanstalk ==1.6.0 + - amazonka-elasticsearch ==1.6.0 + - amazonka-elastictranscoder ==1.6.0 + - amazonka-elb ==1.6.0 + - amazonka-elbv2 ==1.6.0 + - amazonka-emr ==1.6.0 + - amazonka-gamelift ==1.6.0 + - amazonka-glacier ==1.6.0 + - amazonka-health ==1.6.0 + - amazonka-iam ==1.6.0 + - amazonka-importexport ==1.6.0 + - amazonka-inspector ==1.6.0 + - amazonka-iot ==1.6.0 + - amazonka-iot-dataplane ==1.6.0 + - amazonka-kinesis ==1.6.0 + - amazonka-kinesis-analytics ==1.6.0 + - amazonka-kinesis-firehose ==1.6.0 + - amazonka-kms ==1.6.0 + - amazonka-lambda ==1.6.0 + - amazonka-lightsail ==1.6.0 + - amazonka-marketplace-analytics ==1.6.0 + - amazonka-marketplace-metering ==1.6.0 + - amazonka-ml ==1.6.0 + - amazonka-opsworks ==1.6.0 + - amazonka-opsworks-cm ==1.6.0 + - amazonka-pinpoint ==1.6.0 + - amazonka-polly ==1.6.0 + - amazonka-rds ==1.6.0 + - amazonka-redshift ==1.6.0 + - amazonka-rekognition ==1.6.0 + - amazonka-route53 ==1.6.0 + - amazonka-route53-domains ==1.6.0 + - amazonka-s3 ==1.6.0 + - amazonka-sdb ==1.6.0 + - amazonka-servicecatalog ==1.6.0 + - amazonka-ses ==1.6.0 + - amazonka-shield ==1.6.0 + - amazonka-sms ==1.6.0 + - amazonka-snowball ==1.6.0 + - amazonka-sns ==1.6.0 + - amazonka-sqs ==1.6.0 + - amazonka-ssm ==1.6.0 + - amazonka-stepfunctions ==1.6.0 + - amazonka-storagegateway ==1.6.0 + - amazonka-sts ==1.6.0 + - amazonka-support ==1.6.0 + - amazonka-swf ==1.6.0 + - amazonka-test ==1.6.0 + - amazonka-waf ==1.6.0 + - amazonka-workspaces ==1.6.0 + - amazonka-xray ==1.6.0 - amqp ==0.18.1 - annotated-wl-pprint ==0.7.0 - ansigraph ==0.3.0.5 @@ -140,9 +229,9 @@ default-package-overrides: - auto-update ==0.1.4 - avwx ==0.3.0.2 - axiom ==0.4.6 - - b9 ==0.5.47 + - b9 ==0.5.49 - backprop ==0.1.5.2 - - bank-holidays-england ==0.1.0.6 + - bank-holidays-england ==0.1.0.7 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 @@ -159,13 +248,13 @@ default-package-overrides: - bcrypt ==0.0.11 - beam-core ==0.7.2.1 - beam-migrate ==0.3.2.0 - - beam-sqlite ==0.3.2.0 + - beam-sqlite ==0.3.2.1 - bench ==1.0.9 - benchpress ==0.2.2.10 - bencode ==0.6.0.0 - bento ==0.1.0 - between ==0.11.0.0 - - bhoogle ==0.1.2.6 + - bhoogle ==0.1.2.7 - bibtex ==0.1.0.6 - bifunctors ==5.5.2 - bimap ==0.3.3 @@ -179,7 +268,7 @@ default-package-overrides: - binary-parsers ==0.2.3.0 - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - - binary-tagged ==0.1.4.2 + - binary-tagged ==0.1.5 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.1.2.4 - bindings-libzip ==1.0.1 @@ -260,7 +349,7 @@ default-package-overrides: - Cabal ==2.0.1.1 - cabal-doctest ==1.0.6 - cabal-file-th ==0.2.4 - - cabal-rpm ==0.12.3 + - cabal-rpm ==0.12.4 - cabal-toolkit ==0.0.5 - cache ==0.1.1.0 - cairo ==0.13.5.0 @@ -286,7 +375,7 @@ default-package-overrides: - cereal-vector ==0.2.0.1 - ChannelT ==0.0.0.7 - charset ==0.3.7.1 - - charsetdetect-ae ==1.1.0.3 + - charsetdetect-ae ==1.1.0.4 - Chart ==1.8.3 - Chart-cairo ==1.8.3 - chaselev-deque ==0.5.0.5 @@ -357,7 +446,7 @@ default-package-overrides: - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduit ==1.3.0.2 - - conduit-algorithms ==0.0.8.0 + - conduit-algorithms ==0.0.8.1 - conduit-combinators ==1.3.0 - conduit-connection ==0.1.0.4 - conduit-extra ==1.3.0 @@ -515,7 +604,7 @@ default-package-overrides: - dlist ==0.8.0.4 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - - dns ==3.0.3 + - dns ==3.0.4 - docker ==0.5.1.1 - docker-build-cacher ==1.9.2 - dockerfile ==0.1.0.1 @@ -589,11 +678,11 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventsource-api ==1.3.0 + - eventsource-api ==1.3.1 - eventsource-geteventstore-store ==1.1.0 - eventsource-store-specs ==1.1.1 - eventsource-stub-store ==1.0.3 - - eventstore ==1.1.3 + - eventstore ==1.1.4 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.3 @@ -610,7 +699,7 @@ default-package-overrides: - extensible ==0.4.9 - extensible-effects ==2.4.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.6 + - extra ==1.6.8 - extractable-singleton ==0.0.1 - extrapolate ==0.3.1 - fail ==4.9.0.0 @@ -800,12 +889,12 @@ default-package-overrides: - haddock-library ==1.4.5 - hailgun ==0.4.1.8 - hailgun-simple ==0.1.0.0 - - hakyll ==4.12.2.0 + - hakyll ==4.12.3.0 - half ==0.2.2.3 - hamilton ==0.1.0.2 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.5 + - hapistrano ==0.3.5.6 - happstack-jmacro ==7.0.12 - happstack-server ==7.5.1 - happstack-server-tls ==7.1.6.5 @@ -815,9 +904,9 @@ default-package-overrides: - hashable-time ==0.2.0.1 - hashids ==1.0.2.4 - hashmap ==1.3.3 - - hashtables ==1.2.3.0 + - hashtables ==1.2.3.1 - haskeline ==0.7.4.2 - - haskell-gi ==0.21.2 + - haskell-gi ==0.21.3 - haskell-gi-base ==0.21.1 - haskell-gi-overloading ==0.0 - haskell-lexer ==1.0.1 @@ -841,9 +930,9 @@ default-package-overrides: - hasmin ==1.0.2 - hasql ==1.1.1 - hasql-migration ==0.1.3 - - hasql-optparse-applicative ==0.3.0.1 - - hasql-pool ==0.4.3 - - hasql-transaction ==0.6 + - hasql-optparse-applicative ==0.3.0.2 + - hasql-pool ==0.4.3.1 + - hasql-transaction ==0.6.0.1 - hastache ==0.6.1 - hasty-hamiltonian ==1.3.2 - HaTeX ==3.18.0.0 @@ -864,7 +953,7 @@ default-package-overrides: - hebrew-time ==0.1.1 - hedgehog ==0.5.3 - hedgehog-quickcheck ==0.1 - - hedis ==0.10.1 + - hedis ==0.10.2 - heist ==1.0.1.2 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -944,7 +1033,7 @@ default-package-overrides: - hslua-module-text ==0.1.2.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.4.13 + - HsOpenSSL ==0.11.4.14 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - hspec ==2.4.8 @@ -969,7 +1058,7 @@ default-package-overrides: - hstatsd ==0.1 - HStringTemplate ==0.8.7 - HSvm ==0.1.0.3.22 - - hsx-jmacro ==7.3.8 + - hsx-jmacro ==7.3.8.1 - hsyslog ==5.0.1 - hsyslog-udp ==0.2.2 - htaglib ==1.1.1 @@ -1005,9 +1094,9 @@ default-package-overrides: - hweblib ==0.6.3 - hw-excess ==0.2.0.0 - hw-fingertree ==0.1.0.1 - - hw-fingertree-strict ==0.1.0.3 + - hw-fingertree-strict ==0.1.1.1 - hw-hedgehog ==0.1.0.1 - - hw-hspec-hedgehog ==0.1.0.4 + - hw-hspec-hedgehog ==0.1.0.5 - hw-int ==0.0.0.3 - hw-json ==0.6.0.0 - hw-mquery ==0.1.0.1 @@ -1280,12 +1369,12 @@ default-package-overrides: - microstache ==1.0.1.1 - midi ==0.2.2.2 - mighty-metropolis ==1.2.0 - - milena ==0.5.2.1 + - milena ==0.5.2.2 - mime-mail ==0.4.14 - mime-mail-ses ==0.4.1 - mime-types ==0.1.0.7 - minimorph ==0.1.6.1 - - minio-hs ==1.0.0 + - minio-hs ==1.0.1 - miniutter ==0.4.7.0 - mintty ==0.1.2 - misfortune ==0.1.1.2 @@ -1329,7 +1418,7 @@ default-package-overrides: - monadplus ==1.4.2 - monad-products ==4.0.1 - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.1 + - MonadRandom ==0.5.1.1 - monad-recorder ==0.1.1 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 @@ -1353,7 +1442,7 @@ default-package-overrides: - multiarg ==0.30.0.10 - multimap ==1.2.1 - multipart ==0.1.2 - - multiset ==0.3.3 + - multiset ==0.3.4 - multistate ==0.7.1.2 - murmur-hash ==0.1.0.9 - mustache ==2.3.0 @@ -1367,7 +1456,7 @@ default-package-overrides: - mysql-haskell-openssl ==0.8.3.0 - mysql-simple ==0.4.5 - nagios-check ==0.3.2 - - names-th ==0.2.0.3 + - names-th ==0.2.0.4 - nano-erl ==0.1.0.1 - nanospec ==0.2.2 - naqsha ==0.2.0.1 @@ -1565,8 +1654,8 @@ default-package-overrides: - postgresql-binary ==0.12.1.1 - postgresql-libpq ==0.9.4.1 - postgresql-schema ==0.1.14 - - postgresql-simple ==0.5.3.0 - - postgresql-simple-migration ==0.1.11.0 + - postgresql-simple ==0.5.4.0 + - postgresql-simple-migration ==0.1.12.0 - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 @@ -1609,10 +1698,10 @@ default-package-overrides: - prometheus-metrics-ghc ==0.3.0 - promises ==0.3 - prompt ==0.1.1.2 - - protobuf ==0.2.1.1 + - protobuf ==0.2.1.2 - protobuf-simple ==0.1.0.5 - - protocol-buffers ==2.4.9 - - protocol-buffers-descriptor ==2.4.9 + - protocol-buffers ==2.4.10 + - protocol-buffers-descriptor ==2.4.10 - protocol-radius ==0.0.1.0 - protocol-radius-test ==0.0.1.0 - proto-lens ==0.2.2.0 @@ -1660,7 +1749,7 @@ default-package-overrides: - random-shuffle ==0.0.4 - random-source ==0.3.0.6 - random-tree ==0.6.0.5 - - range-set-list ==0.1.2.1 + - range-set-list ==0.1.3 - rank1dynamic ==0.4.0 - rank2classes ==1.0.2 - rank-product ==0.2.0.1 @@ -1755,8 +1844,8 @@ default-package-overrides: - say ==0.1.0.0 - sbp ==2.3.16 - sbv ==7.5 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1837,7 +1926,7 @@ default-package-overrides: - signal ==0.1.0.4 - silently ==1.2.5 - simple ==0.11.2 - - simple-log ==0.9.4 + - simple-log ==0.9.5 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.27 - simple-session ==0.10.1.1 @@ -1892,7 +1981,7 @@ default-package-overrides: - spoon ==0.3.1 - spreadsheet ==0.1.3.7 - sqlite-simple ==0.4.15.0 - - sql-words ==0.1.6.0 + - sql-words ==0.1.6.1 - squeal-postgresql ==0.1.1.4 - srcloc ==0.5.1.2 - stache ==1.2.1 @@ -1924,7 +2013,7 @@ default-package-overrides: - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - store ==0.4.3.2 - - store-core ==0.4.1 + - store-core ==0.4.3 - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.19.1 - streaming ==0.2.1.0 @@ -2027,9 +2116,9 @@ default-package-overrides: - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - - text-postgresql ==0.0.2.3 + - text-postgresql ==0.0.3.0 - text-printer ==0.5 - - text-region ==0.3.0.0 + - text-region ==0.3.1.0 - text-short ==0.1.2 - text-show ==3.7.2 - text-show-instances ==3.6.3 @@ -2143,8 +2232,8 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - unique ==0 - Unique ==0.4.7.2 + - unique ==0 - unit-constraint ==0.0.0 - units-parser ==0.1.1.2 - universe ==1.0 @@ -2163,7 +2252,7 @@ default-package-overrides: - unordered-containers ==0.2.9.0 - unordered-intmap ==0.1.0.0 - unsafe ==0.0 - - uri-bytestring ==0.3.1.1 + - uri-bytestring ==0.3.2.0 - uri-bytestring-aeson ==0.1.0.6 - uri-encode ==1.5.0.5 - uri-templater ==0.3.1.0 @@ -2192,7 +2281,7 @@ default-package-overrides: - validity-uuid ==0.0.0.0 - validity-vector ==0.1.0.0 - varying ==0.7.0.3 - - vault ==0.3.1.0 + - vault ==0.3.1.1 - vcswrapper ==0.1.6 - vector ==0.12.0.1 - vector-algorithms ==0.7.0.1 @@ -2259,7 +2348,7 @@ default-package-overrides: - web-routes-th ==0.22.6.3 - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - - websockets ==0.12.4.1 + - websockets ==0.12.5.0 - websockets-rpc ==0.6.0 - websockets-simple ==0.0.6.3 - websockets-snap ==0.10.3.0 @@ -2382,7 +2471,7 @@ default-package-overrides: - zeromq4-haskell ==0.7.0 - zim-parser ==0.2.1.0 - zip ==1.0.0 - - zip-archive ==0.3.2.4 + - zip-archive ==0.3.2.5 - zippers ==0.2.5 - zlib ==0.6.2 - zlib-bindings ==0.1.1.5 @@ -2895,6 +2984,7 @@ dont-distribute-packages: Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] animascii: [ i686-linux, x86_64-linux, x86_64-darwin ] animate-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + animate-frames: [ i686-linux, x86_64-linux, x86_64-darwin ] animate-preview: [ i686-linux, x86_64-linux, x86_64-darwin ] animate-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] animate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2911,6 +3001,7 @@ dont-distribute-packages: antlrc: [ i686-linux, x86_64-linux, x86_64-darwin ] anydbm: [ i686-linux, x86_64-linux, x86_64-darwin ] aosd: [ i686-linux, x86_64-linux, x86_64-darwin ] + apart: [ i686-linux, x86_64-linux, x86_64-darwin ] apelsin: [ i686-linux, x86_64-linux, x86_64-darwin ] api-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] api-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3100,6 +3191,7 @@ dont-distribute-packages: base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] BASIC: [ i686-linux, x86_64-linux, x86_64-darwin ] + basic: [ i686-linux, x86_64-linux, x86_64-darwin ] baskell: [ i686-linux, x86_64-linux, x86_64-darwin ] batchd: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3123,6 +3215,7 @@ dont-distribute-packages: Befunge93: [ i686-linux, x86_64-linux, x86_64-darwin ] bein: [ i686-linux, x86_64-linux, x86_64-darwin ] belka: [ i686-linux, x86_64-linux, x86_64-darwin ] + bench-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] BenchmarkHistory: [ i686-linux, x86_64-linux, x86_64-darwin ] bencoding: [ i686-linux, x86_64-linux, x86_64-darwin ] berkeleydb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3240,6 +3333,7 @@ dont-distribute-packages: BlastHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] blatex: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-builder-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + blaze-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-truncate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3267,6 +3361,7 @@ dont-distribute-packages: board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] bolt: [ i686-linux, x86_64-linux, x86_64-darwin ] + boltzmann-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] bond-haskell-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] bond-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bond: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3346,6 +3441,7 @@ dont-distribute-packages: cabal-ghc-dynflags: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-graphdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] Cabal-ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-info: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3519,6 +3615,9 @@ dont-distribute-packages: citeproc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] cj-token: [ i686-linux, x86_64-linux, x86_64-darwin ] cjk: [ i686-linux, x86_64-linux, x86_64-darwin ] + cl3-hmatrix-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] + cl3-linear-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] + cl3: [ i686-linux, x86_64-linux, x86_64-darwin ] clac: [ i686-linux, x86_64-linux, x86_64-darwin ] clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3720,6 +3819,7 @@ dont-distribute-packages: content-store: [ i686-linux, x86_64-linux, x86_64-darwin ] context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] ContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] + contiguous: [ i686-linux, x86_64-linux, x86_64-darwin ] continue: [ i686-linux, x86_64-linux, x86_64-darwin ] continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ] continuum: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4081,6 +4181,7 @@ dont-distribute-packages: dist-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] Dist: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-fork-aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-async: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-azure: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-client-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4210,6 +4311,7 @@ dont-distribute-packages: edentv: [ i686-linux, x86_64-linux, x86_64-darwin ] edge: [ i686-linux, x86_64-linux, x86_64-darwin ] edit-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] + edit: [ i686-linux, x86_64-linux, x86_64-darwin ] editable: [ i686-linux, x86_64-linux, x86_64-darwin ] editline: [ i686-linux, x86_64-linux, x86_64-darwin ] EditTimeReport: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4256,6 +4358,7 @@ dont-distribute-packages: engine-io-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io: [ i686-linux, x86_64-linux, x86_64-darwin ] entangle: [ i686-linux, x86_64-linux, x86_64-darwin ] + EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerate-function: [ i686-linux, x86_64-linux, x86_64-darwin ] enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4288,6 +4391,7 @@ dont-distribute-packages: escape-artist: [ i686-linux, x86_64-linux, x86_64-darwin ] esotericbot: [ i686-linux, x86_64-linux, x86_64-darwin ] EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] + espial: [ i686-linux, x86_64-linux, x86_64-darwin ] esqueleto: [ i686-linux, x86_64-linux, x86_64-darwin ] ess: [ i686-linux, x86_64-linux, x86_64-darwin ] estimators: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4341,6 +4445,7 @@ dont-distribute-packages: exists: [ i686-linux, x86_64-linux, x86_64-darwin ] exitcode: [ i686-linux, x86_64-linux, x86_64-darwin ] exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] + exp-pairs: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] expat-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] expiring-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4569,6 +4674,7 @@ dont-distribute-packages: freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] FreeTypeGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + freq: [ i686-linux, x86_64-linux, x86_64-darwin ] fresco-binding: [ i686-linux, x86_64-linux, x86_64-darwin ] fresh: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5192,6 +5298,8 @@ dont-distribute-packages: haphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator3: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator: [ i686-linux, x86_64-linux, x86_64-darwin ] + happlets-lib-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + happlets: [ i686-linux, x86_64-linux, x86_64-darwin ] happraise: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-Data: [ i686-linux, x86_64-linux, x86_64-darwin ] happs-hsp-template: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5580,6 +5688,7 @@ dont-distribute-packages: hi: [ i686-linux, x86_64-linux, x86_64-darwin ] hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hid-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5991,6 +6100,7 @@ dont-distribute-packages: hunit-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] hunp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hunspell-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hurdle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6000,10 +6110,16 @@ dont-distribute-packages: huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-balancedparens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-dsv: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-prim-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-rankselect-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6049,6 +6165,7 @@ dont-distribute-packages: hyperloglog: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperloglogplus: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperpublic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyphenate: [ i686-linux, x86_64-linux, x86_64-darwin ] hypher: [ i686-linux, x86_64-linux, x86_64-darwin ] hzulip: [ i686-linux, x86_64-linux, x86_64-darwin ] i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6799,6 +6916,7 @@ dont-distribute-packages: memorable-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] mercury-api: [ i686-linux, x86_64-linux, x86_64-darwin ] merge-bash-history: [ i686-linux, x86_64-linux, x86_64-darwin ] + mergeless: [ i686-linux, x86_64-linux, x86_64-darwin ] merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] messente: [ i686-linux, x86_64-linux, x86_64-darwin ] meta-misc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6977,7 +7095,6 @@ dont-distribute-packages: mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - multi-ghc-travis: [ i686-linux, x86_64-linux, x86_64-darwin ] multiaddr: [ i686-linux, x86_64-linux, x86_64-darwin ] multifile: [ i686-linux, x86_64-linux, x86_64-darwin ] multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7412,6 +7529,7 @@ dont-distribute-packages: perceptron: [ i686-linux, x86_64-linux, x86_64-darwin ] perdure: [ i686-linux, x86_64-linux, x86_64-darwin ] peregrin: [ i686-linux, x86_64-linux, x86_64-darwin ] + perf-analysis: [ i686-linux, x86_64-linux, x86_64-darwin ] perf: [ i686-linux, x86_64-linux, x86_64-darwin ] perfecthash: [ i686-linux, x86_64-linux, x86_64-darwin ] PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7534,6 +7652,7 @@ dont-distribute-packages: PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] + plur: [ i686-linux, x86_64-linux, x86_64-darwin ] png-file: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7631,6 +7750,7 @@ dont-distribute-packages: prettyprinter-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] primesieve: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] + primitive-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7973,6 +8093,7 @@ dont-distribute-packages: req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + require: [ i686-linux, x86_64-linux, x86_64-darwin ] rerebase: [ i686-linux, x86_64-linux, x86_64-darwin ] reroute: [ i686-linux, x86_64-linux, x86_64-darwin ] reserve: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8149,6 +8270,7 @@ dont-distribute-packages: scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants: [ i686-linux, x86_64-linux, x86_64-darwin ] + SciFlow: [ i686-linux, x86_64-linux, x86_64-darwin ] scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] scion: [ i686-linux, x86_64-linux, x86_64-darwin ] scons2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8254,6 +8376,7 @@ dont-distribute-packages: servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-streaming-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8639,6 +8762,7 @@ dont-distribute-packages: Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] storablevector-streamfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + store-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] str: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-ATermLib: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-Sdf2Haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8686,6 +8810,7 @@ dont-distribute-packages: suffixarray: [ i686-linux, x86_64-linux, x86_64-darwin ] SuffixStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] suitable: [ i686-linux, x86_64-linux, x86_64-darwin ] + summoner: [ i686-linux, x86_64-linux, x86_64-darwin ] sunlight: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8790,6 +8915,7 @@ dont-distribute-packages: tamarin-prover-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover: [ i686-linux, x86_64-linux, x86_64-darwin ] Tape: [ i686-linux, x86_64-linux, x86_64-darwin ] + tar-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] target: [ i686-linux, x86_64-linux, x86_64-darwin ] tart: [ i686-linux, x86_64-linux, x86_64-darwin ] task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8803,6 +8929,7 @@ dont-distribute-packages: tasty-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-tap: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-travis: [ i686-linux, x86_64-linux, x86_64-darwin ] + Taxonomy: [ i686-linux, x86_64-linux, x86_64-darwin ] TaxonomyTools: [ i686-linux, x86_64-linux, x86_64-darwin ] TBC: [ i686-linux, x86_64-linux, x86_64-darwin ] TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8942,6 +9069,7 @@ dont-distribute-packages: time-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] time-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] time-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8957,6 +9085,7 @@ dont-distribute-packages: timers-tick: [ i686-linux, x86_64-linux, x86_64-darwin ] timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] + tintin: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] tinyMesh: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9170,6 +9299,10 @@ dont-distribute-packages: unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] unordered-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ] + unpacked-either: [ i686-linux, x86_64-linux, x86_64-darwin ] + unpacked-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] + unpacked-these: [ i686-linux, x86_64-linux, x86_64-darwin ] + unpacked-validation: [ i686-linux, x86_64-linux, x86_64-darwin ] unroll-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] unsafely: [ i686-linux, x86_64-linux, x86_64-darwin ] unscramble: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9194,6 +9327,7 @@ dont-distribute-packages: urldecode: [ i686-linux, x86_64-linux, x86_64-darwin ] urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] UrlDisp: [ i686-linux, x86_64-linux, x86_64-darwin ] + urlencoded: [ i686-linux, x86_64-linux, x86_64-darwin ] URLT: [ i686-linux, x86_64-linux, x86_64-darwin ] urn-random: [ i686-linux, x86_64-linux, x86_64-darwin ] urn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9538,6 +9672,8 @@ dont-distribute-packages: yam-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] yam-transaction-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] yam-transaction-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + yam-web: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaml-pretty-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9639,8 +9775,10 @@ dont-distribute-packages: yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] york-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] yql: [ i686-linux, x86_64-linux, x86_64-darwin ] + yu-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] yu-core: [ i686-linux, x86_64-linux, x86_64-darwin ] yu-launch: [ i686-linux, x86_64-linux, x86_64-darwin ] + yu-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] yuiGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9651,6 +9789,7 @@ dont-distribute-packages: ZEBEDDE: [ i686-linux, x86_64-linux, x86_64-darwin ] zendesk-api: [ i686-linux, x86_64-linux, x86_64-darwin ] zeno: [ i686-linux, x86_64-linux, x86_64-darwin ] + zephyr: [ i686-linux, x86_64-linux, x86_64-darwin ] zeromq-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] zeromq3-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zeromq3-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2f1eb1ad97a8..72c13707f48d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -144,7 +144,16 @@ self: super: builtins.intersectAttrs super { gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; - taffybar = (addPkgconfigDepend super.taffybar pkgs.gtk3).override { dbus = self.dbus_1_0_1; }; + + # Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build + taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; })).override { dbus = self.dbus_1_0_1; }; + + # Specify needed dbus version + dbus-hslogger = super.dbus-hslogger.override { dbus = self.dbus_1_0_1; }; + status-notifier-item = super.status-notifier-item.override { dbus = self.dbus_1_0_1; }; + + # Add necessary reference to gtk3 package + gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3; # Need WebkitGTK, not just webkit. webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3345cade70b5..6acf61979771 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -915,24 +915,26 @@ self: { }) {}; "Allure" = callPackage - ({ mkDerivation, async, base, containers, enummapset-th, filepath + ({ mkDerivation, async, base, containers, enummapset, filepath , LambdaHack, optparse-applicative, random, template-haskell, text , zlib }: mkDerivation { pname = "Allure"; - version = "0.7.1.0"; - sha256 = "0lsyp2rgn5g5d7q4wv13m9p5ayh0aqlzp3b11swhf7br77gg17ym"; + version = "0.8.0.0"; + sha256 = "0mg5srs0mfvdwf898fwkf8ji1722rkc55d0z8d4fb3aq8dvxgsxv"; + revision = "1"; + editedCabalFile = "10b34p2wv4nqldj0yaas9injjizxb151ks15k6wdx976fjpkqjqd"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - async base containers enummapset-th filepath LambdaHack + async base containers enummapset filepath LambdaHack optparse-applicative random template-haskell text zlib ]; testHaskellDepends = [ - base containers enummapset-th filepath LambdaHack - optparse-applicative random template-haskell text zlib + base containers enummapset filepath LambdaHack optparse-applicative + random template-haskell text zlib ]; description = "Near-future Sci-Fi roguelike and tactical squad game"; license = stdenv.lib.licenses.agpl3; @@ -4790,6 +4792,7 @@ self: { ]; description = "Libary to interface with the NCBI Entrez REST service"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Enum" = callPackage @@ -9842,24 +9845,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network - , openssl, time - }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.4.13"; - sha256 = "0izzgyjd0s9whqllwyg8gv2xnsfax9sf8j47zq1d2vmk7mpx2p0j"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - base bytestring integer-gmp network time - ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_4_14" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -9871,7 +9856,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -9954,8 +9938,8 @@ self: { }: mkDerivation { pname = "HsYAML"; - version = "0.1.0.0"; - sha256 = "1vl2fsbs0grgjwcghzqsiijnl7qlv2fgfw2nk9sbcfp81y0bxy3c"; + version = "0.1.1.0"; + sha256 = "1dih7i0c1fayqrz9x27hfhvg0rb0w1m70a702qhbyjr5jczlh6rb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11103,41 +11087,43 @@ self: { "LambdaHack" = callPackage ({ mkDerivation, assert-failure, async, base, base-compat, binary - , bytestring, containers, deepseq, directory, enummapset-th - , filepath, ghc-prim, hashable, hsini, keys, miniutter - , optparse-applicative, pretty-show, random, sdl2, sdl2-ttf, stm - , template-haskell, text, time, transformers, unordered-containers - , vector, vector-binary-instances, zlib + , bytestring, containers, deepseq, directory, enummapset, filepath + , ghc-prim, hashable, hsini, keys, miniutter, optparse-applicative + , pretty-show, random, sdl2, sdl2-ttf, stm, template-haskell, text + , time, transformers, unordered-containers, vector + , vector-binary-instances, zlib }: mkDerivation { pname = "LambdaHack"; - version = "0.7.1.0"; - sha256 = "1k68vjlfcjnyikissv9bmqfg04zhba1318pvhjc9yb1lb2v745d7"; + version = "0.8.0.0"; + sha256 = "1g7lmplcgj2swk2mvams42fjmmiamk0hxhhzgzdv29jlq9gzmfv2"; + revision = "1"; + editedCabalFile = "1l0s7vqv2qpq50352x772584zz4q7ip0z7jc17b72vnipqln7jkd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ assert-failure async base base-compat binary bytestring containers - deepseq directory enummapset-th filepath ghc-prim hashable hsini - keys miniutter optparse-applicative pretty-show random sdl2 - sdl2-ttf stm text time transformers unordered-containers vector + deepseq directory enummapset filepath ghc-prim hashable hsini keys + miniutter optparse-applicative pretty-show random sdl2 sdl2-ttf stm + text time transformers unordered-containers vector vector-binary-instances zlib ]; executableHaskellDepends = [ assert-failure async base base-compat binary bytestring containers - deepseq directory enummapset-th filepath ghc-prim hashable hsini - keys miniutter optparse-applicative pretty-show random stm + deepseq directory enummapset filepath ghc-prim hashable hsini keys + miniutter optparse-applicative pretty-show random stm template-haskell text time transformers unordered-containers vector vector-binary-instances zlib ]; testHaskellDepends = [ assert-failure async base base-compat binary bytestring containers - deepseq directory enummapset-th filepath ghc-prim hashable hsini - keys miniutter optparse-applicative pretty-show random stm + deepseq directory enummapset filepath ghc-prim hashable hsini keys + miniutter optparse-applicative pretty-show random stm template-haskell text time transformers unordered-containers vector vector-binary-instances zlib ]; - description = "A game engine library for roguelike dungeon crawlers"; + description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -12406,23 +12392,6 @@ self: { }) {}; "MonadRandom" = callPackage - ({ mkDerivation, base, fail, mtl, primitive, random, transformers - , transformers-compat - }: - mkDerivation { - pname = "MonadRandom"; - version = "0.5.1"; - sha256 = "11qdfghizww810vdj9ac1f5qr5kdmrk40l6w6qh311bjh290ygwy"; - revision = "1"; - editedCabalFile = "19242r11a7iqr8dnbxsac04c3ylh7xkan70pdv5k3jzcmfwn4shd"; - libraryHaskellDepends = [ - base fail mtl primitive random transformers transformers-compat - ]; - description = "Random-number generation monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "MonadRandom_0_5_1_1" = callPackage ({ mkDerivation, base, mtl, primitive, random, transformers , transformers-compat }: @@ -12435,7 +12404,6 @@ self: { ]; description = "Random-number generation monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MonadRandomLazy" = callPackage @@ -16216,6 +16184,7 @@ self: { ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ScratchFs" = callPackage @@ -17575,6 +17544,7 @@ self: { ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TaxonomyTools" = callPackage @@ -22950,19 +22920,6 @@ self: { ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }: mkDerivation { pname = "alarmclock"; - version = "0.4.0.3"; - sha256 = "0phgcmji4jrmyia6w05wqllrdl2hnsyxfkbh68dlgi7gn0c5nvxn"; - libraryHaskellDepends = [ - async base clock stm time unbounded-delays - ]; - description = "Wake up and perform an action at a certain time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alarmclock_0_4_0_4" = callPackage - ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }: - mkDerivation { - pname = "alarmclock"; version = "0.4.0.4"; sha256 = "0jrd0855mxx3hqxnp7g1xg60p9d4i5km9imxajy0q3k94049hxyx"; libraryHaskellDepends = [ @@ -22970,7 +22927,6 @@ self: { ]; description = "Wake up and perform an action at a certain time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alea" = callPackage @@ -26784,6 +26740,7 @@ self: { testHaskellDepends = [ base tasty tasty-hspec ]; description = "Convert sprite frames to animate files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "animate-preview" = callPackage @@ -27265,6 +27222,7 @@ self: { ]; description = "Get all your structure and rip it apart"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apecs" = callPackage @@ -30098,8 +30056,10 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.10.2.0"; - sha256 = "04pclxd3wx582fx6l6fj7ggs52f0vvdag4rg17zh6xh562qbccsc"; + version = "2.10.2.2"; + sha256 = "080wkmv04zdzm86zrmgvyyfv7gkjxfr1fwy9470vviy7hywh1xin"; + revision = "1"; + editedCabalFile = "02wam77mcbknvfx8hb0d9d8m9ppvrd1w3xklwky5fz2dv071alm3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -32014,38 +31974,6 @@ self: { }) {}; "b9" = callPackage - ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes - , bytestring, conduit, conduit-extra, ConfigFile, directory - , filepath, free, hashable, hspec, hspec-expectations, lens, mtl - , optparse-applicative, parallel, parsec, pretty, pretty-show - , process, QuickCheck, random, shake, syb, template, text, time - , transformers, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "b9"; - version = "0.5.47"; - sha256 = "1jnfci7px5hf6i729mz1fbx5sfg35q8l3663ls6pkf6b4kx8qfyz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bifunctors binary boxes bytestring conduit - conduit-extra ConfigFile directory filepath free hashable lens mtl - parallel parsec pretty pretty-show process QuickCheck random shake - syb template text time transformers unordered-containers vector - yaml - ]; - executableHaskellDepends = [ - base bytestring directory lens optparse-applicative - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations QuickCheck text - unordered-containers vector yaml - ]; - description = "A tool and library for building virtual machine images"; - license = stdenv.lib.licenses.mit; - }) {}; - - "b9_0_5_49" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bifunctors , binary, boxes, bytestring, conduit, conduit-extra, ConfigFile , directory, filepath, free, hashable, hspec, hspec-expectations @@ -32075,7 +32003,6 @@ self: { ]; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "babl" = callPackage @@ -32451,25 +32378,12 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; - version = "0.1.0.6"; - sha256 = "1arlyjaaq8df2q121r9lc23wacn02ncdx5b7s8yszp6szx5jivap"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_1_0_7" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; version = "0.1.0.7"; sha256 = "196ldac7aljysw8m4nzdyf5mygswbckkvd6axm8a9yw4vchzcjks"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "banwords" = callPackage @@ -32762,6 +32676,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-prelude_1_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-prelude"; + version = "1.3"; + sha256 = "1zk728sd09hh2r4xwz4lazsrrgg5cshydn64932sm0vckplndk73"; + libraryHaskellDepends = [ base ]; + description = "The most complete prelude formed solely from the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-unicode-symbols" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -32978,26 +32904,26 @@ self: { "baserock-schema" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, docopt, errors - , gitlab-api, hspec, lens, mtl, QuickCheck, text, transformers - , turtle, unordered-containers, yaml + , flippers, gitlab-api, hspec, microlens-platform, mtl, QuickCheck + , rio, yaml, yaml-pretty-extras }: mkDerivation { pname = "baserock-schema"; - version = "0.0.1.5"; - sha256 = "0dc9wsdxgp0jx7mnq0c1dx48y6khjr9zjg3wjlifyx3k3k7yn2i5"; + version = "0.0.2.0"; + sha256 = "02lz48177jrnn7fwk7kjlh38a6kv7f197skf69mx0xgs88xjwrn9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - algebraic-graphs base bytestring errors lens mtl text transformers - turtle unordered-containers yaml + algebraic-graphs base errors flippers microlens-platform mtl rio + yaml yaml-pretty-extras ]; executableHaskellDepends = [ - algebraic-graphs base bytestring docopt errors gitlab-api lens mtl - text transformers turtle unordered-containers yaml + algebraic-graphs base docopt errors flippers gitlab-api + microlens-platform mtl rio yaml yaml-pretty-extras ]; testHaskellDepends = [ - algebraic-graphs base bytestring errors hspec lens mtl QuickCheck - text transformers turtle unordered-containers yaml + algebraic-graphs base bytestring errors flippers hspec + microlens-platform mtl QuickCheck rio yaml yaml-pretty-extras ]; description = "Baserock Definitions Schema"; license = stdenv.lib.licenses.bsd3; @@ -33045,6 +32971,7 @@ self: { ]; description = "Lifting values from base types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "basic-cpuid" = callPackage @@ -33399,6 +33326,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ostree;}; + "bdcs-api" = callPackage + ({ mkDerivation, aeson, async, base, bdcs, bifunctors, bytestring + , concurrent-extra, cond, containers, directory, extra, filepath + , gi-ggit, gi-gio, gi-glib, gitrev, haskell-gi-base, hspec, htoml + , http-client, http-media, http-types, libgit2-glib, monad-logger + , monad-loops, mtl, network, persistent, persistent-sqlite + , resourcet, safe-exceptions, semver, servant-client + , servant-options, servant-server, split, stm, string-conversions + , string-qq, tar, temporary, text, time, transformers, unix, uuid + , wai, wai-cors, warp + }: + mkDerivation { + pname = "bdcs-api"; + version = "0.1.0"; + sha256 = "1hnzbmihpq4nr0yxpwsaq5har2ws20zaialx98g9ws1k8k1kgzh0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bdcs bifunctors bytestring concurrent-extra cond + containers directory extra filepath gi-ggit gi-gio gi-glib gitrev + haskell-gi-base htoml http-media http-types monad-logger + monad-loops mtl network persistent persistent-sqlite resourcet + safe-exceptions semver servant-options servant-server split stm + string-conversions tar temporary text time transformers unix uuid + wai wai-cors warp + ]; + libraryPkgconfigDepends = [ libgit2-glib ]; + executableHaskellDepends = [ base safe-exceptions ]; + testHaskellDepends = [ + aeson base bdcs bytestring cond directory filepath hspec + http-client monad-loops safe-exceptions servant-client + servant-server string-conversions string-qq temporary text time wai + warp + ]; + description = "BDCS API Server"; + license = stdenv.lib.licenses.gpl3; + }) {inherit (pkgs.gnome3) libgit2-glib;}; + "bdd" = callPackage ({ mkDerivation, base, directory, HUnit, mtl, process , test-framework, test-framework-hunit, transformers @@ -33533,24 +33498,6 @@ self: { }: mkDerivation { pname = "beam-sqlite"; - version = "0.3.2.0"; - sha256 = "06lmsajdlqc2178p4lkgwv2hh49dmjygrfjk081sr2xbhgnslr9s"; - libraryHaskellDepends = [ - aeson attoparsec base beam-core beam-migrate bytestring dlist free - hashable mtl network-uri scientific sqlite-simple text time unix - ]; - description = "Beam driver for SQLite"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "beam-sqlite_0_3_2_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate - , bytestring, dlist, free, hashable, mtl, network-uri, scientific - , sqlite-simple, text, time, unix - }: - mkDerivation { - pname = "beam-sqlite"; version = "0.3.2.1"; sha256 = "1ijgqlywb7gvig32zrhgryq0nkfabyxvxy81c36x9zfpyj36x04k"; libraryHaskellDepends = [ @@ -33764,6 +33711,7 @@ self: { testHaskellDepends = [ base split text ]; description = "Plot and compare benchmarks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "benchmark-function" = callPackage @@ -34061,25 +34009,6 @@ self: { }: mkDerivation { pname = "bhoogle"; - version = "0.1.2.6"; - sha256 = "0p6zh1rh80hzrm36w6d5hr6qjkfc71cr96dk9shrndnxlp8vlxsn"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base brick bytestring containers directory filepath hoogle lens - process protolude text time vector vty - ]; - description = "Simple terminal GUI for local hoogle"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bhoogle_0_1_2_7" = callPackage - ({ mkDerivation, base, brick, bytestring, containers, directory - , filepath, hoogle, lens, process, protolude, text, time, vector - , vty - }: - mkDerivation { - pname = "bhoogle"; version = "0.1.2.7"; sha256 = "0mcqkiddg7lxzambfqwqyqbppn7996a3kjyh1a8fv6h4xqcaf9pz"; isLibrary = false; @@ -34090,7 +34019,6 @@ self: { ]; description = "Simple terminal GUI for local hoogle"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bibdb" = callPackage @@ -34834,39 +34762,6 @@ self: { }: mkDerivation { pname = "binary-tagged"; - version = "0.1.4.2"; - sha256 = "1167rlb2lnib1vin9p75hp7fzcjqxljlw56bhmkwn05c5f6an7ri"; - revision = "8"; - editedCabalFile = "0a8xcrx2lm8yzcnrf76c1wynn238i87yz3lqlgrg5n9csdc0bhj1"; - libraryHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - generics-sop hashable nats scientific semigroups SHA tagged text - time unordered-containers vector - ]; - testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary binary-orphans - bytestring containers generics-sop hashable nats - quickcheck-instances scientific semigroups SHA tagged tasty - tasty-quickcheck text time unordered-containers vector - ]; - benchmarkHaskellDepends = [ - aeson array base base16-bytestring binary binary-orphans bytestring - containers criterion deepseq generics-sop hashable nats scientific - semigroups SHA tagged text time unordered-containers vector - ]; - description = "Tagged binary serialisation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "binary-tagged_0_1_5" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, binary-orphans, bytestring, containers, criterion - , deepseq, generics-sop, hashable, nats, quickcheck-instances - , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck - , text, time, unordered-containers, vector - }: - mkDerivation { - pname = "binary-tagged"; version = "0.1.5"; sha256 = "1s05hrak9mg8klid5jsdqh1i7d1zyzkpdbdc969g2s9h06lk7dyl"; libraryHaskellDepends = [ @@ -34887,7 +34782,6 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-tree" = callPackage @@ -37168,6 +37062,7 @@ self: { testHaskellDepends = [ base colonnade doctest ]; description = "Helper functions for using blaze-html with colonnade"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-from-html" = callPackage @@ -37912,6 +37807,7 @@ self: { executableHaskellDepends = [ base containers hmatrix ]; description = "Boltzmann sampler compiler for combinatorial systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boltzmann-samplers" = callPackage @@ -40473,8 +40369,8 @@ self: { }: mkDerivation { pname = "c-mosquitto"; - version = "0.1.4.1"; - sha256 = "0adb0sjdvdl3i2mqrpcvdqbi9w7bwcwc7y33ibcsyrgx542jf831"; + version = "0.1.5.0"; + sha256 = "07pqy6809lma8b69s91m93ibkag7irma07axnhkhsswkhd2kf5im"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40591,6 +40487,31 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "c2hs_0_28_5" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , dlist, filepath, HUnit, language-c, pretty, process, shelly + , test-framework, test-framework-hunit, text, transformers + }: + mkDerivation { + pname = "c2hs"; + version = "0.28.5"; + sha256 = "1xid997cc38rym6hsgv8xz5dg8jcsh8hs5rrwaxkij7mc09an45x"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + array base bytestring containers directory dlist filepath + language-c pretty process + ]; + testHaskellDepends = [ + base filepath HUnit shelly test-framework test-framework-hunit text + transformers + ]; + description = "C->Haskell FFI tool that gives some cross-language type safety"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "c2hs-extra" = callPackage ({ mkDerivation, base, c2hs }: mkDerivation { @@ -40969,6 +40890,7 @@ self: { doCheck = false; description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-info" = callPackage @@ -41250,24 +41172,6 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.12.3"; - sha256 = "0nid91q38k4b3hgjrhv6sy68y5h74f85j08991hmfbwzd727dzfg"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory filepath http-client - http-client-tls http-conduit process time unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_0_12_4" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, process, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; version = "0.12.4"; sha256 = "1wzsbnm57wc38ppqh8fdp8qnqxham5qia96qlgya4b2wh3q6d932"; isLibrary = false; @@ -41278,7 +41182,6 @@ self: { ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -44410,23 +44313,11 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "charsetdetect-ae"; - version = "1.1.0.3"; - sha256 = "15kf9g708ics81s3gj4vkx4xcvywj2fripf0g9p29v4xliwd9m7y"; - libraryHaskellDepends = [ base bytestring ]; - description = "Character set detection using Mozilla's Universal Character Set Detector"; - license = "LGPL"; - }) {}; - - "charsetdetect-ae_1_1_0_4" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "charsetdetect-ae"; version = "1.1.0.4"; sha256 = "0321j2kmlvf88bhlbi8ddnzgbckq37sfb7nm7r0dvar6626s9flv"; libraryHaskellDepends = [ base bytestring ]; description = "Character set detection using Mozilla's Universal Character Set Detector"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chart-histogram" = callPackage @@ -44451,8 +44342,8 @@ self: { }: mkDerivation { pname = "chart-unit"; - version = "0.6.2.0"; - sha256 = "0y6xha20ckj0n0yih1zwwhyp55q1jcdmq06caid9biji8nkahzb0"; + version = "0.6.3.0"; + sha256 = "0r8c2g4jq2ldxn8msyyfa8r04hw5acgvb70q77jhh9v9jk5m93aa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45700,6 +45591,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Clifford Algebra of three dimensional space"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cl3-hmatrix-interface" = callPackage @@ -45711,6 +45603,7 @@ self: { libraryHaskellDepends = [ base cl3 hmatrix ]; description = "Interface to/from Cl3 and HMatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cl3-linear-interface" = callPackage @@ -45722,6 +45615,7 @@ self: { libraryHaskellDepends = [ base cl3 linear ]; description = "Interface to/from Cl3 and Linear"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clac" = callPackage @@ -48938,6 +48832,8 @@ self: { pname = "compact"; version = "0.1.0.1"; sha256 = "0lynnbvsyr07driy7lm9llrhvmk9wprjdbfc34svzfwldghk71gf"; + revision = "1"; + editedCabalFile = "0bdp226gx3gr1hg68xydxhkfr0h469ay60h0s1ywar19y3m8dn1p"; libraryHaskellDepends = [ base binary bytestring ghc-compact ]; testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; @@ -50284,36 +50180,6 @@ self: { "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit - , conduit-combinators, conduit-extra, containers, deepseq - , directory, exceptions, HUnit, lzma-conduit, monad-control, mtl - , resourcet, stm, stm-conduit, streaming-commons, test-framework - , test-framework-hunit, test-framework-th, transformers - , unliftio-core, vector - }: - mkDerivation { - pname = "conduit-algorithms"; - version = "0.0.8.0"; - sha256 = "0i8ikrh3fpwfqli8ksfayc20kml1wacl0rgv8pc00lgrsmd8r9i8"; - libraryHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq exceptions lzma-conduit - monad-control mtl resourcet stm stm-conduit streaming-commons - transformers unliftio-core vector - ]; - testHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory exceptions HUnit - lzma-conduit monad-control mtl resourcet stm stm-conduit - streaming-commons test-framework test-framework-hunit - test-framework-th transformers unliftio-core vector - ]; - description = "Conduit-based algorithms"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "conduit-algorithms_0_0_8_1" = callPackage - ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, criterion , deepseq, directory, exceptions, HUnit, lzma-conduit , monad-control, mtl, pqueue, resourcet, stm, stm-conduit @@ -51657,6 +51523,7 @@ self: { libraryHaskellDepends = [ base primitive ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "continue" = callPackage @@ -52899,8 +52766,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.5.0"; - sha256 = "0x8l31zbgcx4idcvpjsipsc3k610hj6g6rjpxbbpaz7zcb2ykvn1"; + version = "3.5.1"; + sha256 = "01kknyznwyxd5cgw9q21wmzykl1yiava0s1y3vrrdxzvixk1f89l"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -54977,6 +54844,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "csv-conduit_0_7_0_0" = callPackage + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , conduit, conduit-extra, containers, data-default, directory + , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl + , primitive, resourcet, semigroups, test-framework + , test-framework-hunit, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "csv-conduit"; + version = "0.7.0.0"; + sha256 = "1rzshr0py23xi1cfgsghnhgy65hyhlxhlnb6qyfzfsqqshmy13s7"; + libraryHaskellDepends = [ + array attoparsec base blaze-builder bytestring conduit + conduit-extra containers data-default exceptions ghc-prim mmorph + monad-control mtl primitive resourcet semigroups text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers directory HUnit mtl primitive + test-framework test-framework-hunit text transformers vector + ]; + description = "A flexible, fast, conduit-based CSV parser library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "csv-enumerator" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , bytestring, containers, directory, enumerator, safe, transformers @@ -56906,14 +56800,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_4_2_0_0" = callPackage + "data-diverse-lens_4_2_0_1" = callPackage ({ mkDerivation, base, data-diverse, data-has, hspec, lens , profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "4.2.0.0"; - sha256 = "0skjgkv81sjmpggk57ac33f84qv0in04hnwyy23zk9g9cbqz0qwr"; + version = "4.2.0.1"; + sha256 = "07nwbvjhwx3qyh2ksk027qgci91nsckgd4yskkbafndpiri1fxds"; libraryHaskellDepends = [ base data-diverse data-has lens profunctors tagged ]; @@ -59953,8 +59847,8 @@ self: { }: mkDerivation { pname = "dependency"; - version = "1.1.0.0"; - sha256 = "1874zvkv5vkx9s6864kmpihq7514hywzb2a1zhqn3f6qf27bnj9c"; + version = "1.2.0.0"; + sha256 = "19b7f0j5b34yaf5gk8kasg275sphjs5bsgbn4cfi1fm874h5612m"; libraryHaskellDepends = [ ansi-wl-pprint base binary containers deepseq micro-recursion-schemes microlens @@ -61630,13 +61524,19 @@ self: { }) {}; "diet" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, contiguous, primitive + , QuickCheck, quickcheck-classes, tasty, tasty-quickcheck + }: mkDerivation { pname = "diet"; - version = "0.0.1"; - sha256 = "0qkyfmys5k6la10dvi8wsmw120xfarjblpkr33xiazll2m9845wh"; - libraryHaskellDepends = [ base ]; - description = "Discrete Interval Encoding Tree"; + version = "0.1.0.0"; + sha256 = "17mqgkxjpimr1fipiszabf8djxp0k63gmd3l3dbbsr49cfnnimr2"; + libraryHaskellDepends = [ base contiguous primitive ]; + testHaskellDepends = [ + base containers primitive QuickCheck quickcheck-classes tasty + tasty-quickcheck + ]; + description = "Discrete Interval Encoding Trees"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62871,6 +62771,7 @@ self: { ]; description = "AWS Lambda backend for distributed-fork"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process" = callPackage @@ -63765,29 +63666,6 @@ self: { }: mkDerivation { pname = "dns"; - version = "3.0.3"; - sha256 = "0m7xgf5vgh3xj5yrv8hyvhx3lligx1xrnq22a9b6s2prbywyllfv"; - libraryHaskellDepends = [ - async attoparsec auto-update base base64-bytestring binary - bytestring containers cryptonite iproute mtl network psqueues safe - time - ]; - testHaskellDepends = [ - base bytestring doctest hspec iproute network QuickCheck word8 - ]; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_3_0_4" = callPackage - ({ mkDerivation, async, attoparsec, auto-update, base - , base64-bytestring, binary, bytestring, containers, cryptonite - , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe - , time, word8 - }: - mkDerivation { - pname = "dns"; version = "3.0.4"; sha256 = "1aa4zb9zkk244rndimrq8maxj9qrmz3rb13v9n8jblmp6ssk6d3v"; libraryHaskellDepends = [ @@ -63801,7 +63679,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -66554,6 +66431,7 @@ self: { ]; description = "A monad for rewriting things"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "edit-distance" = callPackage @@ -66789,22 +66667,22 @@ self: { "egison" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq - , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit, mtl - , parallel, parsec, process, random, regex-tdfa, test-framework - , test-framework-hunit, text, transformers, unordered-containers - , vector + , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline + , HUnit, mtl, parallel, parsec, process, random, regex-tdfa, split + , test-framework, test-framework-hunit, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "egison"; - version = "3.7.10"; - sha256 = "129g0xw951pkizs4rmbn5mhy1w0lhqw06hj2sr8sf7r2wnqmn0dy"; + version = "3.7.11"; + sha256 = "0k7dx9lnr8gj9nzxijcxwiivy5pi62jfld5hcskq9yqfpy5x618f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base containers directory ghc ghc-paths haskeline mtl - parallel parsec process random regex-tdfa text transformers - unordered-containers vector + array base containers directory ghc ghc-paths hashable haskeline + mtl parallel parsec process random regex-tdfa split text + transformers unordered-containers vector ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline @@ -69345,6 +69223,7 @@ self: { ]; description = "Espial is an open-source, web-based bookmarking server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "esqueleto" = callPackage @@ -70127,25 +70006,6 @@ self: { }: mkDerivation { pname = "eventsource-api"; - version = "1.3.0"; - sha256 = "1xv1j0dyvbl319513ycyl8857jy3gh0dcjvwxfxz4ddsw0sld3bx"; - libraryHaskellDepends = [ - aeson base bytestring containers enclosed-exceptions lifted-async - lifted-base monad-control monad-loops mtl stm stm-chans - string-conversions text transformers-base unordered-containers uuid - ]; - description = "Provides an eventsourcing high level API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "eventsource-api_1_3_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , enclosed-exceptions, lifted-async, lifted-base, monad-control - , monad-loops, mtl, stm, stm-chans, string-conversions, text - , transformers-base, unordered-containers, uuid - }: - mkDerivation { - pname = "eventsource-api"; version = "1.3.1"; sha256 = "0dlrbc3xxijz1hf8w34lvk70ic6gsfb9j5z3ldqdssvv9c8fksy2"; libraryHaskellDepends = [ @@ -70155,7 +70015,6 @@ self: { ]; description = "Provides an eventsourcing high level API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eventsource-geteventstore-store" = callPackage @@ -70249,41 +70108,6 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.1.3"; - sha256 = "076pxyaslvw4kiqqbhapvqi0nr501l2z8nvajkqw1d9iasgwcfxz"; - libraryHaskellDepends = [ - aeson array base bifunctors bytestring cereal clock connection - containers dns dotnet-timespan ekg-core exceptions fast-logger - hashable http-client interpolate lifted-async lifted-base machines - monad-control monad-logger mono-traversable mtl protobuf random - safe-exceptions semigroups stm stm-chans text time - transformers-base unordered-containers uuid - ]; - testHaskellDepends = [ - aeson async base bytestring cereal connection containers - dotnet-timespan exceptions fast-logger hashable lifted-async - lifted-base monad-control mono-traversable protobuf safe-exceptions - semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time - transformers-base unordered-containers uuid - ]; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "eventstore_1_1_4" = callPackage - ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring - , cereal, clock, connection, containers, dns, dotnet-timespan - , ekg-core, exceptions, fast-logger, hashable, http-client - , interpolate, lifted-async, lifted-base, machines, monad-control - , monad-logger, mono-traversable, mtl, protobuf, random - , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec - , tasty-hunit, text, time, transformers-base, unordered-containers - , uuid - }: - mkDerivation { - pname = "eventstore"; version = "1.1.4"; sha256 = "0xhhw5dxq1h4w7dpngrhnaipzhfpzvs4y7jdvimzk86hvgv0mmfj"; libraryHaskellDepends = [ @@ -70935,6 +70759,7 @@ self: { ]; description = "Linear programming over exponent pairs"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expand" = callPackage @@ -71418,22 +71243,6 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.6"; - sha256 = "17d0fd2hng1bwgdl8ms7vzjb4zzwk8cljci5wsd5ninxi9m6x6br"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_6_8" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, time, unix - }: - mkDerivation { - pname = "extra"; version = "1.6.8"; sha256 = "1kngk46nkrjkpqaj845c6r823r8aawlk1ir693lr6rskhy1k7dlp"; libraryHaskellDepends = [ @@ -71442,7 +71251,6 @@ self: { testHaskellDepends = [ base directory filepath QuickCheck unix ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -72167,6 +71975,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; + "fastsum" = callPackage + ({ mkDerivation, base, ghc-prim, hashable, template-haskell }: + mkDerivation { + pname = "fastsum"; + version = "0.1.0.0"; + sha256 = "19an2yx0x10mj1lxwh3sqj5zs8fcwbw1zj530sxs64127l2dby57"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ghc-prim hashable template-haskell + ]; + description = "A fast open-union type suitable for 100+ contained alternatives"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fathead-util" = callPackage ({ mkDerivation, base, bytestring, cassava, hxt, network-uri, text }: @@ -77145,21 +76968,24 @@ self: { }) {}; "freq" = callPackage - ({ mkDerivation, base, bytestring, containers, gauge, hedgehog - , primitive + ({ mkDerivation, base, bytestring, containers, deepseq, gauge + , hedgehog, primitive }: mkDerivation { pname = "freq"; - version = "0.1.0.3"; - sha256 = "0b9ji45n6yhz24x29adyhwmrwp9xyhl2ydm0kk5a9jqv9lddddkp"; + version = "0.1.0.4"; + sha256 = "1h5lhsnm89g4g46sqiym2zf855skinirygqllf9grj6vk4qbls9n"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring containers primitive ]; + libraryHaskellDepends = [ + base bytestring containers deepseq primitive + ]; executableHaskellDepends = [ base bytestring containers ]; testHaskellDepends = [ base bytestring containers hedgehog ]; benchmarkHaskellDepends = [ base bytestring containers gauge ]; description = "Are you ready to get freaky?"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fresco-binding" = callPackage @@ -85513,8 +85339,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.41"; - sha256 = "1q3g5yikm0n1q2n98iy1j203fi11hy9cfdm6qgcx2ib3b4b2z613"; + version = "0.3.44"; + sha256 = "11khp73xa1vy6w5plk644ksgv47q6j4y3jmxds6iv90mqv47z0al"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92329,43 +92155,6 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.12.2.0"; - sha256 = "1bkr94dakfwq86pm68r61x4g2xmcsliqn8lxgp2jkf8603mjla47"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary blaze-html blaze-markup bytestring containers - cryptohash data-default deepseq directory file-embed filepath - fsnotify http-conduit http-types lrucache mtl network-uri - optparse-applicative pandoc pandoc-citeproc parsec process random - regex-tdfa resourcet scientific tagsoup text time - time-locale-compat unordered-containers vector wai wai-app-static - warp yaml - ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base bytestring containers filepath QuickCheck tasty tasty-hunit - tasty-quickcheck text unordered-containers yaml - ]; - testToolDepends = [ utillinux ]; - description = "A static website compiler library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) utillinux;}; - - "hakyll_4_12_3_0" = callPackage - ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring - , containers, cryptohash, data-default, deepseq, directory - , file-embed, filepath, fsnotify, http-conduit, http-types - , lrucache, mtl, network-uri, optparse-applicative, pandoc - , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa - , resourcet, scientific, tagsoup, tasty, tasty-hunit - , tasty-quickcheck, text, time, time-locale-compat - , unordered-containers, utillinux, vector, wai, wai-app-static - , warp, yaml - }: - mkDerivation { - pname = "hakyll"; version = "4.12.3.0"; sha256 = "1cczcca2h5spvrq8z2nm5ygphcrjfm6k725ppbcc05c4w49dqwm4"; isLibrary = true; @@ -92388,7 +92177,6 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -92795,6 +92583,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hall-symbols" = callPackage + ({ mkDerivation, base, doctest, hspec, matrix, matrix-as-xyz + , parsec, QuickCheck + }: + mkDerivation { + pname = "hall-symbols"; + version = "0.1.0.2"; + sha256 = "05jp1l5v9vz4ai9pbz6nwcm3mzxx0k2nsj85ryi2nl9pkhfwa0l4"; + libraryHaskellDepends = [ base doctest matrix parsec ]; + testHaskellDepends = [ + base doctest hspec matrix matrix-as-xyz parsec QuickCheck + ]; + description = "Symmetry operations generater of Hall Symbols"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "halma" = callPackage ({ mkDerivation, aeson, base, containers, data-default , diagrams-lib, grid, HUnit, QuickCheck, test-framework @@ -93319,32 +93123,6 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.5.5"; - sha256 = "1imgfnn58cmfi383zfi0flx8w2430f5kplsy2m27djy5fv6brmpv"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_5_6" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; version = "0.3.5.6"; sha256 = "0viv359hv3wzdhnfzmq4ynbxyr3a347q7ixarwff85nn9zx7kw2c"; isLibrary = true; @@ -93362,7 +93140,6 @@ self: { ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -93414,6 +93191,7 @@ self: { ]; description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps"; license = "AGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happlets-lib-gtk" = callPackage @@ -93435,6 +93213,7 @@ self: { ]; description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\"."; license = "AGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happraise" = callPackage @@ -94873,19 +94652,6 @@ self: { ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { pname = "hashtables"; - version = "1.2.3.0"; - sha256 = "19bkpx43f3b5mya4jkygiafw402hvazawp6qr69h3wqkc6xv8mpr"; - libraryHaskellDepends = [ - base ghc-prim hashable primitive vector - ]; - description = "Mutable hash tables in the ST monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hashtables_1_2_3_1" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: - mkDerivation { - pname = "hashtables"; version = "1.2.3.1"; sha256 = "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg"; libraryHaskellDepends = [ @@ -94893,7 +94659,6 @@ self: { ]; description = "Mutable hash tables in the ST monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashtables-plus" = callPackage @@ -95578,34 +95343,6 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.21.2"; - sha256 = "0g32zgj89n1nihldvn756bz0z25h1ip8as2xvp3d10prx92i4qgi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring Cabal containers directory filepath - haskell-gi-base mtl pretty-show process regex-tdfa safe text - transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - executableHaskellDepends = [ - base containers directory filepath haskell-gi-base pretty-show text - ]; - testHaskellDepends = [ base doctest ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib; - inherit (pkgs.gnome3) gobjectIntrospection;}; - - "haskell-gi_0_21_3" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers - , directory, doctest, filepath, glib, gobjectIntrospection - , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe - , text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; version = "0.21.3"; sha256 = "09smnzg6kqjyb7m281k8w3y6vabws41snp9wkh8449s0ya3ndbn0"; isLibrary = true; @@ -96032,6 +95769,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-overridez" = callPackage + ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring + , Cabal, exceptions, foldl, managed, neat-interpolation + , network-uri, optparse-applicative, system-fileio, system-filepath + , text, turtle + }: + mkDerivation { + pname = "haskell-overridez"; + version = "0.10.0.1"; + sha256 = "0p50hsnj57hjd2sngcamicjp1yj9h4fk9jyp37ygy1j0yzyhn3a5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-casing attoparsec base bytestring Cabal exceptions + foldl managed neat-interpolation network-uri optparse-applicative + system-fileio system-filepath text turtle + ]; + description = "Manage nix overrides for haskell packages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-packages" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl @@ -98317,8 +98075,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.3.0.1"; - sha256 = "19a31qg4fj74qcjrf6ng11za7zbywg08hnls4pri816fwkjdjs9k"; + version = "0.3.0.2"; + sha256 = "1yrqq9lpvrvqvxhrkflyi9fy7nzkga5r4pqn24c939jxi83ncvl1"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -98347,8 +98105,8 @@ self: { ({ mkDerivation, base-prelude, hasql, resource-pool, time }: mkDerivation { pname = "hasql-pool"; - version = "0.4.3"; - sha256 = "08fzh0y1cxaslp8ia26p9jhs3dckjfdvmiqw1lasdabb7ij82i0j"; + version = "0.4.3.1"; + sha256 = "1hjlfxlakzqjghm25a29y7rhfk2m9bhsjfkbqfk9z1221qybwg6s"; libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; @@ -98456,8 +98214,8 @@ self: { }: mkDerivation { pname = "hasql-transaction"; - version = "0.6"; - sha256 = "00dxm78wscj88zb6wbyg48ps4a5cc41jbbknjrmxlgp0iw4hr06b"; + version = "0.6.0.1"; + sha256 = "0fw207hnpqg1r7ypwfqj5jpi91dx73q1syr1jisrhf78j3yw8rni"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers @@ -100318,30 +100076,6 @@ self: { ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, slave-thread, stm, test-framework - , test-framework-hunit, text, time, unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.10.1"; - sha256 = "1xzma70f1p6zfihwpsnc23bdzw09yg50pig7knkj6bxkv19czbsn"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq errors HTTP mtl - network network-uri resource-pool scanner stm text time - unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring doctest HUnit mtl slave-thread stm - test-framework test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedis_0_10_2" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri - , resource-pool, scanner, slave-thread, stm, test-framework , test-framework-hunit, text, time, tls, unordered-containers , vector }: @@ -100361,7 +100095,6 @@ self: { benchmarkHaskellDepends = [ base mtl time ]; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -102439,6 +102172,7 @@ self: { ]; description = "Examples to accompany the book \"Haskell in Depth\""; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hidapi" = callPackage @@ -103925,6 +103659,8 @@ self: { pname = "hledger"; version = "1.9.1"; sha256 = "13arzk1l2hxmi8baa68kvl2sha0na34h0dl6isbfpvgnp7w1c0b3"; + revision = "1"; + editedCabalFile = "0qmvkw2zbcpjmkf71janpdpdha45yi29f9kv54rxqbckkh1ziych"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104096,6 +103832,8 @@ self: { pname = "hledger-lib"; version = "1.9.1"; sha256 = "0yxgx4bpqn8vchrfp07d1fqmsscj8w5g63nqd2n49r29d6i5q5az"; + revision = "1"; + editedCabalFile = "1j7yhnjkiw2vm63d6va18kknjxkywb2j0h525ys4z3y6840i8b8k"; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory extra @@ -104126,6 +103864,8 @@ self: { pname = "hledger-ui"; version = "1.9.1"; sha256 = "18ar9lja583rg06q9dbnrpify6hj99444fjw2z54lr54587151v0"; + revision = "1"; + editedCabalFile = "0dy5vrm969cqp4mz31524z8w1m3lznrr17kgn204rgq91j7zzwx2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104170,6 +103910,8 @@ self: { pname = "hledger-web"; version = "1.9.2"; sha256 = "0b533vs5vrk4wpwgf23l7rvijq4qpi6w5nql2hsjwl3xk2ihfpv3"; + revision = "1"; + editedCabalFile = "1njgbfl71iif3f7z3kkyqgab98md93a56mpl6laq0kw4azgdsajy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106404,8 +106146,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.4.0"; - sha256 = "186pb32mqwvb5n1a9v2p0cs3g01lrdw5j3p3ddjqdkss7mq6sacz"; + version = "0.5.0"; + sha256 = "08i15jbn7k21qfmmi1f8151bakqivbk440gi44jjnndhkdj8lwwa"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -106420,8 +106162,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.4.0"; - sha256 = "0dk5xhxiw697pb1df544yixsfhiivpp8irllvvjbij7hfbivi409"; + version = "0.5.0"; + sha256 = "0cv1idp7i8zqhhrf107xkscghq9j111mfcpxvrshdibsycizlwp0"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; @@ -106434,8 +106176,8 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "hoppy-runtime"; - version = "0.4.0"; - sha256 = "0vi1i2wa64gdxsc3705vpmimkajf3dz6dakxils1alyxp5ih8f4z"; + version = "0.5.0"; + sha256 = "089dqnnczknir9q9mwdh5z9jzb5wsw4bmqqi8spibxk8lna4cvqs"; libraryHaskellDepends = [ base Cabal containers directory filepath ]; @@ -106448,8 +106190,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.4.0"; - sha256 = "0kb9myfnradifyihigjw08navl5fwcfqznqrp9xjmkwkp8k2h0p5"; + version = "0.5.0"; + sha256 = "1x4a4z434nhkgd5nndwrj3y9zm3pf4mln1mccsclf8kkyaj4hyqd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -107380,6 +107122,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) postgresql;}; + "hpqtypes_1_5_3_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers + , data-default-class, directory, exceptions, filepath, HUnit + , lifted-base, monad-control, mtl, postgresql, QuickCheck, random + , resource-pool, scientific, semigroups, test-framework + , test-framework-hunit, text, text-show, time, transformers + , transformers-base, unordered-containers, vector + }: + mkDerivation { + pname = "hpqtypes"; + version = "1.5.3.0"; + sha256 = "1igzja5vy3pfvn2xi4bfbrbnxggxwav16cw2kfjrzkp2xrxq09gz"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default-class + exceptions lifted-base monad-control mtl resource-pool semigroups + text text-show time transformers transformers-base vector + ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ + aeson base bytestring exceptions HUnit lifted-base monad-control + mtl QuickCheck random scientific test-framework + test-framework-hunit text text-show time transformers-base + unordered-containers vector + ]; + description = "Haskell bindings to libpqtypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) postgresql;}; + "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers , cryptohash, data-default, exceptions, fields-json, hpqtypes @@ -107736,6 +107508,18 @@ self: { license = "GPL"; }) {}; + "hs-bibutils_6_4_0_0" = callPackage + ({ mkDerivation, base, syb }: + mkDerivation { + pname = "hs-bibutils"; + version = "6.4.0.0"; + sha256 = "1kravnc0cn0r7bnm3fmcd6d1l4z1ax41wcm32jrp5rafq15lyg9f"; + libraryHaskellDepends = [ base syb ]; + description = "Haskell bindings to bibutils, the bibliography conversion utilities"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-blake2" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck @@ -109667,19 +109451,19 @@ self: { }) {}; "hsini" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, mtl, parsec - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, tasty-th + ({ mkDerivation, base, bytestring, containers, mtl, parsec, tasty + , tasty-hunit, tasty-quickcheck, tasty-th }: mkDerivation { pname = "hsini"; - version = "0.5.1.1"; - sha256 = "0yfmra5z9fjms5ighlmi6zd092c4kpwnmsrcp2p8gqwdz7k1in51"; + version = "0.5.1.2"; + sha256 = "1r6qksnrmk18ndxs5zaga8b7kvmk34kp0kh5hwqmq797qrlax9pa"; libraryHaskellDepends = [ base bytestring containers mtl parsec ]; testHaskellDepends = [ - base bytestring containers HUnit mtl parsec QuickCheck tasty - tasty-hunit tasty-quickcheck tasty-th + base bytestring containers mtl parsec tasty tasty-hunit + tasty-quickcheck tasty-th ]; - description = "Package for user configuration files (INI)"; + description = "ini configuration files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -111720,19 +111504,6 @@ self: { ({ mkDerivation, base, hsp, jmacro, mtl, text, wl-pprint-text }: mkDerivation { pname = "hsx-jmacro"; - version = "7.3.8"; - sha256 = "15a427bkyn36rdkkvw74ck5dzgbsxnwhy23yd6fibidcz2iyziwp"; - libraryHaskellDepends = [ - base hsp jmacro mtl text wl-pprint-text - ]; - description = "hsp+jmacro support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsx-jmacro_7_3_8_1" = callPackage - ({ mkDerivation, base, hsp, jmacro, mtl, text, wl-pprint-text }: - mkDerivation { - pname = "hsx-jmacro"; version = "7.3.8.1"; sha256 = "0ndgy5vf5rwgwqya75ny5vbr7hfqwjrdgfgpwf5410bk0603v47i"; libraryHaskellDepends = [ @@ -111740,7 +111511,6 @@ self: { ]; description = "hsp+jmacro support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsx-xhtml" = callPackage @@ -113810,6 +113580,7 @@ self: { benchmarkSystemDepends = [ hunspell ]; description = "Hunspell thread-safe FFI bindings for spell checking"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) hunspell;}; "hunt-searchengine" = callPackage @@ -114105,6 +113876,7 @@ self: { ]; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-bits" = callPackage @@ -114191,6 +113963,7 @@ self: { hw-prim hw-rankselect hw-rankselect-base mmap vector weigh ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-eliasfano" = callPackage @@ -114227,6 +114000,7 @@ self: { ]; description = "Excess"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-fingertree" = callPackage @@ -114254,26 +114028,6 @@ self: { }: mkDerivation { pname = "hw-fingertree-strict"; - version = "0.1.0.3"; - sha256 = "03njx1g23f8s8a9dcyanpfm8pzgcbyds4zwkmp7g8mshk1rljfcm"; - revision = "1"; - editedCabalFile = "027ds9pl198478hyimfqaff52r8qhwgmhzazck847z2i5igp30i2"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ - base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - description = "Generic strict finger-tree structure"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-fingertree-strict_0_1_1_1" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit - , hw-hspec-hedgehog, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "hw-fingertree-strict"; version = "0.1.1.1"; sha256 = "0s0jz6lynxiaz2h8hr78j05vhswrl6vwhmvdra9a46c3yg7vf9qi"; libraryHaskellDepends = [ base deepseq ]; @@ -114283,7 +114037,6 @@ self: { ]; description = "Generic strict finger-tree structure"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-hedgehog" = callPackage @@ -114299,20 +114052,6 @@ self: { }) {}; "hw-hspec-hedgehog" = callPackage - ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: - mkDerivation { - pname = "hw-hspec-hedgehog"; - version = "0.1.0.4"; - sha256 = "1vlrrskalip7a477px7imwy9yifvdx7c03zrgk90rlarivwkggaq"; - revision = "1"; - editedCabalFile = "12bh7ms7kjmpk43fwmnbbaflsl41icjck3bn8pcjybp7f7j0mrk5"; - libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; - testHaskellDepends = [ base hedgehog hspec ]; - description = "Interoperability between hspec and hedgehog"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-hspec-hedgehog_0_1_0_5" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit , transformers }: @@ -114326,7 +114065,6 @@ self: { testHaskellDepends = [ base hedgehog hspec ]; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-int" = callPackage @@ -114645,6 +114383,7 @@ self: { ]; description = "Rank-select"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect_0_12_0_2" = callPackage @@ -114701,6 +114440,7 @@ self: { ]; description = "Rank-select base"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect-base_0_3_2_0" = callPackage @@ -114755,6 +114495,7 @@ self: { ]; description = "Succint datastructures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-vector" = callPackage @@ -115851,6 +115592,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Text hyphenation algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyphenation" = callPackage @@ -129313,6 +129055,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lexer-applicative_2_1_0_2" = callPackage + ({ mkDerivation, base, deepseq, regex-applicative, srcloc, tasty + , tasty-hunit + }: + mkDerivation { + pname = "lexer-applicative"; + version = "2.1.0.2"; + sha256 = "1gjwxc9d2al8az89mrxkvh8fmmdk78685dgdxi4fil2r587kqhxf"; + libraryHaskellDepends = [ base regex-applicative srcloc ]; + testHaskellDepends = [ + base deepseq regex-applicative srcloc tasty tasty-hunit + ]; + description = "Simple lexer based on applicative regular expressions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lfst" = callPackage ({ mkDerivation, base, containers, doctest, lattices, QuickCheck }: mkDerivation { @@ -136856,6 +136615,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "matrix-as-xyz" = callPackage + ({ mkDerivation, base, doctest, hspec, matrix, parsec, QuickCheck + }: + mkDerivation { + pname = "matrix-as-xyz"; + version = "0.1.1.0"; + sha256 = "0ckirpbflr69a51k21nfak74d5r4jxra2sl4ys2gyicjm77b5a3s"; + libraryHaskellDepends = [ base hspec matrix parsec QuickCheck ]; + testHaskellDepends = [ + base doctest hspec matrix parsec QuickCheck + ]; + description = "Read and Display representation of matrix like \"x,y,z\""; + license = stdenv.lib.licenses.bsd3; + }) {}; + "matrix-market" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -138234,6 +138008,7 @@ self: { validity-time ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "merkle-patricia-db" = callPackage @@ -139296,29 +139071,6 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.2.1"; - sha256 = "1mylkqp8vha9gq7li5cir5h3i27zb573alxgxnvr1y938z2nimf2"; - libraryHaskellDepends = [ - base bytestring cereal containers digest lens lifted-base - monad-control mtl murmur-hash network random resource-pool - semigroups transformers zlib - ]; - testHaskellDepends = [ - base bytestring lens mtl network QuickCheck semigroups tasty - tasty-hspec tasty-quickcheck - ]; - description = "A Kafka client for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "milena_0_5_2_2" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, digest, lens - , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck - , random, resource-pool, semigroups, tasty, tasty-hspec - , tasty-quickcheck, transformers, zlib - }: - mkDerivation { - pname = "milena"; version = "0.5.2.2"; sha256 = "0dag2r79wpq67ydd7blwha2jf8nd5311bxv3li3fm88m0kbqrni1"; libraryHaskellDepends = [ @@ -139332,7 +139084,6 @@ self: { ]; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime" = callPackage @@ -139572,39 +139323,6 @@ self: { "minio-hs" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, cryptonite - , cryptonite-conduit, data-default, directory, exceptions, filepath - , http-client, http-conduit, http-types, memory, protolude - , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, temporary, text, text-format, time - , transformers, unliftio, unliftio-core, xml-conduit - }: - mkDerivation { - pname = "minio-hs"; - version = "1.0.0"; - sha256 = "0q6qzzkkbm9b0a7c630yj2rlg54imir1yjbpsy4x9fh3kc7vx0i2"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers cryptonite cryptonite-conduit data-default - exceptions filepath http-client http-conduit http-types memory - protolude resourcet text text-format time transformers unliftio - unliftio-core xml-conduit - ]; - testHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers cryptonite cryptonite-conduit data-default - directory exceptions filepath http-client http-conduit http-types - memory protolude QuickCheck resourcet tasty tasty-hunit - tasty-quickcheck tasty-smallcheck temporary text text-format time - transformers unliftio unliftio-core xml-conduit - ]; - description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "minio-hs_1_0_1" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, conduit, conduit-extra, containers, cryptonite , cryptonite-conduit, data-default, directory, filepath , http-client, http-conduit, http-types, memory, protolude , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck @@ -143815,20 +143533,6 @@ self: { }) {}; "multiset" = callPackage - ({ mkDerivation, base, containers, doctest, Glob }: - mkDerivation { - pname = "multiset"; - version = "0.3.3"; - sha256 = "0dg1dlvsyjam5z284p2pzfdzhk88z9bw57v290xzx0dyvg9pfkn7"; - revision = "2"; - editedCabalFile = "1pwb1prra12yrm3qdjp8h7343cilbkck85blhaflzsmn1sbcyq2w"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base doctest Glob ]; - description = "The Data.MultiSet container type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "multiset_0_3_4" = callPackage ({ mkDerivation, base, containers, deepseq, doctest, Glob }: mkDerivation { pname = "multiset"; @@ -143838,7 +143542,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "The Data.MultiSet container type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multiset-comb" = callPackage @@ -145334,23 +145037,11 @@ self: { ({ mkDerivation, base, containers, template-haskell }: mkDerivation { pname = "names-th"; - version = "0.2.0.3"; - sha256 = "1ijy7wkmw8y5lv7f1p975jlp17r3yfv5v05csiqrs1zykcpjpghf"; - libraryHaskellDepends = [ base containers template-haskell ]; - description = "Manipulate name strings for TH"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "names-th_0_2_0_4" = callPackage - ({ mkDerivation, base, containers, template-haskell }: - mkDerivation { - pname = "names-th"; version = "0.2.0.4"; sha256 = "03nj3qdqkdl4wgb9s4p1dmrcx19ffc03br0a3n8z85bih0p4vgsq"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Manipulate name strings for TH"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "namespace" = callPackage @@ -150102,24 +149793,24 @@ self: { ({ mkDerivation, aeson, base, bytestring, containers, directory , file-embed, filepath, formatting, hspec, hspec-golden-aeson, mtl , process, QuickCheck, quickcheck-arbitrary-adt, servant - , servant-server, split, template-haskell, text, time - , typelits-witnesses, wai, wai-extra, warp, wl-pprint-text + , servant-server, singletons, split, template-haskell, text, time + , wai, wai-extra, warp, wl-pprint-text }: mkDerivation { pname = "ocaml-export"; - version = "0.7.0.0"; - sha256 = "10cvzzqnv7za9albnma112cx0pr4ranjqg3r38k5x6jmj4n5s4bp"; + version = "0.9.0.0"; + sha256 = "1wqgvaf8198p1avq3vlmi256a6wk5w76m4hvlhvmdv0kzad3iw25"; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath formatting hspec hspec-golden-aeson mtl QuickCheck - quickcheck-arbitrary-adt servant servant-server split - template-haskell text time typelits-witnesses wl-pprint-text + quickcheck-arbitrary-adt servant servant-server singletons split + template-haskell text time wl-pprint-text ]; testHaskellDepends = [ aeson base bytestring containers directory filepath hspec hspec-golden-aeson process QuickCheck quickcheck-arbitrary-adt - servant servant-server template-haskell text time - typelits-witnesses wai wai-extra warp + servant servant-server singletons template-haskell text time wai + wai-extra warp ]; description = "Convert Haskell types in OCaml types"; license = stdenv.lib.licenses.bsd3; @@ -156595,6 +156286,7 @@ self: { ]; description = "analysis example using perf"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "perfect-hash-generator" = callPackage @@ -160339,6 +160031,7 @@ self: { libraryHaskellDepends = [ base semigroups ]; description = "Plurality monad: Zero, one, or at least two"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plural" = callPackage @@ -161896,32 +161589,6 @@ self: { }: mkDerivation { pname = "postgresql-simple"; - version = "0.5.3.0"; - sha256 = "0h8f4d09f25p0dlz2mxvgp5b5pr56hnhng3yhb69pmv0dmj7n38y"; - revision = "1"; - editedCabalFile = "1hvry7nhk629yas6nbm3wnyy0bgwh6r8511rmsq9r8xkl7qm76r2"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring bytestring-builder - case-insensitive containers hashable postgresql-libpq scientific - template-haskell text time transformers uuid-types vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring containers cryptohash - filepath HUnit tasty tasty-golden tasty-hunit text time vector - ]; - description = "Mid-Level PostgreSQL client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "postgresql-simple_0_5_4_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, bytestring-builder, case-insensitive, containers - , cryptohash, filepath, hashable, HUnit, postgresql-libpq - , scientific, tasty, tasty-golden, tasty-hunit, template-haskell - , text, time, transformers, uuid-types, vector - }: - mkDerivation { - pname = "postgresql-simple"; version = "0.5.4.0"; sha256 = "0xrsyx25v5z06qziy32wlb3lvkyci3nxkbb25nis21vkj3kimlgm"; libraryHaskellDepends = [ @@ -161935,7 +161602,6 @@ self: { ]; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-bind" = callPackage @@ -161965,29 +161631,6 @@ self: { }: mkDerivation { pname = "postgresql-simple-migration"; - version = "0.1.11.0"; - sha256 = "17kmmilvzpllk5nr7xngkym2gavkv32z5i1b7vc290g89c58a3y0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base64-bytestring bytestring cryptohash directory - postgresql-simple time - ]; - executableHaskellDepends = [ - base base64-bytestring bytestring cryptohash directory - postgresql-simple text time - ]; - testHaskellDepends = [ base bytestring hspec postgresql-simple ]; - description = "PostgreSQL Schema Migrations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "postgresql-simple-migration_0_1_12_0" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash - , directory, hspec, postgresql-simple, text, time - }: - mkDerivation { - pname = "postgresql-simple-migration"; version = "0.1.12.0"; sha256 = "18sx8ila7w7k4ym4rs36dc48v0cdl3b4il5jfqyfcx34n3mb5y4q"; isLibrary = true; @@ -162003,7 +161646,6 @@ self: { testHaskellDepends = [ base bytestring hspec postgresql-simple ]; description = "PostgreSQL Schema Migrations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-opts" = callPackage @@ -163760,6 +163402,7 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primula-board" = callPackage @@ -164607,20 +164250,21 @@ self: { , criterion, cryptohash-sha256, data-interval, deepseq , deepseq-generics, directory, distributed-process , distributed-process-async, distributed-process-client-server - , distributed-process-extras, either, extended-reals, filepath, ghc - , ghc-boot, ghc-paths, Glob, gnuplot, hashable, hashable-time - , haskeline, http-api-data, http-types, HUnit, list-t, megaparsec - , monad-parallel, MonadRandom, mtl, network, network-transport - , network-transport-tcp, old-locale, optparse-applicative, parallel - , path-pieces, random, random-shuffle, resourcet, scotty - , semigroups, stm, stm-containers, template-haskell, temporary - , text, time, transformers, unix, unordered-containers, uuid - , vector, vector-binary-instances, websockets, zlib + , distributed-process-extras, either, exceptions, extended-reals + , filepath, ghc, ghc-boot, ghc-paths, ghci, Glob, gnuplot, hashable + , hashable-time, haskeline, http-api-data, http-types, HUnit + , list-t, megaparsec, monad-parallel, MonadRandom, mtl, network + , network-transport, network-transport-tcp, old-locale + , optparse-applicative, parallel, path-pieces, QuickCheck, random + , random-shuffle, resourcet, rset, scotty, semigroups, stm + , stm-containers, template-haskell, temporary, text, time + , transformers, unix, unordered-containers, uuid, vector + , vector-binary-instances, websockets, zlib }: mkDerivation { pname = "project-m36"; - version = "0.3"; - sha256 = "0l72wafjy12vymsvfjy5xh0gfkswdyzr12hmn1qffham9s280014"; + version = "0.4"; + sha256 = "0lp0vrvvplyav0dp418kx12y4qrf7y7xp3vxwsv5jjb3sc7aqyq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164628,13 +164272,13 @@ self: { conduit containers cryptohash-sha256 data-interval deepseq deepseq-generics directory distributed-process distributed-process-async distributed-process-client-server - distributed-process-extras either extended-reals filepath ghc - ghc-boot ghc-paths Glob gnuplot hashable hashable-time haskeline - http-api-data list-t monad-parallel MonadRandom mtl - network-transport network-transport-tcp old-locale - optparse-applicative parallel path-pieces random-shuffle resourcet - stm stm-containers temporary text time transformers unix - unordered-containers uuid vector vector-binary-instances zlib + distributed-process-extras either exceptions extended-reals + filepath ghc ghc-boot ghc-paths ghci Glob gnuplot hashable + hashable-time haskeline http-api-data list-t monad-parallel + MonadRandom mtl network-transport network-transport-tcp old-locale + optparse-applicative parallel path-pieces QuickCheck random-shuffle + resourcet rset stm stm-containers temporary text time transformers + unix unordered-containers uuid vector vector-binary-instances zlib ]; executableHaskellDepends = [ aeson attoparsec base base64-bytestring binary blaze-html @@ -164662,7 +164306,8 @@ self: { containers criterion data-interval deepseq deepseq-generics directory filepath gnuplot hashable hashable-time haskeline HUnit megaparsec mtl parallel stm stm-containers temporary text time - unordered-containers uuid vector vector-binary-instances + transformers unordered-containers uuid vector + vector-binary-instances ]; description = "Relational Algebra Engine"; license = stdenv.lib.licenses.publicDomain; @@ -164793,8 +164438,8 @@ self: { }: mkDerivation { pname = "prologue"; - version = "3.2.2"; - sha256 = "1sswdhbfgh2pnhyixj03khp5ylsxkyisghyg0mqgb039kq1lxxci"; + version = "3.2.3"; + sha256 = "1a69283vmxr3ksak6b8hb8ys52gi5r7f1d59l32xfq1ilaswxxwm"; libraryHaskellDepends = [ base bifunctors binary comonad cond container convert data-default deepseq deriving-compat either errors exceptions functor-utils @@ -165248,27 +164893,6 @@ self: { }: mkDerivation { pname = "protobuf"; - version = "0.2.1.1"; - sha256 = "0b3jbr6s8m21q4yiikvjv74j9w744frhrpsd1d6203b7bc49lrfd"; - libraryHaskellDepends = [ - base base-orphans bytestring cereal data-binary-ieee754 deepseq mtl - text unordered-containers - ]; - testHaskellDepends = [ - base bytestring cereal containers hex HUnit mtl QuickCheck tagged - tasty tasty-hunit tasty-quickcheck text unordered-containers - ]; - description = "Google Protocol Buffers via GHC.Generics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protobuf_0_2_1_2" = callPackage - ({ mkDerivation, base, base-orphans, bytestring, cereal, containers - , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged - , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers - }: - mkDerivation { - pname = "protobuf"; version = "0.2.1.2"; sha256 = "1php9pydbh2jyr5x6h1i218w8kqwys5aniz2zm1hapv6ia8p3j5k"; libraryHaskellDepends = [ @@ -165281,7 +164905,6 @@ self: { ]; description = "Google Protocol Buffers via GHC.Generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protobuf-native" = callPackage @@ -165339,22 +164962,6 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.9"; - sha256 = "0d6j5k8mfxnixx9n6v7vwncy49cx9sxkhjgh1g7sbs1q15rxkn6m"; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string - ]; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers_2_4_10" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string - }: - mkDerivation { - pname = "protocol-buffers"; version = "2.4.10"; sha256 = "0rr7yla1gl199hk2zn7jr1p0nq166mi4dm43ild27y6bvrdc2kvk"; libraryHaskellDepends = [ @@ -165363,27 +164970,12 @@ self: { ]; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.9"; - sha256 = "0641cwi7lb53w4mi1icbgz0yghz4lwdf16y9pi0f188hp31f3b2j"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers protocol-buffers - ]; - description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers-descriptor_2_4_10" = callPackage - ({ mkDerivation, base, bytestring, containers, protocol-buffers }: - mkDerivation { - pname = "protocol-buffers-descriptor"; version = "2.4.10"; sha256 = "1w4n0yqf5xhbs5yi0xj8ak268chngklc7sif2s3bjr0dwk7fi5d0"; enableSeparateDataOutput = true; @@ -165392,7 +164984,6 @@ self: { ]; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor-fork" = callPackage @@ -167108,8 +166699,8 @@ self: { }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.4.0"; - sha256 = "03m45jc5jpkjfcx0dr1lb2nsajbhkfb5phsx7v909hj8d7j7swvz"; + version = "0.5.0"; + sha256 = "14349jf69wvbcp18xi5jb0281qhrz38pw68qw91hwfr8vmqdx8h7"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; @@ -167124,8 +166715,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.4.0"; - sha256 = "0q8k2diyrxpvsnhlw484lxy3j6qbk07hkqj0hg2cxv8whhi02bp9"; + version = "0.5.0"; + sha256 = "087sspnaw39zcymkm0xzyzdbc4g96zlpa45b2i6mfshxi4g38af5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -167143,8 +166734,8 @@ self: { }: mkDerivation { pname = "qtah-generator"; - version = "0.4.0"; - sha256 = "1fxv8g3rrhf9q7g90phqji4q5yb2l0sfi0qm81zp9ya91wmcfsg5"; + version = "0.5.0"; + sha256 = "0kbc3dpmkxxi2ms6a7dga02g19vq9fm0hz53y9x6iyfpnlpk1sy7"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -167161,25 +166752,23 @@ self: { "qtah-qt5" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, directory - , filepath, hoppy-runtime, HUnit, qtah, qtah-cpp-qt5 - , qtah-generator, qtbase + , filepath, hoppy-runtime, HUnit, qtah-cpp-qt5, qtah-generator + , qtbase }: mkDerivation { pname = "qtah-qt5"; - version = "0.4.0"; - sha256 = "1b20wrbyldxx6vsxax3kdfxikv0v79m3qcbwhjwgyp586gk9pl63"; + version = "0.5.0"; + sha256 = "0c4z56siw1kkqiyzmbpjk6jkzmcxqv6ji52rnivlavlyw3b4s2a3"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; - librarySystemDepends = [ qtah ]; libraryToolDepends = [ qtbase ]; testHaskellDepends = [ base hoppy-runtime HUnit ]; - testSystemDepends = [ qtah ]; description = "Qt bindings for Haskell"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {qtah = null; inherit (pkgs.qt5) qtbase;}; + }) {inherit (pkgs.qt5) qtbase;}; "quack" = callPackage ({ mkDerivation, aeson, attoparsec, base, http-types, mtl, text }: @@ -167852,6 +167441,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-simple_0_1_0_4" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "quickcheck-simple"; + version = "0.1.0.4"; + sha256 = "0524xkhx2qa6wfl7wf9qdjscr2djl0l08a1bk6ikigcpdabbb3l0"; + libraryHaskellDepends = [ base QuickCheck ]; + description = "Test properties and default-mains for QuickCheck"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-special" = callPackage ({ mkDerivation, base, QuickCheck, special-values }: mkDerivation { @@ -169223,23 +168824,6 @@ self: { }: mkDerivation { pname = "range-set-list"; - version = "0.1.2.1"; - sha256 = "06f8z9rmk2phmds9wv95y2xvjhfx8dr9jbqlv4ybv8m21283x0kw"; - libraryHaskellDepends = [ base containers deepseq hashable ]; - testHaskellDepends = [ - base containers deepseq hashable tasty tasty-quickcheck - ]; - description = "Memory efficient sets with ranges of elements"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "range-set-list_0_1_3" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, tasty - , tasty-quickcheck - }: - mkDerivation { - pname = "range-set-list"; version = "0.1.3"; sha256 = "1pwnriv5r093qvqzzg9s868613nf92d3h8qmqaqc5qq95hykj6z5"; libraryHaskellDepends = [ base containers deepseq hashable ]; @@ -172711,6 +172295,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query-HDBC_0_6_7_0" = callPackage + ({ mkDerivation, base, containers, convertible, dlist, HDBC + , HDBC-session, names-th, persistable-record, product-isomorphic + , relational-query, relational-schemas, sql-words, template-haskell + , th-data-compat, transformers + }: + mkDerivation { + pname = "relational-query-HDBC"; + version = "0.6.7.0"; + sha256 = "1g10z6076lrlal3ismvz4q4pxpawy749zwxpyvvfdhld2qqhg74c"; + libraryHaskellDepends = [ + base containers convertible dlist HDBC HDBC-session names-th + persistable-record product-isomorphic relational-query + relational-schemas sql-words template-haskell th-data-compat + transformers + ]; + description = "HDBC instance of relational-query and typed query interface for HDBC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-record" = callPackage ({ mkDerivation, base, persistable-record , persistable-types-HDBC-pg, product-isomorphic, relational-query @@ -173759,6 +173364,7 @@ self: { ]; description = "Scrap your qualified import clutter"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rerebase" = callPackage @@ -176889,6 +176495,17 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "safe-foldable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "safe-foldable"; + version = "0.1.0.0"; + sha256 = "1l87j0liv0hgdv3f3d4s4962df5q5xcyhmnfz2fj773r1v62wzya"; + libraryHaskellDepends = [ base ]; + description = "Safe wrappers for null-partial Foldable operations"; + license = stdenv.lib.licenses.mit; + }) {}; + "safe-freeze" = callPackage ({ mkDerivation, base, indexed, mtl, vector }: mkDerivation { @@ -182225,6 +181842,7 @@ self: { ]; description = "Client instances for the 'servant-streaming' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-streaming-docs" = callPackage @@ -183485,22 +183103,49 @@ self: { "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hashable - , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext - , text + , hs2ats, language-ats, microlens, microlens-th, shake, shake-cabal + , shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.8.0.5"; - sha256 = "0hznrllvlw3ypd3ljlx6wlr3d7hkm8g2mrwpfscgvf4hk0lyj1hd"; + version = "1.8.0.6"; + sha256 = "00887a8dh26w2qj5w0scivrz3qjybbkflf4s135lmrz6s5pb7l6f"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats - microlens microlens-th shake shake-ext text + microlens microlens-th shake shake-cabal shake-ext text ]; description = "Utilities for building ATS projects with shake"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shake-c" = callPackage + ({ mkDerivation, base, cdeps, shake }: + mkDerivation { + pname = "shake-c"; + version = "0.1.0.0"; + sha256 = "0g6lavs5y62g5dpy1pfpm2bks43kf6i4m1gb9hdrkrz1iysgl209"; + libraryHaskellDepends = [ base cdeps shake ]; + description = "Library for building C code with shake"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "shake-cabal" = callPackage + ({ mkDerivation, base, Cabal, composition-prelude, directory, shake + }: + mkDerivation { + pname = "shake-cabal"; + version = "0.1.0.0"; + sha256 = "1zxxfjfklwnarzvdyq9n221n5aygq253xcr3hly54mrvalq337bb"; + revision = "2"; + editedCabalFile = "02hzlwp75i2vmvk8inaasnpgpy89a00xbawp6p4p5fg07czx3fap"; + libraryHaskellDepends = [ + base Cabal composition-prelude directory shake + ]; + description = "Shake library for use with cabal"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shake-cabal-build" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, process }: mkDerivation { @@ -183517,17 +183162,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shake-ccjs" = callPackage + ({ mkDerivation, base, directory, shake }: + mkDerivation { + pname = "shake-ccjs"; + version = "0.1.0.0"; + sha256 = "1n52fjay6xgx65ihin6zxx05q42mfkdqi9888hn8dnn70kf5j7cg"; + libraryHaskellDepends = [ base directory shake ]; + description = "Shake rules for CCJS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "shake-elm" = callPackage + ({ mkDerivation, base, shake }: + mkDerivation { + pname = "shake-elm"; + version = "0.1.0.0"; + sha256 = "1pd2ga35kjcx5zfkvmdwr4rjlcm5b5r8h0kjmjadk4qf5219rwc1"; + libraryHaskellDepends = [ base shake ]; + description = "Elm builds in shake"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shake-ext" = callPackage - ({ mkDerivation, base, Cabal, cdeps, composition-prelude, cpphs - , directory, shake, template-haskell + ({ mkDerivation, base, cdeps, composition-prelude, directory, shake + , template-haskell }: mkDerivation { pname = "shake-ext"; - version = "2.11.0.4"; - sha256 = "0c7jbbq69y0v6244c6fx6kw9sp8sl5kkmnrfcryfwdgahj3psnp4"; + version = "2.12.0.0"; + sha256 = "1yvsywbszvn2vllbzbp8c9c10idaid87wv1qvhz2xq4jw2f8q38h"; libraryHaskellDepends = [ - base Cabal cdeps composition-prelude cpphs directory shake - template-haskell + base cdeps composition-prelude directory shake template-haskell ]; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; @@ -183587,6 +183253,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shake-literate" = callPackage + ({ mkDerivation, base, cpphs, shake }: + mkDerivation { + pname = "shake-literate"; + version = "0.1.0.0"; + sha256 = "1kliv9i9libcyzm0bccxi226rd69kvjxi9hi3n4y7zjbbp40cqgd"; + libraryHaskellDepends = [ base cpphs shake ]; + description = "Rules for building literate programs in shake"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shake-minify" = callPackage ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }: mkDerivation { @@ -185200,26 +184877,6 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.4"; - sha256 = "0chp90h9112sxa7ds0ldzdp59i6b1vy7chkqcb6d5mb9faq6vjqi"; - libraryHaskellDepends = [ - async base base-unicode-symbols containers data-default deepseq - directory exceptions filepath hformat microlens microlens-platform - mmorph mtl SafeSemaphore text time transformers - ]; - testHaskellDepends = [ base hspec microlens-platform text ]; - description = "Simple log for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-log_0_9_5" = callPackage - ({ mkDerivation, async, base, base-unicode-symbols, containers - , data-default, deepseq, directory, exceptions, filepath, hformat - , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore - , text, time, transformers - }: - mkDerivation { - pname = "simple-log"; version = "0.9.5"; sha256 = "042mnsc2mfxdsf49knszk732mj5ryd9309h9ysyzb6z0y9wnp736"; libraryHaskellDepends = [ @@ -185230,7 +184887,6 @@ self: { testHaskellDepends = [ base hspec microlens-platform text ]; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-log-syslog" = callPackage @@ -189097,6 +188753,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "socket-icmp" = callPackage + ({ mkDerivation, base, socket }: + mkDerivation { + pname = "socket-icmp"; + version = "0.1.0.0"; + sha256 = "14lfvbhcq1ri9bfc0qiymh8qv8b7q78lzfbr5qsarh8rb85ii2vj"; + libraryHaskellDepends = [ base socket ]; + description = "Definitions for ICMP with the `socket` library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "socket-io" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, engine-io , mtl, stm, text, transformers, unordered-containers, vector @@ -190127,23 +189794,24 @@ self: { "speechmatics" = callPackage ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, hspec , http-client, http-client-openssl, http-types, json-autotype, lens - , mime-types, neat-interpolation, options, SHA, text, wreq + , mime-types, monad-logger, mtl, neat-interpolation, options, SHA + , text, wreq }: mkDerivation { pname = "speechmatics"; - version = "0.4.0.0"; - sha256 = "0lnv4rq0iaj4j9mf49ws43p9ajini1q1vzj4yyvlnpwikkn6yk67"; + version = "0.5.0.0"; + sha256 = "12hk79wfs935118y1dzzrya9k82jf525scn67ps0s314g8fzpnc0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-client http-client-openssl - http-types json-autotype lens mime-types text wreq + http-types json-autotype lens mime-types monad-logger mtl text wreq ]; executableHaskellDepends = [ - base bytestring mime-types options SHA text + base bytestring mime-types monad-logger mtl options SHA text ]; testHaskellDepends = [ - base bytestring hspec neat-interpolation text + base bytestring hspec monad-logger mtl neat-interpolation text ]; description = "Speechmatics api client"; license = stdenv.lib.licenses.bsd3; @@ -190895,25 +190563,12 @@ self: { ({ mkDerivation, base, QuickCheck, quickcheck-simple }: mkDerivation { pname = "sql-words"; - version = "0.1.6.0"; - sha256 = "065ymcym5vm5xmprbzgv88wk3b09j44ajvsd59apw6qr32j218rn"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck quickcheck-simple ]; - description = "SQL keywords data constructors into OverloadedString"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sql-words_0_1_6_1" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-simple }: - mkDerivation { - pname = "sql-words"; version = "0.1.6.1"; sha256 = "07prq4bcvl469m0sr767kxidr0kk27yynb9zsm48sjz84h0bx2v3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck quickcheck-simple ]; description = "SQL keywords data constructors into OverloadedString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sqlcipher" = callPackage @@ -193681,21 +193336,6 @@ self: { }) {}; "store-core" = callPackage - ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text - , transformers - }: - mkDerivation { - pname = "store-core"; - version = "0.4.1"; - sha256 = "1d34n2n9vjngxndkbxcqm07sg4cnaq6rlx013rhyjr3aybwqalhl"; - libraryHaskellDepends = [ - base bytestring fail ghc-prim primitive text transformers - ]; - description = "Fast and lightweight binary serialization"; - license = stdenv.lib.licenses.mit; - }) {}; - - "store-core_0_4_3" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers }: @@ -193708,7 +193348,6 @@ self: { ]; description = "Fast and lightweight binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "store-streaming" = callPackage @@ -193731,6 +193370,7 @@ self: { ]; description = "Streaming interfaces for `store`"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "str" = callPackage @@ -193773,15 +193413,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_24_0" = callPackage + "stratosphere_0_24_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.24.0"; - sha256 = "02hpx1j1s4rjgf39qg9vxmdqvvb2il0w291gv8819fzmrrifhym5"; + version = "0.24.1"; + sha256 = "1kgky2713bik420i93k982zwlnp4ldr6lik2brg4nqwplwzf091i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194448,7 +194088,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "streamly_0_2_0" = callPackage + "streamly_0_2_1" = callPackage ({ mkDerivation, atomic-primops, base, containers, deepseq , exceptions, gauge, hspec, lifted-base, lockfree-queue , monad-control, mtl, QuickCheck, random, stm, transformers @@ -194456,8 +194096,8 @@ self: { }: mkDerivation { pname = "streamly"; - version = "0.2.0"; - sha256 = "1vbzyvmdzhjxpjd4pq4lkn6y0s2yxiziypp4vf9pvwmy1bq5dk0f"; + version = "0.2.1"; + sha256 = "157zxg03ibgxdrghpcdyj22fd7zd02fmgnib13yf0jwwc400c4gp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195792,6 +195432,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Tool for creating completely configured production Haskell projects"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sump" = callPackage @@ -196498,6 +196139,8 @@ self: { pname = "swagger2"; version = "2.2.2"; sha256 = "1jkfmfrldqrfqqnjf0g4spd03w9xjmi35k33xnhsmfj122455lw2"; + revision = "1"; + editedCabalFile = "08rjphysbbiy1zcakgrscv0f3ypxx604dcg6h84jg38azqsf8kff"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring containers generics-sop @@ -198813,6 +198456,7 @@ self: { ]; description = "Extract and create tar files using conduit for streaming"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tardis" = callPackage @@ -199085,6 +198729,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-discover_4_2_1" = callPackage + ({ mkDerivation, base, containers, directory, filepath, Glob + , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-discover"; + version = "4.2.1"; + sha256 = "0ghxrjkqp4w6i47pvdsd25zs6sj10rw4ybkf0pxr598l8qw5nv5y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath Glob + ]; + executableHaskellDepends = [ + base containers directory filepath Glob + ]; + testHaskellDepends = [ + base containers directory filepath Glob hedgehog tasty + tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Test discovery for the tasty framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { @@ -199943,6 +199614,8 @@ self: { pname = "telegram-bot-simple"; version = "0.2.0"; sha256 = "1aafj27zj69hvzxv58cz7h8pjbc9c74hmg92swg2sy8ai1rcb34a"; + revision = "1"; + editedCabalFile = "1li6b3m9glhfg8agr9h0mrbxpr8zr46l57mzjfdqndm248ddbklv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201952,22 +201625,6 @@ self: { }: mkDerivation { pname = "text-postgresql"; - version = "0.0.2.3"; - sha256 = "0dp4f213d9rslgiqpmpk9dzl6yb9njmiym7s1fn3ms9aadipag72"; - libraryHaskellDepends = [ - base dlist transformers transformers-compat - ]; - testHaskellDepends = [ base QuickCheck quickcheck-simple ]; - description = "Parser and Printer of PostgreSQL extended types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-postgresql_0_0_3_0" = callPackage - ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple - , transformers, transformers-compat - }: - mkDerivation { - pname = "text-postgresql"; version = "0.0.3.0"; sha256 = "0db08ri1zixxm8vhcnijv2wpmcyv3bali30a1fx4vmb8d6c1fh35"; libraryHaskellDepends = [ @@ -201976,7 +201633,6 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-simple ]; description = "Parser and Printer of PostgreSQL extended types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-printer" = callPackage @@ -202019,22 +201675,6 @@ self: { }: mkDerivation { pname = "text-region"; - version = "0.3.0.0"; - sha256 = "0xy9lpdn26dla4ad7hcpv51swih4n2iw3n27dq68sdp01rz43sfa"; - libraryHaskellDepends = [ - aeson base base-unicode-symbols bytestring groups lens text - ]; - testHaskellDepends = [ base base-unicode-symbols hspec lens text ]; - description = "Marking text regions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-region_0_3_1_0" = callPackage - ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring - , groups, hspec, lens, text - }: - mkDerivation { - pname = "text-region"; version = "0.3.1.0"; sha256 = "1zy5zb7xg1343hlkwawnbca7f6gal9028ps1kp83fg2vmq1aqk57"; libraryHaskellDepends = [ @@ -202043,7 +201683,6 @@ self: { testHaskellDepends = [ base base-unicode-symbols hspec lens text ]; description = "Marking text regions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-register-machine" = callPackage @@ -204275,6 +203914,7 @@ self: { ]; description = "Quasi-quoters for dates and times"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-recurrence" = callPackage @@ -204840,6 +204480,7 @@ self: { testHaskellDepends = [ base require ]; description = "A softer alternative to Haddock"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tiny-scheduler" = callPackage @@ -211503,6 +211144,7 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "An unpacked either data type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unpacked-maybe" = callPackage @@ -211515,6 +211157,7 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "An unpacked maybe data type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unpacked-these" = callPackage @@ -211531,6 +211174,7 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "An unpacked these data type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unpacked-validation" = callPackage @@ -211547,6 +211191,7 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "An unpacked validation data type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unroll-ghc-plugin" = callPackage @@ -211871,35 +211516,6 @@ self: { "uri-bytestring" = callPackage ({ mkDerivation, attoparsec, base, base-compat, blaze-builder , bytestring, containers, criterion, deepseq, deepseq-generics - , fail, generics-sop, HUnit, network-uri, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, th-lift-instances - , transformers - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.3.1.1"; - sha256 = "1ysmwf2zqv6kky2656nk6i2azpngzl0rkgy5fab7ja3xhx998y3z"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers fail - template-haskell th-lift-instances - ]; - testHaskellDepends = [ - attoparsec base base-compat blaze-builder bytestring containers - generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck transformers - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq deepseq-generics - network-uri - ]; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring_0_3_2_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, blaze-builder - , bytestring, containers, criterion, deepseq, deepseq-generics , generics-sop, HUnit, network-uri, QuickCheck , quickcheck-instances, semigroups, tasty, tasty-hunit , tasty-quickcheck, template-haskell, th-lift-instances @@ -211924,7 +211540,6 @@ self: { ]; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-bytestring-aeson" = callPackage @@ -212170,6 +211785,7 @@ self: { testHaskellDepends = [ base network network-uri QuickCheck ]; description = "Generate or process x-www-urlencoded data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "urlpath" = callPackage @@ -213623,21 +213239,6 @@ self: { }: mkDerivation { pname = "vault"; - version = "0.3.1.0"; - sha256 = "17wp9i64k5ms4bqwjwqjj7llcbmyvgf81sah7w3zdqfsqd1shq6r"; - libraryHaskellDepends = [ - base containers hashable semigroups unordered-containers - ]; - description = "a persistent store for values of arbitrary types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vault_0_3_1_1" = callPackage - ({ mkDerivation, base, containers, hashable, semigroups - , unordered-containers - }: - mkDerivation { - pname = "vault"; version = "0.3.1.1"; sha256 = "0a1fir7gvbj2w894daac5c4c3gy36r6c74yci78lb2nvk431b95j"; libraryHaskellDepends = [ @@ -213645,7 +213246,6 @@ self: { ]; description = "a persistent store for values of arbitrary types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vault-tool" = callPackage @@ -218439,40 +218039,6 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.12.4.1"; - sha256 = "1qr9sjjnllf6y2k5knyrck9nnh3s7z6nid8a0z5vsvmmvr37fa4j"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers entropy network - random SHA streaming-commons text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers entropy HUnit - network QuickCheck random SHA streaming-commons test-framework - test-framework-hunit test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers criterion entropy - network random SHA text - ]; - doCheck = false; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets_0_12_5_0" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , bytestring, bytestring-builder, case-insensitive, containers - , criterion, entropy, HUnit, network, QuickCheck, random, SHA - , streaming-commons, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; version = "0.12.5.0"; sha256 = "19vp0mjpib66980q12iv7xkc6j82nkwlyiir0n964nyzl478v3rd"; isLibrary = true; @@ -218496,7 +218062,6 @@ self: { doCheck = false; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-rpc" = callPackage @@ -223220,6 +222785,7 @@ self: { ]; description = "Yam Web"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yamemo" = callPackage @@ -223329,18 +222895,22 @@ self: { }) {}; "yaml-pretty-extras" = callPackage - ({ mkDerivation, base, bytestring, errors, hspec, mtl, text, yaml + ({ mkDerivation, base, bytestring, errors, hspec, mtl, rio, text + , yaml }: mkDerivation { pname = "yaml-pretty-extras"; - version = "0.0.1.1"; - sha256 = "1xb4f76w1sqhv7bkjzzyn13x13ldzpbmnn9kqkq0lzs8zlcyyyjn"; - libraryHaskellDepends = [ base bytestring errors mtl text yaml ]; + version = "0.0.1.3"; + sha256 = "15jk0hxpvq6hjysxrf4nilhn7s32cwvpfc4wbb3fgfvgzaxnnqfb"; + libraryHaskellDepends = [ + base bytestring errors mtl rio text yaml + ]; testHaskellDepends = [ - base bytestring errors hspec mtl text yaml + base bytestring errors hspec mtl rio text yaml ]; description = "Extra functionality for pretty printing Yaml documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-rpc" = callPackage @@ -224835,6 +224405,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-form-bulma" = callPackage + ({ mkDerivation, base, email-validate, shakespeare, text, yesod + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-form-bulma"; + version = "0.1.0.0"; + sha256 = "0488n3j61jimw0qxw6nhnkrdslzg1jva1ird8q1ljggmdhin0prm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base email-validate shakespeare text yesod-core yesod-form + ]; + executableHaskellDepends = [ + base email-validate shakespeare text yesod yesod-core yesod-form + ]; + testHaskellDepends = [ + base email-validate shakespeare text yesod-core yesod-form + ]; + description = "support Bulma form for Yesod"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form @@ -226290,6 +225883,26 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-rope_0_11" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , fingertree, hspec, QuickCheck, quickcheck-instances, text + }: + mkDerivation { + pname = "yi-rope"; + version = "0.11"; + sha256 = "020hnyhl2g313ch6dng9lq3xdjy3ssnb069wiwzbpg816mlii4ws"; + libraryHaskellDepends = [ + base binary bytestring deepseq fingertree text + ]; + testHaskellDepends = [ + base hspec QuickCheck quickcheck-instances text + ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; + description = "A rope data structure used by Yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-snippet" = callPackage ({ mkDerivation, base, binary, containers, data-default, free , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector @@ -226595,6 +226208,7 @@ self: { testHaskellDepends = [ base MonadRandom random yu-utils ]; description = "Auth module for Yu"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yu-core" = callPackage @@ -226641,6 +226255,7 @@ self: { ]; description = "Tool for Yu"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yu-utils" = callPackage @@ -226924,6 +226539,7 @@ self: { ]; description = "Zephyr tree shaking for PureScript Language"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zero" = callPackage @@ -227346,31 +226962,6 @@ self: { }: mkDerivation { pname = "zip-archive"; - version = "0.3.2.4"; - sha256 = "119p7f9dbims5swf23czyg4r4p0sjmgwfh042bpxw54d9p9jwq90"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - libraryToolDepends = [ unzip ]; - testHaskellDepends = [ - base bytestring directory filepath HUnit old-time process temporary - time unix - ]; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) unzip;}; - - "zip-archive_0_3_2_5" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, unzip, zlib - }: - mkDerivation { - pname = "zip-archive"; version = "0.3.2.5"; sha256 = "14xkaj456zpxxbwd1h5prcxiiid42snli4mqm1052jp32c7xhf89"; isLibrary = true; @@ -227387,7 +226978,6 @@ self: { testToolDepends = [ unzip ]; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) unzip;}; "zip-conduit" = callPackage diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 7fc921037a2a..a54967c4e45e 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -102,8 +102,7 @@ let callPackage = drv: args: callPackageWithScope defaultScope drv args; withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix { - inherit (self) llvmPackages; - inherit ghc; + inherit (self) ghc llvmPackages; inherit packages; }; @@ -120,7 +119,7 @@ let installPhase = '' export HOME="$TMP" mkdir -p "$out" - cabal2nix --compiler=${ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" + cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" ''; }; diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 4c32c0684d0e..87f2ebf2d70e 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "joker-${version}"; - version = "0.9.2"; + version = "0.9.3"; goPackagePath = "github.com/candid82/joker"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1ayp7arygd3l4a1zbkhvix84fpqnnncbdxhimymr3c75ymwmmdr8"; + sha256 = "1738gr25hlffc8ppzy6kik21jfix9iy316kv1kj1lqxr8giirhf6"; }; preBuild = "go generate ./..."; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index f25d2933ab7f..36d1a8326e70 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, makeFontsConf, makeWrapper , cairo, coreutils, fontconfig, freefont_ttf -, glib, gmp, gtk2, libedit, libffi, libjpeg +, glib, gmp, gtk3, libedit, libffi, libjpeg , libpng, libtool, mpfr, openssl, pango, poppler , readline, sqlite , disableDocs ? false , CoreFoundation +, gsettings_desktop_schemas }: let @@ -18,7 +19,8 @@ let fontconfig glib gmp - gtk2 + gtk3 + gsettings_desktop_schemas libedit libjpeg libpng @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ] + buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ]; preConfigure = '' @@ -76,7 +78,9 @@ stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}"; + wrapProgram $out/bin/$p \ + --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}" \ + --prefix XDG_DATA_DIRS ":" "$GSETTINGS_SCHEMAS_PATH"; done ''; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d852b594f6dd..c32f59636a92 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -55,7 +55,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-oss" ] ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"; + ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib" + ++ optional stdenv.isDarwin "--disable-sdltest"; postInstall = '' moveToOutput lib/libSDL2main.a "$dev" diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 04ec3f9652c2..803cc97a8ae8 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; - configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx"; + configureFlags = [(if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx")] + ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; meta = with stdenv.lib; { description = "SDL graphics drawing primitives and support functions"; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index b0f2d0e8b8d1..ea5f37513afb 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ] ++ stdenv.lib.optional stdenv.isDarwin Foundation; + + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 00251adb9153..f31fe33ea096 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; configureFlags = [ "--disable-music-ogg-shared" ] - ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"; + ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl" + ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 780444d51f4f..5cadfb9d9051 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + propagatedBuildInputs = [ SDL2 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 4558317ce3e3..a21315fdc882 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + buildInputs = [ SDL2 freetype libGL ] ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index b0a86644afb2..3e11aaf7bc6b 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { "-Djasper=true" "-Dx11=true" "-Dgir=${if gobjectIntrospection != null then "true" else "false"}" - ] ++ stdenv.lib.optional stdenv.isDarwin "-Dbuiltin_loaders=all"; + ]; postPatch = '' chmod +x build-aux/* # patchShebangs only applies to executables @@ -73,8 +73,16 @@ stdenv.mkDerivation rec { ''; postInstall = - # All except one utility seem to be only useful during building. + # meson erroneously installs loaders with .dylib extension on Darwin. + # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. + stdenv.lib.optionalString stdenv.isDarwin '' + for f in $out/${passthru.moduleDir}/*.dylib; do + install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f + mv $f ''${f%.dylib}.so + done '' + # All except one utility seem to be only useful during building. + + '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" @@ -82,12 +90,8 @@ stdenv.mkDerivation rec { $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; - # The fixDarwinDylibNames hook doesn't patch library references or binaries. + # The fixDarwinDylibNames hook doesn't patch binaries. preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - for f in $(find $out/lib -name '*.dylib'); do - install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f - done - for f in $out/bin/* $dev/bin/*; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f done diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 779534460df2..66fc0138ef9b 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "getdns"; name = "${pname}-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://getdnsapi.net/releases/${pname}-1-4-1/${pname}-${version}.tar.gz"; - sha256 = "07n5n5m4dnnh2xkh7wrnlx8s8myrvjf2nbs7n5m5nq8gg3f36li4"; + url = "https://getdnsapi.net/releases/${pname}-1-4-2/${pname}-${version}.tar.gz"; + sha256 = "100fzjpvajvnv0kym8g5lkwyv8w8vhy7g2p0pb2gyz19zqnvi18n"; }; nativeBuildInputs = [ libtool m4 autoreconfHook automake file ]; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 83b9367f9923..8b2f0b0da92d 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: +{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex, gettext }: # library that allows libbluray to play BDplus protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; }; - buildInputs = [ libgcrypt libgpgerror ]; + buildInputs = [ libgcrypt libgpgerror gettext ]; nativeBuildInputs = [ ]; diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch index 2680b1c6de5c..8d9c5d0fbba7 100644 --- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch +++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch @@ -1,21 +1,26 @@ -diff -ru3 libbluray-0.8.0/configure.ac libbluray-0.8.0-new/configure.ac ---- libbluray-0.8.0/configure.ac 2015-04-10 09:48:23.000000000 +0300 -+++ libbluray-0.8.0-new/configure.ac 2015-05-18 14:22:01.002075482 +0300 -@@ -231,6 +231,7 @@ - AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"]) - AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) - AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) -+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" +diff --git a/configure.ac b/configure.ac +index 5fd3c8de..7ae343e0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -228,6 +228,10 @@ if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then + AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.]) fi - AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ]) -diff -ru3 libbluray-0.8.0/src/libbluray/bdj/bdj.c libbluray-0.8.0-new/src/libbluray/bdj/bdj.c ---- libbluray-0.8.0/src/libbluray/bdj/bdj.c 2015-04-06 19:25:09.000000000 +0300 -+++ libbluray-0.8.0-new/src/libbluray/bdj/bdj.c 2015-05-18 14:22:59.241312808 +0300 -@@ -228,6 +228,7 @@ - #ifdef _WIN32 - "" BDJ_JARFILE, - #else ++if test "x$use_bdjava_jar" = "xyes"; then ++ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" ++fi ++ + AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) + AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) + AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ]) +diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c +index 511ad533..e273b9e0 100644 +--- a/src/libbluray/bdj/bdj.c ++++ b/src/libbluray/bdj/bdj.c +@@ -478,6 +478,7 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage) + // pre-defined search paths for libbluray.jar + static const char * const jar_paths[] = { + #ifndef _WIN32 + JARDIR "/" BDJ_JARFILE, "/usr/share/java/" BDJ_JARFILE, "/usr/share/libbluray/lib/" BDJ_JARFILE, diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix new file mode 100644 index 000000000000..22debc6d68aa --- /dev/null +++ b/pkgs/development/libraries/libcef/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig +, GConf, gdk_pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor +, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver +, libXtst, nspr, nss, pango, libpulseaudio, systemd }: + +let + libPath = + stdenv.lib.makeLibraryPath [ + alsaLib atk cairo cups dbus expat fontconfig GConf gdk_pixbuf glib gtk2 + libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi + libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio + systemd + ]; +in +stdenv.mkDerivation rec { + name = "cef-binary-${version}"; + # Not very recent but more recent versions have problems: + # https://github.com/bazukas/obs-linuxbrowser/issues/63 + version = "3.3325.1750.gaabe4c4"; + src = fetchurl { + url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2"; + sha256 = "06pj1ci1lwammz1vwmbgw2fri7gkvbpv4iw67pqckd9xz0cfhwzr"; + }; + nativeBuildInputs = [ cmake ]; + makeFlags = "libcef_dll_wrapper"; + dontStrip = true; + dontPatchELF = true; + installPhase = '' + mkdir -p $out/lib/ $out/share/cef/ + cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/ + cp ../Release/libcef.so $out/lib/ + patchelf --set-rpath "${libPath}" $out/lib/libcef.so + cp ../Release/*.bin $out/share/cef/ + cp -r ../Resources/* $out/share/cef/ + cp -r ../include $out/ + ''; + + meta = with stdenv.lib; { + description = "Simple framework for embedding Chromium-based browsers in other applications"; + homepage = http://opensource.spotify.com/cefbuilds/index.html; + maintainers = with maintainers; [ puffnfresh ]; + license = licenses.bsd3; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index faa8b483a780..67552181d9a6 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }: let - version = "3.28.1"; + version = "3.28.2"; pname = "libdazzle"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04j9pjigpgxddq6y90y73k8qyjixlalip87q121ss5d8zp8xnz32"; + sha256 = "1kfxnyqjwb1r8d4bpr59j1cikd94m6nxf1641hlg7dqlpl9rwlan"; }; nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 796954b356d1..b6328a7354cf 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "1r27pdisg4hl4x23lrmykqfdc5agrc4pi161mhvzd1vjfkjrxbid"; + sha256 = "1hmrp39x6c8i1l5d0hla0c8k6mf70sdyfjrlnwiqyi2p4s6phyd2"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index e3be66e8b1ca..356462e8a4af 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "--with-libiconv-prefix=${libiconv}" ]; - doCheck = !stdenv.hostPlatform.isMusl; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 74be133b0687..ed1052ce40a0 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.9.0"; + name = "mbedtls-2.10.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "1pb1my8wwa757hvd06qwidkj58fa1wayf16g98q600xhya5fj3vx"; + sha256 = "0im83kqf7a64ywxh6dnv0by3gwxww93zx5wpdqglr6xp7b8yg4xk"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index c84cddc897c1..0fd531fa282f 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }: -let version = "1.8"; in +let version = "2.2"; in stdenv.mkDerivation rec { name = "ndpi-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "ntop"; repo = "nDPI"; rev = "${version}"; - sha256 = "0kxp9dv4d1nmr2cxv6zsfy2j14wyb0q6am0qyxg0npjb08p7njf4"; + sha256 = "06gg8lhn944arlczmv5i40jkjdnl1nrvsmvm843l9ybcswpayv4m"; }; configureScript = "./autogen.sh"; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index f5715157531e..1a98ecc87436 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit7, cudatoolkit75, cudatoolkit8, cudatoolkit9 }: +{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -8,37 +8,44 @@ let in { - cudnn_cudatoolkit7 = generic rec { + cudnn_cudatoolkit_7 = generic rec { version = "4.0"; - cudatoolkit = cudatoolkit7; + cudatoolkit = cudatoolkit_7; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz"; sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f"; }; - cudnn_cudatoolkit75 = generic rec { + cudnn_cudatoolkit_7_5 = generic rec { version = "6.0"; - cudatoolkit = cudatoolkit75; + cudatoolkit = cudatoolkit_7_5; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an"; }; - cudnn6_cudatoolkit8 = generic rec { + cudnn6_cudatoolkit_8 = generic rec { version = "6.0"; - cudatoolkit = cudatoolkit8; + cudatoolkit = cudatoolkit_8; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv"; }; - cudnn_cudatoolkit8 = generic rec { + cudnn_cudatoolkit_8 = generic rec { version = "7.0.5"; - cudatoolkit = cudatoolkit8; + cudatoolkit = cudatoolkit_8; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e"; }; - cudnn_cudatoolkit9 = generic rec { + cudnn_cudatoolkit_9_0 = generic rec { version = "7.0.5"; - cudatoolkit = cudatoolkit9; + cudatoolkit = cudatoolkit_9_0; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; + sha256 = "03mbv4m5lhwnc181xz8li067pjzzhxqbxgnrfc68dffm8xj0fghs"; + }; + + cudnn_cudatoolkit_9 = generic rec { + version = "7.0.5"; + cudatoolkit = cudatoolkit_9; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y"; }; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index 1d692f6316ff..d3c20258425b 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit8, cudatoolkit9 }: +{ callPackage, cudatoolkit_8, cudatoolkit_9 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -8,16 +8,16 @@ let in { - nccl_cudatoolkit8 = generic rec { + nccl_cudatoolkit_8 = generic rec { version = "2.1.4"; - cudatoolkit = cudatoolkit8; + cudatoolkit = cudatoolkit_8; srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi"; }; - nccl_cudatoolkit9 = generic rec { + nccl_cudatoolkit_9 = generic rec { version = "2.1.4"; - cudatoolkit = cudatoolkit9; + cudatoolkit = cudatoolkit_9; srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p"; }; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index fa65a14121fc..47686451eee6 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.13.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "0mvq7ifcpckfrg0zzcxqfbrv08pnz4a8g2z2j3s9h3cwns9ipn6h"; + sha256 = "1jqhq0dl2zxks7dm6g3dm1zvrl646ab073kgg8ypv19nkd5cvbdv"; }; outputs = [ "out" "dev" "doc" "lib" ]; diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index a0a15bf184dc..6a647192e091 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { jdk python3 which ]) + ":${platformTools}/platform-tools"; in '' - set -x mkdir -pv $out/libexec mkdir -pv $out/lib64 ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5 diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 6d4deac38c47..c8b29759b97c 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -1,14 +1,24 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "0.6"; + sha256 = "18wpyxblz9jh5bfp0hpffnd0q8cq1b0dqp0f36vhqydfknlnpx8y"; + } else { + version = "0.5"; + sha256 = "1j17rhifdjv1z262dma148ywg34x0zjn8vczdrnkwajsm4qg1hw3"; + }; +in + stdenv.mkDerivation { - name = "ocaml-functory-0.5"; + name = "ocaml${ocaml.version}-functory-${param.version}"; src = fetchurl { - url = https://www.lri.fr/~filliatr/functory/download/functory-0.5.tar.gz; - sha256 = "1j17rhifdjv1z262dma148ywg34x0zjn8vczdrnkwajsm4qg1hw3"; + url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index 72e27ab9a0dd..4566c04fcb6a 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -1,11 +1,11 @@ {buildPerlPackage, fetchurl, db}: buildPerlPackage rec { - name = "BerkeleyDB-0.54"; - + name = "BerkeleyDB-0.55"; + src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "010e66d0034b93a8397c600da320611149aef7861eaf1f93b95e49ae37b825b8"; + sha256 = "0kz40wqr7qwag43qnmkpri03cjnqwzb0kj0vc9aw9yz2qx0y2a3g"; }; preConfigure = '' diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index a136e61e5547..832cec169ba3 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, zlib, stdenv }: buildPerlPackage rec { - name = "Compress-Raw-Zlib-2.074"; + name = "Compress-Raw-Zlib-2.081"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "08bpx9v6i40n54rdcj6invlj294z20amrl8wvwf9b83aldwdwsd3"; + sha256 = "06rsm9ahp20xfyvd3jc69sd0k8vqysryxc6apzdbn96jbcsdwmp1"; }; preConfigure = '' diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 12ddcf166e25..2191c233d455 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, DBI, mysql }: buildPerlPackage rec { - name = "DBD-mysql-4.041"; + name = "DBD-mysql-4.046"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICHIELB/${name}.tar.gz"; - sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7"; + url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; + sha256 = "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1"; }; buildInputs = [ mysql.connector-c ] ; diff --git a/pkgs/development/perl-modules/DBD-sybase/default.nix b/pkgs/development/perl-modules/DBD-sybase/default.nix new file mode 100644 index 000000000000..ced458396da5 --- /dev/null +++ b/pkgs/development/perl-modules/DBD-sybase/default.nix @@ -0,0 +1,17 @@ +{ fetchurl, buildPerlPackage, DBI, freetds }: + +buildPerlPackage rec { + name = "DBD-Sybase-1.16"; + + src = fetchurl { + url = "mirror://cpan/authors/id/M/ME/MEWP/${name}.tar.gz"; + sha256 = "1k6n261nrrcll9wxn5xwi4ibpavqv1il96687k62mbpznzl2gx37"; + }; + + SYBASE = freetds; + + buildInputs = [ freetds ] ; + propagatedBuildInputs = [ DBI ]; + + doCheck = false; +} diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index 9d189de77c4e..b34ea3873660 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -1,11 +1,11 @@ {fetchurl, buildPerlPackage, db}: buildPerlPackage rec { - name = "DB_File-1.831"; + name = "DB_File-1.841"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0hq2vvcsa3nkb5bpcl0nkfsxhk8wyrsp3p3ara18rscrfd783hjs"; + sha256 = "11fks42kgscpia0mxx4lc9krm7q4gv6w7m5h3m2jr3dl7viv36hn"; }; preConfigure = '' diff --git a/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch b/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch deleted file mode 100644 index 24eab55f6eb5..000000000000 --- a/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch +++ /dev/null @@ -1,49 +0,0 @@ -This patch configures Getopt::Long to pass options -so they will be available at the second GetOptions call. - -Also an option to specify the search path for libfontconfig -is added. -diff -Naur GD-2.45/Makefile.PL GD-2.45-patched/Makefile.PL ---- GD-2.45/Makefile.PL 2009-07-10 13:40:07.000000000 -0430 -+++ GD-2.45-patched/Makefile.PL 2010-11-26 22:48:52.372992578 -0430 -@@ -16,9 +16,9 @@ - my (@INC,@LIBPATH,@LIBS); - my $AUTOCONFIG = 0; # global set by try_to_autoconfigure() below - --my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force); -+my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$lib_fontconfig_path,$force); - --use Getopt::Long; -+use Getopt::Long qw(:config pass_through); - GetOptions("ignore_missing_gd" => \$force); - - unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) { -@@ -49,6 +49,7 @@ - "lib_jpeg_path=s" => \$lib_jpeg_path, - "lib_xpm_path=s" => \$lib_xpm_path, - "lib_zlib_path=s" => \$lib_zlib_path, -+ "lib_fontconfig_path=s" => \$lib_fontconfig_path, - ); - unless ($result) { - print STDERR <<END; -@@ -64,6 +65,7 @@ - -lib_jpeg_path path path to libjpeg - -lib_xpm_path path path to libxpm - -lib_zlib_path path path to libpng -+ -lib_fontconfig_path path path to libfontconfig - -ignore_missing_gd Ignore missing or old libgd installations and try to compile anyway - - If no options are passed on the command line. The program will -@@ -111,6 +113,12 @@ - @INC = ("-I$lib_zlib_path/include", @INC); - @LIBPATH = ("-L$lib_zlib_path/lib", @LIBPATH); - } -+if( defined($lib_fontconfig_path) ) -+{ -+ print "Fontconfig library used from: $lib_fontconfig_path\n"; -+ @INC = ("-I$lib_fontconfig_path/include", @INC); -+ @LIBPATH = ("-L$lib_fontconfig_path/lib", @LIBPATH); -+} - ############################################################################################# - - if ($^O eq 'VMS'){ diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index dd403ae5caf6..189468a2daa9 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -11,7 +11,19 @@ , ncurses }: -buildPythonPackage rec { +let + excludedTests = [] + # cython's testsuite is not working very well with libc++ + # We are however optimistic about things outside of testsuite still working + ++ stdenv.lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ] + # Some tests in the test suite isn't working on aarch64. Disable them for + # now until upstream finds a workaround. + # Upstream issue here: https://github.com/cython/cython/issues/2308 + ++ stdenv.lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] + ++ stdenv.lib.optionals stdenv.isi686 [ "future_division" "overflow_check_longlong" ] + ; + +in buildPythonPackage rec { pname = "Cython"; version = "0.28.3"; @@ -29,12 +41,11 @@ buildPythonPackage rec { buildInputs = [ glibcLocales gdb ]; LC_ALL = "en_US.UTF-8"; - # cython's testsuite is not working very well with libc++ - # We are however optimistic about things outside of testsuite still working checkPhase = '' export HOME="$NIX_BUILD_TOP" ${python.interpreter} runtests.py \ - ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""} + ${stdenv.lib.optionalString (builtins.length excludedTests != 0) + ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''} ''; meta = { diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix new file mode 100644 index 000000000000..1c3c1fdefbea --- /dev/null +++ b/pkgs/development/python-modules/autograd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, numpy, future, nose }: + +buildPythonPackage rec { + pname = "autograd"; + version = "1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zd4lhz9dpll4i63jjijbzkzbgmg8h88il7lr7kmcylvadnzm2x0"; + }; + + propagatedBuildInputs = [ numpy future ]; + + # Currently, the PyPI tarball doesn't contain the tests. When that has been + # fixed, enable testing. See: https://github.com/HIPS/autograd/issues/404 + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/HIPS/autograd; + description = "Compute derivatives of NumPy code efficiently"; + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 7b6159d0e616..43446b407af6 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -1,16 +1,13 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchPypi , click, jinja2, terminaltables }: buildPythonPackage rec { pname = "envs"; - version = "1.2.4"; + version = "1.2.6"; - # move to fetchPyPi when https://github.com/capless/envs/issues/8 is fixed - src = fetchFromGitHub { - owner = "capless"; - repo = "envs"; - rev = "e1f6cbad7f20316fc44324d2c50826d57c2817a8"; - sha256 = "0p88a79amj0jxll3ssq1dzg78y7zwgc8yqyr7cf53nv2i7kmpakv"; + src = fetchPypi { + inherit pname version; + sha256 = "5fe059d6df1ae01c422d32b10ec7f539baad0e7d339f4c8b2de4ad8cbb07c8ba"; }; checkInputs = [ click jinja2 terminaltables ]; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 54cfb5dc93ba..144e826b675d 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage -, numpy, hdf5, cython, six, pkgconfig +{ stdenv, fetchPypi, fetchpatch, isPy27, python, buildPythonPackage +, numpy, hdf5, cython, six, pkgconfig, unittest2 , mpi4py ? null, openssh }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -10,12 +10,12 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "2.7.1"; + version = "2.8.0"; pname = "h5py"; src = fetchPypi { inherit pname version; - sha256 = "180a688311e826ff6ae6d3bda9b5c292b90b28787525ddfcb10a29d5ddcae2cc"; + sha256 = "0mdr6wrq02ac93m1aqx9kad0ppfzmm4imlxqgyy1x4l7hmdcc9p6"; }; configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; @@ -30,18 +30,13 @@ in buildPythonPackage rec { preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; + checkInputs = optional isPy27 unittest2; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ hdf5 cython ] ++ optional mpiSupport mpi; propagatedBuildInputs = [ numpy six] ++ optionals mpiSupport [ mpi4py openssh ]; - patches = [ - # Patch is based on upstream patch. The tox.ini hunk had to be removed. - # https://github.com/h5py/h5py/commit/5009e062a6f7d4e074cab0fcb42a780ac2b1d7d4.patch - ./numpy-1.14.patch - ]; - meta = { description = "Pythonic interface to the HDF5 binary data format"; diff --git a/pkgs/development/python-modules/h5py/numpy-1.14.patch b/pkgs/development/python-modules/h5py/numpy-1.14.patch deleted file mode 100644 index e1db7e05808d..000000000000 --- a/pkgs/development/python-modules/h5py/numpy-1.14.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 5009e062a6f7d4e074cab0fcb42a780ac2b1d7d4 Mon Sep 17 00:00:00 2001 -From: James Tocknell <aragilar@gmail.com> -Date: Thu, 28 Dec 2017 20:55:55 +1100 -Subject: [PATCH] FIX: Don't reorder compound types, breaks on numpy 1.14 - ---- - h5py/h5t.pyx | 25 +++++++------------------ - setup.py | 2 +- - tox.ini | 4 ++-- - 3 files changed, 10 insertions(+), 21 deletions(-) - -diff --git a/h5py/h5t.pyx b/h5py/h5t.pyx -index cc2344e1..7445e9eb 100644 ---- a/h5py/h5t.pyx -+++ b/h5py/h5t.pyx -@@ -1136,12 +1136,6 @@ cdef class TypeCompoundID(TypeCompositeID): - else: - if sys.version[0] == '3': - field_names = [x.decode('utf8') for x in field_names] -- if len(field_names) > 0: -- collated_fields = zip(field_names, field_types, field_offsets) -- ordered_fields = sorted( -- collated_fields, key=operator.itemgetter(2)) -- field_names, field_types, field_offsets = \ -- map(list, zip(*ordered_fields)) - typeobj = dtype({ - 'names': field_names, - 'formats': field_types, -@@ -1458,8 +1452,7 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): - cdef dtype member_dt - cdef size_t member_offset = 0 - -- cdef dict offsets = {} -- cdef list fields = [] -+ cdef dict fields = {} - - # The challenge with correctly converting a numpy/h5py dtype to a HDF5 type - # which is composed of subtypes has three aspects we must consider -@@ -1468,19 +1461,14 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): - # 2. For correct round-tripping of aligned dtypes, we need to consider how - # much padding we need by looking at the field offsets - # 3. There is no requirement that the offsets be monotonically increasing -- # (so we start by sorting the names as a function of increasing offset) - # - # The code below tries to cover these aspects - -- # Get offsets for each compound member -- for name, field in dt.fields.items(): -- offsets[name] = field[1] -- - # Build list of names, offsets, and types, sorted by increasing offset - # (i.e. the position of the member in the struct) -- for name in sorted(dt.names, key=offsets.__getitem__): -+ for name in sorted(dt.names, key=(lambda n: dt.fields[n][1])): - field = dt.fields[name] -- name = name.encode('utf8') if isinstance(name, unicode) else name -+ h5_name = name.encode('utf8') if isinstance(name, unicode) else name - - # Get HDF5 data types and set the offset for each member - member_dt = field[0] -@@ -1489,7 +1477,7 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): - if aligned and (member_offset > field[1] - or member_dt.itemsize != member_type.get_size()): - raise TypeError("Enforced alignment not compatible with HDF5 type") -- fields.append((name, member_offset, member_type)) -+ fields[name] = (h5_name, member_offset, member_type) - - # Update member offset based on the HDF5 type size - member_offset += member_type.get_size() -@@ -1500,8 +1488,9 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): - - # Create compound with the necessary size, and insert its members - tid = H5Tcreate(H5T_COMPOUND, member_offset) -- for (name, member_offset, member_type) in fields: -- H5Tinsert(tid, name, member_offset, member_type.id) -+ for name in dt.names: -+ h5_name, member_offset, member_type = fields[name] -+ H5Tinsert(tid, h5_name, member_offset, member_type.id) - - return TypeCompoundID(tid) - -diff --git a/setup.py b/setup.py -index ec2a78a7..bbb086f6 100755 ---- a/setup.py -+++ b/setup.py -@@ -32,7 +32,7 @@ - # these are required to build h5py - # RUN_REQUIRES is included as setup.py test needs RUN_REQUIRES for testing - # RUN_REQUIRES can be removed when setup.py test is removed --SETUP_REQUIRES = RUN_REQUIRES + [NUMPY_DEP, 'Cython>=0.19', 'pkgconfig'] -+SETUP_REQUIRES = RUN_REQUIRES + [NUMPY_DEP, 'Cython>=0.23', 'pkgconfig'] - - # Needed to avoid trying to install numpy/cython on pythons which the latest - # versions don't support diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix new file mode 100644 index 000000000000..296b20fac4a2 --- /dev/null +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, numpy, pandas, pytz, six, pytest }: + +buildPythonPackage rec { + pname = "pvlib"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1897v9qq97nk5n0hfm9089yz8pffd42795mnhcyq48g9bsyap1xi"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy pandas pytz six ]; + + # Currently, the PyPI tarball doesn't contain the tests. When that has been + # fixed, enable testing. See: https://github.com/pvlib/pvlib-python/issues/473 + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://pvlib-python.readthedocs.io; + description = "Simulate the performance of photovoltaic energy systems"; + license = licenses.bsd3; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/pyezminc/default.nix b/pkgs/development/python-modules/pyezminc/default.nix new file mode 100644 index 000000000000..614a1555cbef --- /dev/null +++ b/pkgs/development/python-modules/pyezminc/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage, isPy3k, fetchFromGitHub, stdenv, + netcdf, hdf5, libminc, ezminc, + cython, numpy, scipy +}: + +buildPythonPackage rec { + pname = "pyezminc"; + version = "1.2.01"; + + disabled = isPy3k; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = "pyezminc"; + rev = "release-${version}"; + sha256 = "13smvramacisbwj8qsl160dnvv6ynngn1jmqwhvy146nmadphyv1"; + }; + + nativeBuildInputs = [ cython ]; + buildInputs = [ netcdf hdf5 libminc ezminc ]; + propagatedBuildInputs = [ numpy scipy ]; + + NIX_CFLAGS_COMPILE = "-fpermissive"; + + doCheck = false; # e.g., expects test data in /opt + + meta = { + homepage = https://github.com/BIC-MNI/pyezminc; + description = "Python API for libminc using EZMINC"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index c9b89ff7616a..9c6b84e8c7ac 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, isPy36, pythonOlder +, isPy3k, isPy35, isPy36, pythonOlder , numpy , six , protobuf @@ -12,20 +12,40 @@ , enum34 , tensorflow-tensorboard , cudaSupport ? false +, cudatoolkit ? null +, cudnn ? null +, nvidia_x11 ? null +, zlib +, python +, symlinkJoin }: -# tensorflow is built from a downloaded wheel because the source -# build doesn't yet work on Darwin. +# We keep this binary build for two reasons: +# - the source build doesn't work on Darwin. +# - the source build is currently brittle and not easy to maintain -buildPythonPackage rec { +assert cudaSupport -> cudatoolkit != null + && cudnn != null + && nvidia_x11 != null; +let + cudatoolkit_joined = symlinkJoin { + name = "unsplit_cudatoolkit"; + paths = [ cudatoolkit.out + cudatoolkit.lib ];}; + +in buildPythonPackage rec { pname = "tensorflow"; - version = "1.5.0"; + version = "1.7.1"; format = "wheel"; - src = fetchurl { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py3-none-any.whl"; - sha256 = "1mapv45n9wmgcq3i3im0pv0gmhwkxw5z69nsnxb1gfxbj1mz5h9m"; - }; + src = let + pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) "${python.majorVersion}"; + version = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot; + platform = if stdenv.isDarwin then "mac" else "linux"; + unit = if cudaSupport then "gpu" else "cpu"; + key = "${platform}_py_${version}_${unit}"; + dls = import ./tf1.7.1-hashes.nix; + in fetchurl dls.${key}; propagatedBuildInputs = [ numpy six protobuf absl-py ] ++ lib.optional (!isPy3k) mock @@ -38,14 +58,28 @@ buildPythonPackage rec { # bleach) Hence we disable dependency checking for now. installFlags = lib.optional isPy36 "--no-dependencies"; + # Note that we need to run *after* the fixup phase because the + # libraries are loaded at runtime. If we run in preFixup then + # patchelf --shrink-rpath will remove the cuda libraries. + postFixup = let + rpath = stdenv.lib.makeLibraryPath + ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn nvidia_x11 ]); + in + lib.optionalString (stdenv.isLinux) '' + rrPath="$out/${python.sitePackages}/tensorflow/:${rpath}" + internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so" + find $out -name '*.${stdenv.hostPlatform.extensions.sharedLibrary}' -exec patchelf --set-rpath "$rrPath" {} \; + ''; + + meta = with stdenv.lib; { description = "Computation using data flow graphs for scalable machine learning"; homepage = http://tensorflow.org; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; - platforms = platforms.darwin; + platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin; # Python 2.7 build uses different string encoding. # See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253 - broken = cudaSupport || !isPy3k; + broken = stdenv.isDarwin && !isPy3k; }; } diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh new file mode 100644 index 000000000000..ba9aa0bdf356 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -0,0 +1,29 @@ +version=1.7.1 +hashfile=tf${version}-hashes.nix +rm -f $hashfile +echo "{" >> $hashfile +for sys in "linux" "mac"; do + for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do + for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64"; do + if [ $sys == "mac" ]; then + [[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]] + result=$? + pyver=${pykind:2:1} + flavour=cpu + else + [[ $pykind =~ .*linux.* ]] + result=$? + pyver=${pykind:2:2} + flavour=${tfpref:0:3} + fi + if [ $result == 0 ]; then + url=https://storage.googleapis.com/tensorflow/$sys/$tfpref-$version-$pykind.whl + hash=$(nix-prefetch-url $url) + echo "${sys}_py_${pyver}_${flavour} = {" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " sha256 = \"$hash\";" >> $hashfile + echo "};" >> $hashfile + fi + done + done +done diff --git a/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix new file mode 100644 index 000000000000..c9ed7c182644 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix @@ -0,0 +1,34 @@ +{ +linux_py_27_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp27-none-linux_x86_64.whl"; + sha256 = "0p8n5x74qmdv9g63y176xqpfdc1gawzjysn79bvk46knrks3pa2b"; +}; +linux_py_35_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp35-cp35m-linux_x86_64.whl"; + sha256 = "050qv8fjpnw2y8da7s910jv4nsxg56d3xdpl09jim47kbwqabr5m"; +}; +linux_py_36_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp36-cp36m-linux_x86_64.whl"; + sha256 = "00d5cij1mh64hh0zc2qfl8z2hpr3nna6lhpsc6qh4am1g7wz4ndn"; +}; +linux_py_27_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp27-none-linux_x86_64.whl"; + sha256 = "0ami6nlp9cwg631a8f5rfpzpwb9ls9zxhsx61cimw46xljx3l2b5"; +}; +linux_py_35_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp35-cp35m-linux_x86_64.whl"; + sha256 = "1xfc8dww52fy8g4b0j8r20q7yj2bfg20hlk9p7sk3k9z8swfw0kc"; +}; +linux_py_36_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp36-cp36m-linux_x86_64.whl"; + sha256 = "1kkqx8m7h03b8l9l6dki4g4r7sgi3wbb4dp9gvk6l08n4vnlvc50"; +}; +mac_py_2_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.7.1-py2-none-any.whl"; + sha256 = "1icbsvvwkkc09s6bdd43drvnhc6v6xmnqwjzipgc8rmpj1z71yz5"; +}; +mac_py_3_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.7.1-py3-none-any.whl"; + sha256 = "0s5dy956jvwazqflc90v15i912zvhwsbzlf0cl8k7isq52j6g3kp"; +}; +} diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index cbaea0f0d85e..35822fa78bd4 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -433,6 +433,11 @@ let PET = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ]; dti = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ]; mzR = [ pkgs.netcdf ]; + cluster = [ pkgs.libiconv ]; + KernSmooth = [ pkgs.libiconv ]; + nlme = [ pkgs.libiconv ]; + Matrix = [ pkgs.libiconv ]; + mgcv = [ pkgs.libiconv ]; }; packagesRequireingX = [ diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix new file mode 100644 index 000000000000..a98c2b4e04bd --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "bazel-buildtools"; + version = "2018-05-24"; + + goPackagePath = "github.com/bazelbuild/buildtools"; + + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = "buildtools"; + rev = "588d90030bc8054b550967aa45a8a8d170deba0b"; + sha256 = "18q1z138545kh4s5k0jcqwhpzc1w7il4x00l7yzv9wq8bg1vn1rv"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "This derivation contains developer tools for working with Google's bazel buildtool."; + homepage = https://github.com/bazelbuild/buildtools; + license = licenses.asl20; + maintainers = with maintainers; [ uri-canva ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix new file mode 100644 index 000000000000..d53c744d04a9 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "github.com/bazelbuild/buildtools"; + fetch = { + type = "git"; + url = "https://github.com/bazelbuild/buildtools"; + rev = "588d90030bc8054b550967aa45a8a8d170deba0b"; + sha256 = "18q1z138545kh4s5k0jcqwhpzc1w7il4x00l7yzv9wq8bg1vn1rv"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "3a3da3a4e26776cc22a79ef46d5d58477532dede"; + sha256 = "05l0kjgk6ss98qii7vpjj2bqszyd16h448w47sv4422mp2xbni40"; + }; + } + { + goPackagePath = "github.com/google/skylark"; + fetch = { + type = "git"; + url = "https://github.com/google/skylark"; + rev = "572cea2bd78e2f1de8f3e136db9413cf02f097eb"; + sha256 = "0hc7gwvqsw421if06nlfdl86h6jl8wgjx1j2x2mzpnzdh1r03w92"; + }; + } +] diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 73050280f17e..0f42a5e34903 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -9,7 +9,7 @@ let ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}" + export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}\${PATH:+':'}$PATH" ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ''; in diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index b9f6db1cc947..98df266703ac 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -1,7 +1,17 @@ { mkDerivation, ansi-terminal, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty -, tasty-golden, transformers, fetchFromGitHub +, tasty-golden, transformers, fetchFromGitHub, fetchpatch }: + +let + + newShellCheck = fetchpatch { + url = https://github.com/haskell-CI/haskell-ci/pull/159.patch; + sha256 = "17qn099lvfiii5z3hg24idmg4sk6ph7m2k940fsxzhqrad8fkjmw"; + }; + +in + mkDerivation { pname = "haskell-ci"; version = "0"; @@ -11,6 +21,7 @@ mkDerivation { rev = "db63eb7f2eaa64b7b0e4759e98258fea2a27a424"; sha256 = "0ff55zafx7561s1yps7aw83ws4vcpc5cq9r6bbckaagvwwla0dcq"; }; + patches = [ newShellCheck ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index cb64bd602b79..67180b08f026 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # fix "unescaped left brace" errors when using intltool in some cases patches = [(fetchpatch { - name = "perl-5.22.patch"; - url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool" - + "/debian/patches/perl5.22-regex-fixes?revision=47258&view=co&pathrev=47258"; - sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3"; + name = "perl5.26-regex-fixes.patch"; + url = "https://sources.debian.org/data/main/i/intltool/0.51.0-5" + + "/debian/patches/perl5.26-regex-fixes.patch"; + sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45"; })]; propagatedBuildInputs = [ gettext perl perlXMLParser ]; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 8294b68126fc..6be23c171a6a 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lttng-tools-${version}"; - version = "2.10.3"; + version = "2.10.4"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "0x3b6jps053s9pxc7bslj5qsn2z53yf0fk9pcrmxjf9yri17n3qr"; + sha256 = "1p3y7p8m5i5f8qvsib4da2m41rkw7pamvsngplh7wspgvg0zxvay"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 253a7fcbf304..2570ccb51dcd 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cutemaze-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2"; - sha256 = "1a2jmkm7fjzdrvzgvbqfq20k0vvpwfcycagsm0haxb3fpv86950y"; + sha256 = "1gczg8bki9d2kkkkrac5wi4vnjdynv8xjw2qxn9lx1jfkm8fk1qk"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 82710256c631..ee2e442daa28 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -1,14 +1,14 @@ -{ pkgs, pkgsi686Linux, stdenv }: +{ pkgs, stdenv, stdenvNoCC, gccStdenv }: let callPackage = pkgs.newScope self; - callPackage_i686 = pkgsi686Linux.newScope self; self = rec { dwarf-fortress-original = callPackage ./game.nix { }; dfhack = callPackage ./dfhack { inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; + stdenv = gccStdenv; }; soundSense = callPackage ./soundsense.nix { }; @@ -32,9 +32,13 @@ let dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { }; - phoebus-theme = callPackage ./themes/phoebus.nix { }; + themes = callPackage ./themes { + stdenv = stdenvNoCC; + }; + + phoebus-theme = themes.phoebus; - cla-theme = callPackage ./themes/cla.nix { }; + cla-theme = themes.cla; }; in self diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 641676489ed9..a77f50a51711 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,13 +1,11 @@ -{ stdenv, lib, fetchgit, cmake, writeScriptBin, callPackage +{ stdenv, hostPlatform, lib, fetchFromGitHub, cmake, writeScriptBin, callPackage , perl, XMLLibXML, XMLLibXSLT, zlib , enableStoneSense ? false, allegro5, libGLU_combined }: let - dfVersion = "0.44.09"; + dfVersion = "0.44.10"; version = "${dfVersion}-r1"; - rev = "refs/tags/${version}"; - sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9"; # revision of library/xml submodule xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5"; @@ -25,7 +23,7 @@ let if [ "$(dirname "$(pwd)")" = "xml" ]; then echo "${xmlRev}" else - echo "${rev}" + echo "refs/tags/${version}" fi elif [ "$*" = "rev-parse HEAD:library/xml" ]; then echo "${xmlRev}" @@ -38,13 +36,13 @@ in stdenv.mkDerivation rec { name = "dfhack-${version}"; # Beware of submodules - src = fetchgit { - url = "https://github.com/DFHack/dfhack"; - inherit rev sha256; + src = fetchFromGitHub { + owner = "DFHack"; + repo = "dfhack"; + sha256 = "0srgymyd57hk9iffhi2i0ra5vzw2vzlpzn4042yb90vqpmvz2zrj"; + rev = version; }; - patches = [ ./fix-stonesense.patch ]; - nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib ] diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch deleted file mode 100644 index da860cd55624..000000000000 --- a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001 -From: Herwig Hochleitner <hhochleitner@gmail.com> -Date: Sun, 1 Oct 2017 18:01:43 +0200 -Subject: [PATCH] include <GL/glext.h> - -this fixes `GLhandleARB` not being defined ---- - plugins/stonesense/common.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h -index eb36691..ef45389 100644 ---- a/plugins/stonesense/common.h -+++ b/plugins/stonesense/common.h -@@ -31,6 +31,8 @@ using namespace df::enums; - #include <allegro5/allegro_opengl.h> - #include <allegro5/utf8.h> - -+#include <GL/glext.h> -+ - // allegro leaks X headers, undef some of it here: - #undef TileShape - #undef None \ No newline at end of file diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 29cc2dc62857..2e54258c4be9 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,33 +2,18 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "39.3.1"; + version = "40.0.0"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "0vb0dg1r833gaa4jzlrxf9acn41az3xjs9alx7r9lkqwvkjyrdy2"; + sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9"; }; - outputs = [ "out" "layouts" ]; buildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ texlive cmake ninja ]; - configurePhase = '' - cmake -GNinja - ''; - - buildPhase = '' - ninja -j$NIX_BUILD_CORES - ''; - - installPhase = '' - mkdir -p $out/bin - cp ./DwarfTherapist $out/bin/DwarfTherapist - cp -r ./share/memory_layouts $layouts - ''; - meta = with stdenv.lib; { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with maintainers; [ the-kenny abbradar bendlas ]; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 6debf0bb0b2b..f9e3e468cdc0 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -18,7 +18,7 @@ in symlinkJoin { postBuild = '' # DwarfTherapist assumes it's run in $out/share/dwarftherapist and # therefore uses many relative paths. - wrapProgram $out/bin/DwarfTherapist \ + wrapProgram $out/bin/dwarftherapist \ --run "cd $out/share/dwarftherapist" rm -rf $out/share/dwarftherapist/memory_layouts/linux @@ -26,7 +26,7 @@ in symlinkJoin { origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8) patchedmd5=$(cat "${dfHashFile}" | cut -c1-8) substitute \ - ${dt.layouts}/${inifile} \ + ${dt}/share/dwarftherapist/memory_layouts/${inifile} \ $out/share/dwarftherapist/memory_layouts/${inifile} \ --replace "$origmd5" "$patchedmd5" ''; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 79eb6e191329..477ba33b77c6 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -9,7 +9,7 @@ with lib; let baseVersion = "44"; - patchVersion = "09"; + patchVersion = "10"; dfVersion = "0.${baseVersion}.${patchVersion}"; libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; @@ -21,15 +21,15 @@ let srcs = { "x86_64-linux" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2"; - sha256 = "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy"; + sha256 = "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2"; }; "i686-linux" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2"; - sha256 = "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8"; + sha256 = "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n"; }; "x86_64-darwin" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2"; - sha256 = "01dss8g9lmi8majp6lxcfw166ydz4himkz6am5pi29gixaf4vfqs"; + sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g"; }; }; diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index 67c86f7f745c..f09ac8435482 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "2016-1_196"; - dfVersion = "0.44.09"; + dfVersion = "0.44.10"; inherit soundPack; name = "soundsense-${version}"; src = fetchzip { diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix deleted file mode 100644 index c7d85c48ce8e..000000000000 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -# On upgrade check https://github.com/DFgraphics/CLA/blob/master/manifest.json -# for compatibility information. - -stdenv.mkDerivation rec { - name = "cla-theme-${version}"; - version = "44.xx-v25"; - - src = fetchFromGitHub { - owner = "DFgraphics"; - repo = "CLA"; - rev = version; - sha256 = "1h8nwa939qzqklbi8vwsq9p2brvv7sc0pbzzrdjnb221lr9p58zk"; - }; - - installPhase = '' - mkdir $out - cp -r data raw $out - ''; - - passthru.dfVersion = "0.44.09"; - - preferLocalBuild = true; - - meta = with stdenv.lib; { - description = "CLA graphics set for Dwarf Fortress"; - homepage = http://www.bay12forums.com/smf/index.php?topic=105376.0; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - license = licenses.free; - }; -} diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix new file mode 100644 index 000000000000..90f46d052618 --- /dev/null +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -0,0 +1,25 @@ +{stdenv, lib, fetchFromGitHub}: + +with builtins; + +listToAttrs (map (v: { + inherit (v) name; + value = stdenv.mkDerivation { + name = "${v.name}-${v.version}"; + src = fetchFromGitHub { + owner = "DFgraphics"; + repo = v.name; + rev = v.version; + sha256 = v.sha256; + }; + installPhase = '' + mkdir -p $out + cp -r data raw $out + ''; + meta = with lib; { + platforms = platforms.all; + maintainers = [ maintainers.matthewbauer ]; + license = licenses.free; + }; + }; +}) (fromJSON (readFile ./themes.json))) diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix deleted file mode 100644 index 8641e15fa864..000000000000 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -# On upgrade check https://github.com/DFgraphics/Phoebus/blob/master/manifest.json -# for compatibility information. - -stdenv.mkDerivation rec { - name = "phoebus-theme-${version}"; - version = "44.07"; - - src = fetchFromGitHub { - owner = "DFgraphics"; - repo = "Phoebus"; - rev = version; - sha256 = "114yc0s7j57i4rq6iq295gggbgzx4qb389xip8lkzfg4dnp6klns"; - }; - - installPhase = '' - mkdir $out - cp -r data raw $out - ''; - - passthru.dfVersion = "0.44.09"; - - preferLocalBuild = true; - - meta = with stdenv.lib; { - description = "Phoebus graphics set for Dwarf Fortress"; - homepage = http://www.bay12forums.com/smf/index.php?topic=137096.0; - platforms = platforms.all; - maintainers = with maintainers; [ a1russell abbradar ]; - # https://github.com/fricy/Phoebus/issues/5 - license = licenses.free; - }; -} diff --git a/pkgs/games/dwarf-fortress/themes/themes.json b/pkgs/games/dwarf-fortress/themes/themes.json new file mode 100644 index 000000000000..f2cc4ed3ac7d --- /dev/null +++ b/pkgs/games/dwarf-fortress/themes/themes.json @@ -0,0 +1,72 @@ +[ + { + "name": "taffer", + "version": "44.10a", + "sha256": "0gp8hmv55bp34db0caksdpd3kn2glh7sz03gyxknzdymh1cpy0qv" + }, + { + "name": "spacefox", + "version": "44.10a", + "sha256": "0ngipq1aha8cd34k4hkrfbi238gp36qpymr2f87d3nwbj2vi9hmh" + }, + { + "name": "gemset", + "version": "44.10a", + "sha256": "14q69dyqzhxsfv1a4vh17fx7r7mylfimmjrydz6ygdypblgc9zm6" + }, + { + "name": "wanderlust", + "version": "44.10", + "sha256": "016acv0ab2wj4rn9slhbf626977zas6q4372f7avaf99ihcmwi85" + }, + { + "name": "rally-ho", + "version": "44.10", + "sha256": "1pij5llnc8hfsqgyrwj1ak123wxhhk7yhlpnj033gwbpp0lnqz2x" + }, + { + "name": "phoebus", + "version": "44.10", + "sha256": "1fvl5251wzjns159snhw01p214k53vpdlyj7piv545r23q7wg2ji" + }, + { + "name": "obsidian", + "version": "44.10", + "sha256": "06lixlkprjd829zn10g5zljnxymsh81g31dj86hn2jvlch4dh98q" + }, + { + "name": "mayday", + "version": "44.10", + "sha256": "1g15ha0w93iyj5ni2pavhwrsckhnw80xvwrvw4dbp5zx1y41f3x9" + }, + { + "name": "jolly-bastion", + "version": "44.10", + "sha256": "038qvr08776rinlqa6zwb8qqxyrc75nnyyqjsasr2rf9d2f9yf8j" + }, + { + "name": "ironhand", + "version": "44.10", + "sha256": "14hngixd4gkw0lzqzlkj9ljmrxr8b3wgjk67n6zysgyi3f38f5j2" + }, + { + "name": "afro-graphics", + "version": "44.10", + "sha256": "050mrpy9q6g9y4133al7rdsj6c9hy2wva7jqmc56babvmmcpcc2j" + }, + { + "name": "cla", + "version": "44.xx-v25", + "sha256": "1h8nwa939qzqklbi8vwsq9p2brvv7sc0pbzzrdjnb221lr9p58zk" + }, + { + "name": "tergel", + "version": "44.03", + "sha256": "1kgk0cav5b6v7mca36gm84b2p556ibd8yy4rwbfc4i6i3hlsdw07" + }, + { + "name": "autoreiv", + "version": "44.03", + "sha256": "03w9dp42718p5gnswynw3p9wz85y61gkzz60jf71arw1zhf23wm0" + } +] diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index fc42c05f0701..d816ba461b11 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -3,7 +3,7 @@ , ncurses, glib, gtk2, libsndfile, zlib }: -let dfVersion = "0.44.09"; in +let dfVersion = "0.44.10"; in stdenv.mkDerivation { name = "dwarf_fortress_unfuck-${dfVersion}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; rev = dfVersion; - sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b"; + sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"; }; cmakeFlags = [ diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index e34f29300ab4..5a35b06a1e3d 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; - homepage = https://openrct2.website/; + homepage = https://openrct2.io/; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ geistesk ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 7ea9d51b4bf6..bb9e4fa755db 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, autoreconfHook }: +{ stdenv, appleDerivation, autoreconfHook, targetPlatform, enableStatic ? targetPlatform.isiOS }: appleDerivation { postUnpack = "sourceRoot=$sourceRoot/libiconv"; @@ -7,7 +7,9 @@ appleDerivation { sed -i 's/darwin\*/ios\*/g' configure libcharset/configure ''; - postInstall = '' + configureFlags = stdenv.lib.optionals enableStatic [ "--enable-static" "--disable-shared" ]; + + postInstall = stdenv.lib.optionalString (!enableStatic) '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 4cfc0874fcd0..46f6f03b90a7 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -17,7 +17,7 @@ let requireXcode = version: sha256: ''; app = requireFile rec { name = "Xcode.app"; - url = "https://download.developer.apple.com/Developer_Tools/Xcode_" + version + "/" + xip; + url = "https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_${version}/${xip}"; hashMode = "recursive"; inherit sha256; message = '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e06be4838ee3..ecef71fd604f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.135"; + version = "4.4.136"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1p41fz1jhcrzcmvhbl8di1660bv0w2wpcmi4hfgksdjfh84b1k03"; + sha256 = "0svb6qbhc376jk26r67qssh7lradx63s60qlm1q2kd4xjhxyj5a3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index e4a02b10e992..bcc4aad7fccb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.106"; + version = "4.9.107"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0g5y3ckwb1zn8gzsk1sc6vnmsrvsx5g2a1p0p9hrmsl8jnr9nh1d"; + sha256 = "1lya48grdgjjbzw8x5kvvblanfas23dcmchysnhwv5p0rq7g9rrw"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 7c2233714d4c..413ac3efbe54 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchurl, kernel, libelf }: stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq"; }; + buildInputs = [ libelf ]; + hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-function-declaration" ]; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; broken = builtins.compareVersions kernel.version "3.18" == -1 - || builtins.compareVersions kernel.version "4.11" == 1; + || builtins.compareVersions kernel.version "4.16" == 1; }; } diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 1b15edcc923c..491f89f3cb44 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "12ldpkd17cy6fg7z1icr91cfs86jkkrsj61b6wdj0l7h4x624c32"; + sha256 = "1nyml98k28sc5sda0260cmby4irkpnhpwgmx4yhqy10wpr4nr625"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 6f7dd2f56ff7..2bdec70b6f9c 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-3.0.0"; + name = "lxcfs-3.0.1"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "0fsy2h7b5dkzvfm6m8vqzhnji42cszdn0b3ndnaxiwv3402ccmvk"; + sha256 = "0rwk1nbcjnp2d2zbyng8ix9dmww211aiqq8870r9p4j11xv9mgx4"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index cd2985960a75..e05624fa46c8 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -7,13 +7,13 @@ with builtins; stdenv.mkDerivation rec { name = "h2o-${version}"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; rev = "refs/tags/v${version}"; - sha256 = "0176x0bzjry19zs074a9i5vhncc842xikmx43wj61jky318nq4w4"; + sha256 = "0jyvbp6cjiirj44nxqa2fi5y473gnc8awfn8zv82hb1y9rlxqfyv"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 277fa06a7079..39722c6d831f 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -1,50 +1,50 @@ -{ stdenv, fetchurl, cmake, - libxslt, zlib, libxml2, openssl, - enableSSL ? true, - enableMonitor ? false, - enableRproxy ? true, - enableTomahawk ? false, - enableXSLT ? true, - enableToolkit ? true -}: +{ stdenv +, fetchFromGitLab + +, cmake +, ninja + +, libxslt +, libxml2 -assert enableSSL -> openssl !=null; +, enableSSL ? true +, enableMonitor ? false +, enableRproxy ? true +, enableTomahawk ? false +, enableXSLT ? true +, enableToolkit ? true +}: stdenv.mkDerivation rec { name = "hiawatha-${version}"; version = "10.8.1"; - src = fetchurl { - url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz"; - sha256 = "1f2hlw2lp98b4dx87i7pz7h66vsy2g22b5adfrlij3kj0vfv61w8"; + src = fetchFromGitLab { + owner = "hsleisink"; + repo = "hiawatha"; + rev = "v${version}"; + sha256 = "1428byx0xpzzwyc0j157q70sjx18dykvg6fd5vp70kj85ank0xpa"; }; - buildInputs = [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ libxslt libxml2 ]; prePatch = '' substituteInPlace CMakeLists.txt --replace SETUID "" ''; cmakeFlags = [ - ( if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" ) + ( + # FIXME: 2018-06-08: Uses bundled library, with external ("-DUSE_SYSTEM_MBEDTLS=on") asks: + # ../src/tls.c:46:2: error: #error "The mbed TLS library must be compiled with MBEDTLS_THREADING_PTHREAD and MBEDTLS_THREADING_C enabled." + if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" ) ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" ) ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" ) ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" ) ( if enableXSLT then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" ) ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" ) - "-DWEBROOT_DIR=/var/www/hiawatha" - "-DPID_DIR=/run" - "-DWORK_DIR=/var/lib/hiawatha" - "-DLOG_DIR=/var/log/hiawatha" ]; - # workaround because cmake tries installs stuff outside of nix store - makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - postInstall = '' - mv $out/$out/* $out - rm -rf $out/{var,run} - ''; - meta = with stdenv.lib; { description = "An advanced and secure webserver"; license = licenses.gpl2; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index d2667597c627..e562fdc88a6c 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -5,28 +5,27 @@ # see also https://github.com/OpenSMTPD/OpenSMTPD/issues/678 , unpriviledged_smtpctl_encrypt ? true -# This enables you to override the '+' character which typically separates the user from the tag in user+tag@domain.tld +# Deprecated: use the subaddressing-delimiter in the config file going forward , tag_char ? null }: -stdenv.mkDerivation rec { +if (tag_char != null) +then throw "opensmtpd: the tag_char argument is deprecated as it can now be specified at runtime via the 'subaddressing-delimiter' option of the configuration file" +else stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "6.0.2p1"; + version = "6.0.3p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib openssl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "1b4h64w45hpmfq5721smhg4s0shs64gbcjqjpx3fbiw4hz8bdy9a"; + sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81"; }; patches = [ ./proc_path.diff ]; postPatch = with builtins; with lib; - optionalString (isString tag_char) '' - sed -i -e "s,TAG_CHAR.*'+',TAG_CHAR '${tag_char}'," smtpd/smtpd-defines.h - '' + optionalString unpriviledged_smtpctl_encrypt '' substituteInPlace smtpd/smtpctl.c --replace \ 'if (geteuid())' \ diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/servers/mail/opensmtpd/proc_path.diff index 9306685e365e..5e1cfd004299 100644 --- a/pkgs/servers/mail/opensmtpd/proc_path.diff +++ b/pkgs/servers/mail/opensmtpd/proc_path.diff @@ -1,33 +1,8 @@ -diff --git a/smtpd/parse.y b/smtpd/parse.y -index ab02719..c1c77d9 100644 ---- a/smtpd/parse.y -+++ b/smtpd/parse.y -@@ -2534,13 +2534,19 @@ create_filter_proc(char *name, char *prog) - { - struct filter_conf *f; - char *path; -+ const char *proc_path; - - if (dict_get(&conf->sc_filters, name)) { - yyerror("filter \"%s\" already defined", name); - return (NULL); - } - -- if (asprintf(&path, "%s/filter-%s", PATH_LIBEXEC, prog) == -1) { -+ proc_path = getenv("OPENSMTPD_PROC_PATH"); -+ if (proc_path == NULL) { -+ proc_path = PATH_LIBEXEC; -+ } -+ -+ if (asprintf(&path, "%s/filter-%s", proc_path, prog) == -1) { - yyerror("filter \"%s\" asprintf failed", name); - return (0); - } diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c -index afc8891..9b0a80f 100644 +index e049f07c..a1bd03a0 100644 --- a/smtpd/smtpd.c +++ b/smtpd/smtpd.c -@@ -795,6 +795,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname) +@@ -1157,6 +1157,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname) char path[PATH_MAX]; char name[PATH_MAX]; char *arg; @@ -35,7 +10,7 @@ index afc8891..9b0a80f 100644 if (strlcpy(name, conf, sizeof(name)) >= sizeof(name)) { log_warnx("warn: %s-proc: conf too long", key); -@@ -805,7 +806,12 @@ fork_proc_backend(const char *key, const char *conf, const char *procname) +@@ -1167,7 +1168,12 @@ fork_proc_backend(const char *key, const char *conf, const char *procname) if (arg) *arg++ = '\0'; @@ -50,10 +25,10 @@ index afc8891..9b0a80f 100644 log_warn("warn: %s-proc: exec path too long", key); return (-1); diff --git a/smtpd/table.c b/smtpd/table.c -index 21ee237..95b5164 100644 +index 9cfdfb99..24dfcca4 100644 --- a/smtpd/table.c +++ b/smtpd/table.c -@@ -193,6 +193,7 @@ table_create(const char *backend, const char *name, const char *tag, +@@ -201,6 +201,7 @@ table_create(const char *backend, const char *name, const char *tag, struct table_backend *tb; char buf[LINE_MAX]; char path[LINE_MAX]; @@ -61,7 +36,7 @@ index 21ee237..95b5164 100644 size_t n; struct stat sb; -@@ -207,11 +208,16 @@ table_create(const char *backend, const char *name, const char *tag, +@@ -215,11 +216,16 @@ table_create(const char *backend, const char *name, const char *tag, if (name && table_find(name, NULL)) fatalx("table_create: table \"%s\" already defined", name); diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index 350728d509fb..957aee43691a 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper -, perl, NetSNMP, coreutils, gnused, gnugrep }: +, perl, DBDsybase, NetSNMP, coreutils, gnused, gnugrep }: let glplugin = fetchFromGitHub { @@ -9,11 +9,10 @@ let sha256 = "0wb55a9pmgbilfffx0wkiikg9830qd66j635ypczqp4basslpq5b"; }; - generic = { pname, version, sha256, description, ... } @ attrs: + generic = { pname, version, sha256, description, buildInputs, ... }: let - attrs' = builtins.removeAttrs attrs [ "pname" "version" "rev" "sha256"]; name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}"}-${version}"; - in perl.stdenv.mkDerivation rec { + in perl.stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { @@ -21,7 +20,7 @@ let inherit sha256; }; - buildInputs = [ perl NetSNMP ]; + buildInputs = [ perl ] ++ buildInputs; nativeBuildInputs = [ autoreconfHook makeWrapper ]; @@ -54,11 +53,20 @@ let }; in { + check-mssql-health = generic { + pname = "check_mssql_health"; + version = "2.6.4.14"; + sha256 = "0w6gybrs7imx169l8740s0ax3adya867fw0abrampx59mnsj5pm1"; + description = "Check plugin for Microsoft SQL Server."; + buildInputs = [ DBDsybase ]; + }; + check-nwc-health = generic { pname = "check_nwc_health"; version = "7.0.1.3"; sha256 = "0rgd6zgd7kplx3z72n8zbzwkh8vnd83361sk9ibh6ng78sds1sl5"; description = "Check plugin for network equipment."; + buildInputs = [ NetSNMP ]; }; check-ups-health = generic { @@ -66,5 +74,6 @@ in { version = "2.8.2.2"; sha256 = "1gc2wjsymay2vk5ywc1jj9cvrbhs0fs851x8l4nc75df2g75v521"; description = "Check plugin for UPSs."; + buildInputs = [ NetSNMP ]; }; } diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index e22e3a64fac1..fea5583ea591 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.2.14"; + version = "10.2.15"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "0zizf3q0hdkmsn6rpwdbfm5xkj21cwpnnzq9knjfpwcadqnyqhrl"; + sha256 = "04ds6vkb7k2lqpcdz663z4ll1jx1zz2hqxz5nj7gs8pwb18j1pik"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 93add8a69138..0e4d23ffd5cf 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "xonsh-${version}"; - version = "0.6.4"; + version = "0.6.6"; src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = version; - sha256= "16nfvfa9cklm5qb2lrr12z7k4wjb6pbb0y0ma15riqcda56ygmj7"; + sha256= "09w7656qhqv3al52cl5lgzawvkbkpwjfnxyg0vyx0gbjs1hwiqjj"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index e516393a23ca..1c5535ba1c69 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "grml-zsh-config-${version}"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "1akx6lwxnbcccddzw41rci8rb9n5vb6q2vpn5qr07f0grchyiifk"; + sha256 = "0a39m7rlf30r0ja56mmhidqbalck8f5gkmgngcvkxy3n486xxmkm"; }; buildInputs = [ zsh coreutils txt2tags procps ] diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 7deac71f1512..502937dd565b 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "unetbootin-${version}"; - version = "657"; + version = "661"; src = fetchFromGitHub { owner = "unetbootin"; repo = "unetbootin"; rev = version; - sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy"; + sha256 = "0jwmmym86x9hc6yr619dxdbxdawx8x0zwld0dfrhzwxvwbqbpav5"; }; setSourceRoot = '' diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index 792b2e2c75b4..b39c51a0c881 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libconfuse }: +{ stdenv, fetchurl, pkgconfig, libconfuse, gettext }: stdenv.mkDerivation rec { name = "genimage-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libconfuse ]; + buildInputs = [ libconfuse gettext ]; postInstall = '' # As there is no manpage or built-in --help, add the README file for diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 6fc7ba6499ea..37eb8b9aa72c 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "securefs-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { - sha256 = "065n3mskv0b2dlk9w4b3pa70h5ymrnanydbanwyx74mf7n8c80r2"; + sha256 = "0m3nv748g31b5nzxbwqqqjvygmz41x9vmhrjh655086g26gzrfib"; rev = version; repo = "securefs"; owner = "netheril96"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix new file mode 100644 index 000000000000..918edf0240a5 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, fcitx, gettext }: + +stdenv.mkDerivation rec { + name = "fcitx-table-extra-${version}"; + version = "0.3.8"; + + src = fetchurl { + url = "http://download.fcitx-im.org/fcitx-table-extra/${name}.tar.xz"; + sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef"; + }; + + buildInputs = [ cmake fcitx gettext ]; + + preInstall = '' + substituteInPlace tables/cmake_install.cmake \ + --replace ${fcitx} $out + ''; + + meta = with stdenv.lib; { + isFcitxEngine = true; + homepage = "https://github.com/fcitx/fcitx-table-extra"; + downloadPage = "http://download.fcitx-im.org/fcitx-table-extra/"; + description = "Provides extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ linc01n ]; + }; + +} diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index 7d17dee8b53c..874da29da4fa 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + postInstall = '' + install -m644 safe.tbl $out/share/detox/ + ''; + meta = with stdenv.lib; { homepage = http://detox.sourceforge.net/; description = "Utility designed to clean up filenames"; diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix new file mode 100644 index 000000000000..c88e29bb4553 --- /dev/null +++ b/pkgs/tools/misc/dylibbundler/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "dylibbundler"; + + src = fetchFromGitHub { + owner = "auriamg"; + repo = "/macdylibbundler"; + rev = "27923fbf6d1bc4d18c18e118280c4fe51fc41a80"; + sha256 = "1mpd43hvpfp7pskfrjnd6vcmfii9v3p97q0ws50krkdvshp0bv2h"; + }; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + description = "Small command-line program that aims to make bundling .dylibs as easy as possible"; + homepage = "https://github.com/auriamg/macdylibbundler"; + license = licenses.mit; + maintainers = with maintainers; [ alexfmpe ]; + platforms = with platforms; darwin ++ linux; + }; +} diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 7be2e3fc61d7..77308ecf2ed8 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3, python3Packages -, lib, makeWrapper, coreutils }: +{ stdenv, fetchFromGitHub, fetchpatch, coreutils +, python3, python3Packages, substituteAll }: + +assert stdenv.isLinux; python3Packages.buildPythonApplication rec { name = "trash-cli-${version}"; @@ -14,6 +16,12 @@ python3Packages.buildPythonApplication rec { }; patches = [ + (substituteAll { + src = ./nix-paths.patch; + df = "${coreutils}/bin/df"; + libc = "${stdenv.cc.libc.out}/lib/libc.so.6"; + }) + # Fix build on Python 3.6. (fetchpatch { url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch"; @@ -22,19 +30,10 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = with python3Packages; [ nose mock ]; - nativeBuildInputs = [ makeWrapper ]; - - preFixup = '' - for bin in $out/bin/*; do - wrapProgram $bin \ - --prefix PATH : ${lib.makeBinPath [ coreutils ]} \ - --prefix DYLD_LIBRARY_PATH : ${lib.makeSearchPath "lib" (lib.optional (stdenv.hostPlatform.libc == "glibc") (lib.getDev stdenv.cc.libc))} - done - ''; checkPhase = "nosetests"; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://github.com/andreafrancia/trash-cli; description = "Command line tool for the desktop trash can"; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch new file mode 100644 index 000000000000..d7b485eec158 --- /dev/null +++ b/pkgs/tools/misc/trash-cli/nix-paths.patch @@ -0,0 +1,26 @@ +--- a/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100 ++++ a/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100 +@@ -12,7 +12,7 @@ def mount_points_from_getmnt(): + + def mount_points_from_df(): + import subprocess +- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout ++ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout + return list(_mount_points_from_df_output(df_output)) + + def _mount_points_from_df_output(df_output): +@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() : + ("mnt_freq", c_int), # Dump frequency (in days). + ("mnt_passno", c_int)] # Pass number for `fsck'. + +- if sys.platform == "cygwin": +- libc_name = "cygwin1.dll" +- else: +- libc_name = find_library("c") +- +- if libc_name == None : +- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0 ++ libc_name = "@libc@" + + libc = cdll.LoadLibrary(libc_name) + libc.getmntent.restype = POINTER(mntent_struct) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 3efc9e6be232..ecaf498da42d 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.11"; + version = "2.13"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "0vp85d62zhca7d841vg82mwlqb8yihshyc8q2cvwm3rpn5vwf0pi"; + sha256 = "0rspb5j02mmb0r2dnfryx7jaczvb22lsnysgrr1l9iag0djcgdf5"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 7411aeed6d2e..276d7066c561 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180524"; + version = "0.0.20180531"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0h503h9hh1vl3j2daz7lm2fp4wda65iphmx8k21md6yql8f56vmi"; + sha256 = "0944zxmpx2cs71nxl7rcyhpqlwplkzd7jsf1n66vflngw2sjxm03"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 07cf15baa224..3a7e1b5a3437 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patches = lib.optionals (gtk2 != null) [ (fetchpatch { - url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch; + url = https://sources.debian.org/data/main/p/pinentry/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch; sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd"; }) ]; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index bace31a17bda..f3bd820e3e85 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.1.0"; + version = "3.1.1"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "1vvdydql5gmq103wr0ris2fvr3l5an2a8zgg2mmgdi88pxi11xfx"; + sha256 = "1w1smjhinddf139yir44y88j5bjw5kzmprk2ljc3k6xz3va7v1k0"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index f27a0cbcb999..0f2de9888e44 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "logcheck-${version}"; - version = "1.3.18"; + version = "1.3.19"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "1x4skb5nmv2xj8cygj8pq1rd1ws4m2fsibw54yslgdyjri4r2yq7"; + sha256 = "1a9ccy92lg1lnx86di6i1wpdv4ccf5w7gials2iyq5915c4lqa86"; }; prePatch = '' diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index a5d6f2f518c8..17e472b8d2be 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -3,11 +3,11 @@ let useSSL = (openssl != null); isCross = ( buildPlatform != hostPlatform ) ; in stdenv.mkDerivation rec { - name = "monit-5.25.1"; + name = "monit-5.25.2"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "1g417cf6j0v6z233a3625fw1cxsh45xql7ag83jz2988n772ap2b"; + sha256 = "0jn6mdsh50zd3jc61hr1y8sd80r01gqcyvd860zf8m8i3lvfc35a"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 3feecdf4f53c..48abee018306 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, zlib, libiconv }: stdenv.mkDerivation rec { - name = "odt2txt-0.4"; + name = "odt2txt-${version}"; + version = "0.5"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "1y36s7w2ng0r4nismxb3hb3zvsim8aimvvblz9hgnanw3kwbvx55"; + url = "${meta.homepage}/archive/v${version}.tar.gz"; + sha256 = "23a889109ca9087a719c638758f14cc3b867a5dcf30a6c90bf6a0985073556dd"; }; configurePhase="export makeFlags=\"DESTDIR=$out\""; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple .odt to .txt converter"; - homepage = http://stosberg.net/odt2txt; + homepage = https://github.com/dstosberg/odt2txt; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b7800301fde..1baef6881c2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1176,6 +1176,8 @@ with pkgs; duperemove = callPackage ../tools/filesystems/duperemove { }; + dylibbundler = callPackage ../tools/misc/dylibbundler { }; + dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; dyncall = callPackage ../development/libraries/dyncall { }; @@ -1868,23 +1870,25 @@ with pkgs; cron = callPackage ../tools/system/cron { }; inherit (callPackages ../development/compilers/cudatoolkit { }) - cudatoolkit6 - cudatoolkit65 - cudatoolkit7 - cudatoolkit75 - cudatoolkit8 - cudatoolkit9; + cudatoolkit_6 + cudatoolkit_6_5 + cudatoolkit_7 + cudatoolkit_7_5 + cudatoolkit_8 + cudatoolkit_9_0 + cudatoolkit_9; - cudatoolkit = cudatoolkit9; + cudatoolkit = cudatoolkit_9; inherit (callPackages ../development/libraries/science/math/cudnn { }) - cudnn_cudatoolkit7 - cudnn_cudatoolkit75 - cudnn6_cudatoolkit8 - cudnn_cudatoolkit8 - cudnn_cudatoolkit9; + cudnn_cudatoolkit_7 + cudnn_cudatoolkit_7_5 + cudnn6_cudatoolkit_8 + cudnn_cudatoolkit_8 + cudnn_cudatoolkit_9 + cudnn_cudatoolkit_9_0; - cudnn = cudnn_cudatoolkit9; + cudnn = cudnn_cudatoolkit_9; curlFull = curl.override { idnSupport = true; @@ -2315,6 +2319,8 @@ with pkgs; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; + table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { }; + table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { }; cloudpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-cloudpinyin { }; @@ -3931,10 +3937,10 @@ with pkgs; xnbd = callPackage ../tools/networking/xnbd { }; inherit (callPackages ../development/libraries/science/math/nccl { }) - nccl_cudatoolkit8 - nccl_cudatoolkit9; + nccl_cudatoolkit_8 + nccl_cudatoolkit_9; - nccl = nccl_cudatoolkit9; + nccl = nccl_cudatoolkit_9; ndjbdns = callPackage ../tools/networking/ndjbdns { }; @@ -7688,6 +7694,11 @@ with pkgs; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel = callPackage ../development/tools/build-managers/bazel { }; + bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; + buildifier = bazel-buildtools; + buildozer = bazel-buildtools; + unused_deps = bazel-buildtools; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; @@ -9799,6 +9810,8 @@ with pkgs; libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; + libcef = callPackage ../development/libraries/libcef { inherit (gnome2) GConf; }; + libcello = callPackage ../development/libraries/libcello {}; libcerf = callPackage ../development/libraries/libcerf {}; @@ -12803,7 +12816,8 @@ with pkgs; monitoring-plugins = callPackage ../servers/monitoring/plugins { }; - inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; }) + inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) DBDsybase NetSNMP; }) + check-mssql-health check-nwc-health check-ups-health; @@ -14949,7 +14963,6 @@ with pkgs; hevm = self.altcoins.hevm; parity = self.altcoins.parity; - parity-beta = self.altcoins.parity-beta; parity-ui = self.altcoins.parity-ui; stellar-core = self.altcoins.stellar-core; @@ -15368,6 +15381,7 @@ with pkgs; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; + docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; }; @@ -16135,6 +16149,8 @@ with pkgs; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; + m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; + manuskript = callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; @@ -17270,6 +17286,8 @@ with pkgs; oblogout = callPackage ../tools/X11/oblogout { }; + obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { alsaSupport = stdenv.isLinux; pulseaudioSupport = config.pulseaudio or true; @@ -18713,6 +18731,8 @@ with pkgs; x2vnc = callPackage ../tools/X11/x2vnc { }; + x32edit = callPackage ../applications/audio/midas/x32edit.nix {}; + x42-plugins = callPackage ../applications/audio/x42-plugins { }; xannotate = callPackage ../tools/X11/xannotate {}; @@ -20570,6 +20590,7 @@ with pkgs; vite = callPackage ../applications/science/misc/vite { }; + xearth = callPackage ../applications/science/astronomy/xearth { }; xplanet = callPackage ../applications/science/astronomy/xplanet { }; ### SCIENCE / PHYSICS diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e8e361e4733a..8664c46127b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4089,6 +4089,11 @@ let self = _self // overrides; _self = with self; { inherit (pkgs) postgresql; }; + DBDsybase = import ../development/perl-modules/DBD-sybase { + inherit fetchurl buildPerlPackage DBI; + inherit (pkgs) freetds; + }; + DBFile = import ../development/perl-modules/DB_File { inherit fetchurl buildPerlPackage; inherit (pkgs) db; @@ -5819,17 +5824,13 @@ let self = _self // overrides; _self = with self; { }; FileDesktopEntry = buildPerlPackage rec { - version = "0.04"; + version = "0.22"; name = "File-DesktopEntry-${version}"; - configurePhase = '' - preConfigure || true - perl Build.PL PREFIX="$out" prefix="$out" - ''; src = fetchurl { - url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; - sha256 = "d7f80d8bd303651a43dc1810c73740d38a0d2b158fb33cd3b6ca4d3a566da7cb"; + url = mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz; + sha256 = "169c01e3dae2f629767bec1a9f1cdbd6ec6d713d1501e0b2786e4dd1235635b8"; }; - propagatedBuildInputs = [ FileBaseDir ]; + propagatedBuildInputs = [ FileBaseDir URI ]; }; FileFindIterator = buildPerlPackage { @@ -6406,24 +6407,17 @@ let self = _self // overrides; _self = with self; { }; GD = buildPerlPackage rec { - name = "GD-2.53"; + name = "GD-2.68"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; - sha256 = "1ampz82kf0ixybncfgpvq2bp9nq5sjsmmw4c8srsv0g5jpz02pfh"; + url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.68.tar.gz; + sha256 = "0p2ya641nl5cvcqgw829xgabh835qijfd6vq2ba12862946xx8va"; }; - buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ]; - - # Patch needed to get arguments past the first GetOptions call - # and to specify libfontconfig search path. - # Patch has been sent upstream. - patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ]; + buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ]; # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = [ "format" ]; - doCheck = false; # fails 1 out of 13 tests - makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}"; }; @@ -8544,11 +8538,11 @@ let self = _self // overrides; _self = with self; { }; }; - ListBinarySearch = pkgs.buildPerlPackage { - name = "List-BinarySearch-0.20"; + ListBinarySearch = buildPerlPackage { + name = "List-BinarySearch-0.25"; src = pkgs.fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.20.tar.gz; - sha256 = "1piyl65m38bwqaap13wkgs033wiwb6m5zmr5va86ya4696cir7wd"; + url = mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.25.tar.gz; + sha256 = "0ap8y9rsjxg75887klgij90mf459f8dwy0dbx1g06h30pmqk04f8"; }; }; @@ -15234,6 +15228,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestFork = buildPerlModule rec { + name = "Test-Fork-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz; + sha256 = "0gnh8m81fdrwmzy1fix12grfq7sf7nn0gbf24zlap1gq4kxzpzpw"; + }; + meta = { + description = "test code which forks"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestHarness = buildPerlPackage { name = "Test-Harness-3.42"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ebba6a2f5ceb..2b24b189c93f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -383,11 +383,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.11.1"; + version = "2.12.0"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1270s5y7bgcml452lngq4fqn3a1mx15gfgmgcczjiiv0fxir446b"; + sha256 = "1vz3s0hbqp1rzgrqfnr0jj5qds1jnw7kyhpl4qjlpd4s40x0n4b1"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c4ab7805bda..1f62f1e7c17f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -195,6 +195,8 @@ in { inherit (pkgs) augeas; }; + autograd = callPackage ../development/python-modules/autograd { }; + automat = callPackage ../development/python-modules/automat { }; aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; @@ -1205,8 +1207,8 @@ in { cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { - cudatoolkit = pkgs.cudatoolkit8; - cudnn = pkgs.cudnn6_cudatoolkit8; + cudatoolkit = pkgs.cudatoolkit_8; + cudnn = pkgs.cudnn6_cudatoolkit_8; nccl = pkgs.nccl; }; @@ -1252,6 +1254,8 @@ in { pyechonest = callPackage ../development/python-modules/pyechonest { }; + pyezminc = callPackage ../development/python-modules/pyezminc { }; + billiard = callPackage ../development/python-modules/billiard { }; binaryornot = callPackage ../development/python-modules/binaryornot { }; @@ -3974,7 +3978,7 @@ in { }; pycuda = callPackage ../development/python-modules/pycuda rec { - cudatoolkit = pkgs.cudatoolkit75; + cudatoolkit = pkgs.cudatoolkit_7_5; inherit (pkgs.stdenv) mkDerivation; }; @@ -5606,14 +5610,14 @@ in { # https://github.com/pytorch/pytorch/issues/5831 # https://devtalk.nvidia.com/default/topic/1028112 # We should be able to remove this when CUDA 9.2 is released. - cudatoolkit9 = pkgs.cudatoolkit9.override { + cudatoolkit_9 = pkgs.cudatoolkit_9.override { gcc6 = pkgs.gcc5; }; in callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; - cudatoolkit = cudatoolkit9; - cudnn = pkgs.cudnn_cudatoolkit9.override { - inherit cudatoolkit9; + cudatoolkit = cudatoolkit_9; + cudnn = pkgs.cudnn_cudatoolkit_9.override { + inherit cudatoolkit_9; }; }; @@ -9888,6 +9892,8 @@ in { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; }); + pvlib = callPackage ../development/python-modules/pvlib { }; + pybase64 = callPackage ../development/python-modules/pybase64 { }; pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; @@ -17593,11 +17599,11 @@ EOF tensorflow = if stdenv.isDarwin then callPackage ../development/python-modules/tensorflow/bin.nix { } - else callPackage ../development/python-modules/tensorflow rec { + else callPackage ../development/python-modules/tensorflow/bin.nix rec { cudaSupport = pkgs.config.cudaSupport or false; inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit9; - cudnn = pkgs.cudnn_cudatoolkit9; + cudatoolkit = pkgs.cudatoolkit_9_0; + cudnn = pkgs.cudnn_cudatoolkit_9_0; }; tensorflowWithoutCuda = self.tensorflow.override { |