diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
| commit | 5effa4e0f98b317fe4607b1a6548811017c3325d (patch) | |
| tree | d62ab19ccca3b0c6409595074b637eeb3d4371dc /pkgs/development | |
| parent | ca2edf79f75ad2a43a5af5c1283db9f0f843680a (diff) | |
| parent | 8f58e00226e3192994050b12aa9ed119be0220f3 (diff) | |
| download | nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.gz nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.bz2 nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.lz nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.xz nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.zst nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.zip | |
Merge branch 'master' into staging-next
Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32
Diffstat (limited to 'pkgs/development')
454 files changed, 6763 insertions, 4025 deletions
diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index bf0dd5229c68..a4d5b3382426 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -44,14 +44,14 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "3.6.2"; + version = "3.6.4"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "1558adr73d7mgp0z92q9vzbgarddimadyk4467z8i3yp4g8k5irk"; + sha256 = "1c1y099xvpdh35n8fln642psa4xsaaqly2i2jgkvhrb9yl77x5aj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 66e1abd05e90..40b690048eba 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -38,21 +38,15 @@ def generate_sources(release, assets): type_map = out.setdefault(asset["os"], {}) impl_map = type_map.setdefault(asset["binary_type"], {}) arch_map = impl_map.setdefault(asset["openjdk_impl"], { - "version": version, - "build": build, "packageType": asset["binary_type"], "vmType": asset["openjdk_impl"], }) - if arch_map["version"] != version or arch_map["build"] != build: - print("error: architectures have different latest versions ({}+{} vs {}+{})".format( - arch_map["version"], arch_map["build"], version, build - ), file=sys.stderr) - sys.exit(1) - arch_map[arch_to_nixos[asset["architecture"]]] = { "url": asset["binary_link"], "sha256": get_sha256(asset["checksum_link"]), + "version": version, + "build": build, } return out diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 958f36d39284..7b16d6ad9dbc 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -5,13 +5,14 @@ sourcePerArch: , fetchurl }: -let result = stdenv.mkDerivation rec { +let cpuName = stdenv.hostPlatform.parsed.cpu.name; + result = stdenv.mkDerivation rec { name = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; src = fetchurl { - inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; + inherit (sourcePerArch.${cpuName}) url sha256; }; # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 531cf3a80517..6e3fe6c4ebf1 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -42,15 +42,19 @@ let xorg.libXrender stdenv.cc.cc ]); + + cpuName = stdenv.hostPlatform.parsed.cpu.name; in let result = stdenv.mkDerivation rec { name = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${version}"; + + version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}"); src = fetchurl { - inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; + inherit (sourcePerArch.${cpuName}) url sha256; }; nativeBuildInputs = [ file ]; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index bacb468c0ece..391ea9abca92 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -4,52 +4,56 @@ "jdk": { "hotspot": { "aarch64": { + "build": "13", "sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz", + "version": "11.0.1" }, - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "hotspot", "x86_64": { - "sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz" + "build": "7", + "sha256": "d89304a971e5186e80b6a48a9415e49583b7a5a9315ba5552d373be7782fc528", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz", + "version": "11.0.2" } }, "openj9": { - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "openj9", "x86_64": { + "build": "13", "sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz", + "version": "11.0.1" } } }, "jre": { "hotspot": { "aarch64": { + "build": "28", "sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz", + "version": "11" }, - "build": "28", "packageType": "jre", - "version": "11", "vmType": "hotspot", "x86_64": { - "sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz" + "build": "7", + "sha256": "59c34373eec16b53798aedac73776b19e43f396fdff8a2879e66dc4b0cfd73cc", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_7.tar.gz", + "version": "11.0.2" } }, "openj9": { - "build": "28", "packageType": "jre", - "version": "11", "vmType": "openj9", "x86_64": { + "build": "28", "sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz", + "version": "11" } } } @@ -57,35 +61,35 @@ "mac": { "jdk": { "hotspot": { - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "hotspot", "x86_64": { + "build": "13", "sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz", + "version": "11.0.1" } }, "openj9": { - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "openj9", "x86_64": { - "sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz" + "build": "13", + "sha256": "b8960753a66190fa81982682357a2449b4183f3e23c20a5e3b4cf01e2989846b", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz", + "version": "11.0.1" } } }, "jre": { "hotspot": { - "build": "28", "packageType": "jre", - "version": "11", "vmType": "hotspot", "x86_64": { + "build": "28", "sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz", + "version": "11" } } } diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 42214ee22dc2..5c4d276ab973 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20181210"; + version = "20190121"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0c79ki4lacfwks5f2q7kzcg6v3a65zs5srm14k09gh5k1hvvnayd"; + sha256 = "1jxxj3a1pbf7bbqs0rkqk28ii1r3w2va4iis8fffx8zfvbgncwyc"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 875472a2fb6d..3ab25c3a830b 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -98,8 +98,6 @@ let cd .. ''; - extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; - dontStrip = true; installPhase = '' @@ -120,7 +118,7 @@ let cd ../phobos mkdir $out/lib - cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib + cp generated/${osname}/release/${bits}/libphobos2.* $out/lib cp -r std $out/include/d2 cp -r etc $out/include/d2 diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index 9970fd9b33d3..4e8ab34b1011 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -12,14 +12,14 @@ let rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ]; in stdenv.mkDerivation rec { - version = "2.1.403"; - netCoreVersion = "2.1.5"; + version = "2.2.103"; + netCoreVersion = "2.2.1"; name = "dotnet-sdk-${version}"; src = fetchurl { url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz"; # use sha512 from the download page - sha512 = "903a8a633aea9211ba36232a2decb3b34a59bb62bc145a0e7a90ca46dd37bb6c2da02bcbe2c50c17e08cdff8e48605c0f990786faf1f06be1ea4a4d373beb8a9"; + sha512 = "777AC6DCD0200BA447392E451A1779F0FBFA548BD620A7BBA3EEBDF35892236C3F10B19FF81D4F64B5BC134923CB47F9CC45EE6B004140E1249582249944DB69"; }; unpackPhase = '' diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 09ef27fc3015..9cc60003201c 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchpatch, flex, bison, pkgconfig, python2, swig, which }: stdenv.mkDerivation rec { - name = "dtc-${version}"; + pname = "dtc"; version = "1.4.7"; src = fetchgit { diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index aa8d9da9faaf..bfaf24cd9872 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -14,6 +14,12 @@ let elmPackages = (import ./packages/elm-srcs.nix); versionsDat = ./versions.dat; }; + patches = [ + (fetchpatch { + url = "https://github.com/elm/compiler/pull/1886/commits/39d86a735e28da514be185d4c3256142c37c2a8a.patch"; + sha256 = "0nni5qx1523rjz1ja42z6z9pijxvi3fgbw1dhq5qi11mh1nb9ay7"; + }) + ]; buildTools = drv.buildTools or [] ++ [ makeWrapper ]; jailbreak = true; postInstall = '' diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 8e9525e33842..aae7c61c6f9f 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "gambit-bootstrap-${version}"; - version = "4.9.1"; - tarball_version = "v4_9_1"; + version = "4.9.2"; + tarball_version = "v4_9_2"; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-${tarball_version}-devel.tgz"; - sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7"; + url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-${tarball_version}.tgz"; + sha256 = "1cpganh3jgjdw6qsapcbwxdbp1xwgx5gvdl4ymwf8p2c5k018dwy"; }; - buildInputs = [ autoconf git ]; + buildInputs = [ autoconf ]; configurePhase = '' ./configure --prefix=$out diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 19297a6e68eb..275d4785a2ca 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,10 +1,10 @@ { stdenv, callPackage, fetchurl }: callPackage ./build.nix { - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_1-devel.tgz"; - sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7"; + url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_2-devel.tgz"; + sha256 = "1xpjm3m1pxwj3n0g36lbb3p6wx2nc1iry95xc22pnq3m2374gjxv"; }; inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 15db82fc9fb2..a907de017408 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { stdenv, callPackage, fetchFromGitHub }: callPackage ./build.nix { - version = "unstable-2018-11-19"; -# git-version = "4.9.1-8-g61c6cb50"; + version = "unstable-2019-01-18"; +# git-version = "4.9.2"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "61c6cb500f4756be1e52095d5ab4501752525a70"; - sha256 = "1knpb40y1g09c6yqd2fsxm3bk56bl5xrrwfsd7nqa497x6ngm5pn"; + rev = "cf5688ecf35d85b9355c645f535c1e057b3064e7"; + sha256 = "1xr7j4iws6hlrdbvlii4n98apr78k4adbnmy4ggzyik65bynh1kl"; }; inherit stdenv; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 945649b29781..82edf0e33cfa 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r * $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; dontPatchELF = true; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index c22683dae03a..39fc3c517f81 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r * $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; dontPatchELF = true; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 4e0caf183610..a26131cb0536 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r * $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; dontPatchELF = true; diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 039b5a9ce362..350eed2fedd0 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -pv $out cp -r ./* $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man for f in $(find $out); do if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh index 8b1d5d2da678..19db70597ce5 100644 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh @@ -2,4 +2,3 @@ getHostRole export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libstdc++" diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 7ebd3f69cbf4..b20d6f9c47ef 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -24,9 +24,13 @@ stdenv.mkDerivation rec { patchShebangs . - find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do + grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' done + grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do + substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"' + done + substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\"" cat > etc/gerbil_static_libraries.sh <<EOF #OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING! diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index b3d479483644..d2740354e923 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,14 +1,14 @@ { stdenv, callPackage, fetchFromGitHub, gambit }: callPackage ./build.nix rec { - version = "0.14"; - git-version = "0.14"; + version = "0.15"; + git-version = "0.15"; inherit gambit; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; rev = "v${version}"; - sha256 = "0n078lkf8m391kr99ipb1v2dpi5vkikz9nj0p7kfjg43868my3v7"; + sha256 = "1ff1gpl0bl1pbs68bxax82ikw4bzbkrj4a6l775ziwyfndjggl66"; }; inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 96bd86b26166..b96ff53b56c2 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,14 +1,14 @@ { stdenv, callPackage, fetchFromGitHub, gambit-unstable }: callPackage ./build.nix { - version = "unstable-2018-11-19"; - git-version = "0.15-DEV-2-g7d09a4ce"; + version = "unstable-2019-01-25"; + git-version = "0.15"; gambit = gambit-unstable; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "7d09a4cebe03d755a1791e77279e156a74e07685"; - sha256 = "1mqi9xcjk59sqbh1fx65a4fa4mqm35py4xqxq6086bcyhkm1nzwa"; + rev = "8c1aa2ca129a380de9cf668a7f3f6d56e56cbf94"; + sha256 = "1ff1gpl0bl1pbs68bxax82ikw4bzbkrj4a6l775ziwyfndjggl66"; }; inherit stdenv; } diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.3-binary.nix new file mode 100644 index 000000000000..cde67183ef49 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.6.3-binary.nix @@ -0,0 +1,164 @@ +{ stdenv +, fetchurl, perl, gcc, llvm_39 +, ncurses5, gmp, glibc, libiconv +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + libPath = stdenv.lib.makeLibraryPath ([ + ncurses5 gmp + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + + libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + + glibcDynLinker = assert stdenv.isLinux; + if stdenv.hostPlatform.libc == "glibc" then + # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. + ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' + else + "${stdenv.lib.getLib glibc}/lib/ld-linux*"; + +in + +stdenv.mkDerivation rec { + version = "8.6.3"; + + name = "ghc-${version}-binary"; + + src = fetchurl ({ + "i686-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; + sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m"; + }; + "x86_64-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; + sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719"; + }; + "x86_64-darwin" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r"; + }; + }.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform")); + + nativeBuildInputs = [ perl ]; + buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + ${libEnvVar} = libPath; + + postUnpack = + # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib + # during linking + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + # not enough room in the object files for the full path to libiconv :( + for exe in $(find . -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + '' + + + # Some scripts used during the build need to have their shebangs patched + '' + patchShebangs ghc-${version}/utils/ + patchShebangs ghc-${version}/configure + '' + + + # Strip is harmful, see also below. It's important that this happens + # first. The GHC Cabal build system makes use of strip by default and + # has hardcoded paths to /usr/bin/strip in many places. We replace + # those below, making them point to our dummy script. + '' + mkdir "$TMP/bin" + for i in strip; do + echo '#! ${stdenv.shell}' > "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + done + PATH="$TMP/bin:$PATH" + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + find . -name base.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; + '' + + # Rename needed libraries and binaries, fix interpreter + stdenv.lib.optionalString stdenv.isLinux '' + find . -type f -perm -0100 -exec patchelf \ + --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libtinfo.so libtinfo.so.5 \ + --interpreter ${glibcDynLinker} {} \; + + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + ''; + + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; + + # Stripping combined with patchelf breaks the executables (they die + # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) + dontStrip = true; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + dontBuild = true; + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + ''; + + doInstallCheck = true; + installCheckPhase = '' + unset ${libEnvVar} + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { + targetPrefix = ""; + enableShared = true; + }; + + meta.license = stdenv.lib.licenses.bsd3; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; +} diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 65a4a0c4ecdb..7e670743f7fc 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchgit, perl, python3, m4, sphinx +, autoconf, automake, coreutils, fetchgit, fetchurl, fetchpatch, perl, python3, m4, sphinx , libiconv ? null, ncurses @@ -21,12 +21,12 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useAndroidPrebuilt + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt , # Whetherto build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.5.20180118" +, version ? "8.7.20190115" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" @@ -84,9 +84,9 @@ stdenv.mkDerivation (rec { name = "${targetPrefix}ghc-${version}"; src = fetchgit { - url = "git://git.haskell.org/ghc.git"; - rev = "e1d4140be4d2a1508015093b69e1ef53516e1eb6"; - sha256 = "1gdcr10dd968d40qgljdwx9vfkva3yrvjm9a4nis7whaaac3ag58"; + url = "https://gitlab.haskell.org/ghc/ghc.git/"; + rev = "c9756dbf1ee58b117ea5c4ded45dea88030efd65"; + sha256 = "0ja3ivyz4jrqkw6z1mdgsczxaqkjy5vw0nyyqlqr0bqxiw9p8834"; }; enableParallelBuilding = true; @@ -122,6 +122,24 @@ stdenv.mkDerivation (rec { export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done ''; # TODO(@Ericson2314): Always pass "--target" and always prefix. @@ -131,8 +149,8 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ @@ -149,12 +167,9 @@ stdenv.mkDerivation (rec { # Make sure we never relax`$PATH` and hooks support for compatability. strictDeps = true; - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + perl autoconf automake m4 python3 sphinx + bootPkgs.ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ]; # For building runtime libs @@ -195,14 +210,14 @@ stdenv.mkDerivation (rec { inherit enableShared; # Our Cabal compiler name - haskellCompilerName = "ghc-8.5"; + haskellCompilerName = "ghc-8.7"; }; meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; + inherit (bootPkgs.ghc.meta) license platforms; }; } // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 025d74bcda04..6fd844adbe56 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -104,4 +104,7 @@ in stdenv.mkDerivation { inherit passthru; meta.platforms = passthru.bootPkgs.ghc.meta.platforms; + meta.hydraPlatforms = []; + meta.broken = true; # does not compile: https://hydra.nixos.org/build/88052615 + } diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 92a9291222f5..867344e84da4 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -22,13 +22,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.10.7"; + version = "1.10.8"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1alc7dagijdg4p4hhvlznlgcxsl8gz94v7p9wk3kn303y782dl41"; + sha256 = "1yynv105wh8pwiq61v4yg5i50k13g3x634x60mhxhv4gj9cq06cx"; }; GOCACHE = "off"; diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index ab4c7e6ae63e..1c9bc0a30091 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation +, mailcap , buildPackages, targetPackages }: let @@ -28,13 +29,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.11.4"; + version = "1.11.5"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "036nc17hffy0gcfs9j64qzwpjry65znbm4klf2h0xn81dp8d6mxk"; + sha256 = "0d45057rc0bngq0nja847cagxji42qmlywr68f0dkg51im8nyr9y"; }; # perl is used for testing go vet @@ -56,6 +57,10 @@ stdenv.mkDerivation rec { substituteInPlace misc/cgo/testcarchive/carchive_test.go \ --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + # Patch the mimetype database location which is missing on NixOS. + substituteInPlace src/mime/type_unix.go \ + --replace '/etc/mime.types' '${mailcap}/etc/mime.types' + # Disabling the 'os/http/net' tests (they want files not available in # chroot builds) rm src/net/{listen,parse}_test.go diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 40fd3f15786b..95312f9e1ead 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; + maintainers = with maintainers; [ cstrahan ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix deleted file mode 100644 index d6ae163813f3..000000000000 --- a/pkgs/development/compilers/go/1.9.nix +++ /dev/null @@ -1,184 +0,0 @@ -{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }: - -let - - inherit (stdenv.lib) optionals optionalString; - - clangHack = writeScriptBin "clang" '' - #!${stdenv.shell} - exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - ''; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - -in - -stdenv.mkDerivation rec { - name = "go-${version}"; - version = "1.9.5"; - - src = fetchFromGitHub { - owner = "golang"; - repo = "go"; - rev = "go${version}"; - sha256 = "15dx1b71xv7b265gqk9nv02pirggpw7d83apikhrza2qkj64ydd0"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; - buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/areturn' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/areturn' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - '' + optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isAarch32 '' - sed -i '/TestCurrent/areturn' src/os/user/user_test.go - echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash - '' + optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go - sed -i '/TestCurrent/areturn' src/os/user/user_test.go - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - - sed -i '1 a\exit 0' misc/cgo/errors/test.bash - ''; - - patches = - [ ./remove-tools-1.9.patch - ./ssl-cert-file-1.9.patch - ./creds-test-1.9.patch - ./remove-test-pie-1.9.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ]; - - postPatch = optionalString stdenv.isDarwin '' - echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" - substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil - ''; - - GOOS = if stdenv.isDarwin then "darwin" else "linux"; - GOARCH = if stdenv.isDarwin then "amd64" - else if stdenv.hostPlatform.system == "i686-linux" then "386" - else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" - else if stdenv.isAarch32 then "arm" - else if stdenv.isAarch64 then "arm64" - else throw "Unsupported system"; - GOARM = optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - configurePhase = '' - mkdir -p $out/share/go/bin - export GOROOT=$out/share/go - export GOBIN=$GOROOT/bin - export PATH=$GOBIN:$PATH - ulimit -a - ''; - - postConfigure = optionalString stdenv.isDarwin '' - export PATH=${clangHack}/bin:$PATH - ''; - - installPhase = '' - cp -r . $GOROOT - ( cd $GOROOT/src && ./all.bash ) - ''; - - preFixup = '' - rm -r $out/share/go/pkg/bootstrap - ln -s $out/share/go/bin $out/bin - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ go_bootstrap ]; - - meta = with stdenv.lib; { - branch = "1.9"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej wkennington ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/creds-test-1.9.patch b/pkgs/development/compilers/go/creds-test-1.9.patch deleted file mode 100644 index 09f78959ff9c..000000000000 --- a/pkgs/development/compilers/go/creds-test-1.9.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go ---- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 -+++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100 -@@ -62,8 +62,8 @@ - if sys, ok := err.(*os.SyscallError); ok { - err = sys.Err - } -- if err != syscall.EPERM { -- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) -+ if err != syscall.EPERM && err != syscall.EINVAL { -+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) - } - } - diff --git a/pkgs/development/compilers/go/remove-test-pie-1.9.patch b/pkgs/development/compilers/go/remove-test-pie-1.9.patch deleted file mode 100644 index 46f94f29df20..000000000000 --- a/pkgs/development/compilers/go/remove-test-pie-1.9.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index 73432d31ea..3310f5298d 100644 ---- a/src/cmd/dist/test.go -+++ b/src/cmd/dist/test.go -@@ -510,21 +510,6 @@ func (t *tester) registerTests() { - }) - } - -- // Test internal linking of PIE binaries where it is supported. -- if t.goos == "linux" && t.goarch == "amd64" && !isAlpineLinux() { -- // Issue 18243: We don't have a way to set the default -- // dynamic linker used in internal linking mode. So -- // this test is skipped on Alpine. -- t.tests = append(t.tests, distTest{ -- name: "pie_internal", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", "go", "test", "reflect", "-short", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60), t.tags(), t.runFlag("")) -- return nil -- }, -- }) -- } -- - // sync tests - t.tests = append(t.tests, distTest{ - name: "sync_cpu", diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index a5d6247ffdc7..2657ee6633b7 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -3,7 +3,7 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is n }: stdenv.mkDerivation rec { - version = "1.9.2"; + version = "1.10.0"; rev = "v${version}"; inherit testedTargets; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ispc"; repo = "ispc"; inherit rev; - sha256 = "0zaw7mwvly1csbdcbz9j8ry89n0r1fag1m1f579l4mgg1x6ksqry"; + sha256 = "1x07n2gaff3v32yvddrb659mx5gg12bnbsqbyfimp396wn04w60b"; }; # there are missing dependencies in the Makefile, causing sporadic build failures @@ -32,14 +32,7 @@ stdenv.mkDerivation rec { llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; - patches = [ - (fetchpatch { - url = https://github.com/ispc/ispc/commit/d504641f5af9d5992e7c8f0ed42c1063a39ede5b.patch; - sha256 = "192q3gyvam79469bmlwf0jpfi2y4f8hl2vgcvjngsqhvscwira0s"; - }) - ]; - - postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile"; + postPatch = "sed -i -e 's,/bin/,,g' -e 's/-lcurses/-lncurses/g' Makefile"; # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real # errors diff --git a/pkgs/development/compilers/julia/0.7.nix b/pkgs/development/compilers/julia/0.7.nix index 99c6b245ba67..e0992d800033 100644 --- a/pkgs/development/compilers/julia/0.7.nix +++ b/pkgs/development/compilers/julia/0.7.nix @@ -3,4 +3,7 @@ import ./shared.nix { minorVersion = "7"; maintenanceVersion = "0"; src_sha256 = "1j57569qm2ii8ddzsp08hds2navpk7acdz83kh27dvk44axhwj6f"; + + libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e"; + libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs"; } diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index c65c2a6a3135..a679eda33066 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -3,4 +3,7 @@ import ./shared.nix { minorVersion = "0"; maintenanceVersion = "3"; src_sha256 = "0666chsc19wx02k5m1yilf6wbc9bw27ay8p1d00jkh8m0jkrpf7l"; + + libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e"; + libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs"; } diff --git a/pkgs/development/compilers/julia/1.1.nix b/pkgs/development/compilers/julia/1.1.nix new file mode 100644 index 000000000000..a868f949d27c --- /dev/null +++ b/pkgs/development/compilers/julia/1.1.nix @@ -0,0 +1,9 @@ +import ./shared.nix { + majorVersion = "1"; + minorVersion = "1"; + maintenanceVersion = "0"; + src_sha256 = "08fyck4qcdv9nnrdqh1wb7lb8pkkikh67xx5lc872sjl9w3p0sak"; + + libuvVersion = "2348256acf5759a544e5ca7935f638d2bc091d60"; + libuvSha256 = "1363f4vqayfcv5zqg07qmzjff56yhad74k16c22ian45lram8mv8"; +} diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index 95b45adcc6fc..ee08703e4c7e 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -2,6 +2,9 @@ , minorVersion , maintenanceVersion , src_sha256 +# source deps +, libuvVersion +, libuvSha256 }: { stdenv, fetchurl, fetchzip # build tools @@ -34,10 +37,9 @@ let sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; }; - libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e"; libuv = fetchurl { url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs"; + sha256 = libuvSha256; }; rmathVersion = "0.1"; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index f557f32a13a6..c2d834aa1272 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.11"; + version = "1.3.20"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "02d4x65z6kp20hmf5ri56zmq4rq45yc9br0awqrn9ls99cd0zph3"; + sha256 = "1w7k09sxlvyy53p4mxnl4qsnsyivpabhsmradbybfgf50nsmyl1d"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 19b16921e329..35575f1052e3 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,41 +21,41 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "192"; - build = "26"; + update = "202"; + build = "ga"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; - repover = "jdk8u${update}-b${build}"; + repover = "jdk8u${update}-${build}"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "1hx5sfsglc101aqs9n7cz7rh447d6rxfxkbw03crvzbvy9n6ag2d"; + sha256 = "0asx7qkhmrlfmhrljck5gb3yp4v0aa8k35y4xfcph41x0m0mvrdb"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0vq6nlzs85agjkilpr53v7kjrd99kq770zipqghjmlfzyiy9xk4q"; + sha256 = "07q6l3slmi5fgwjnsk6bd8miv8glmw15w5f6yyvp8nlp2d54l33n"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0q5z2glfiip0lsisp1zy1zcw91hi1kznphm7w3iagq8s7550wbvh"; + sha256 = "01k4pwhn3nmkzdhdj1v58dgir4iwsj9mm2ml1541z31s53g037cq"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1mgg82066c9wjsj9ciqv4lrn1av5cb86hq00lkpsffdqbwx3vrm3"; + sha256 = "0v39kl2iiyh74p3cp6bjhshkwxpgbffza9abzjgp7cpdfhcc73p0"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1s87a49hl4h21kf2yh1w67wgb179j0f5v62cxbrvvd5lk2h5jyvf"; + sha256 = "0z1cy6aq09j25jyryj47rms15h5175p2h23fg5pv035zapf8nb1b"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "05alcixcxcdms373byh21d2brsky6kj14b3h80cs9bi1gfnbqilq"; + sha256 = "0y0mk4sra9d29kgx842m5y4bz9gczc9ypkajv6m5igjv7sizzsv7"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "1r3fqnl5jqmxzsjqjrka35f8hwqqap9jg8zwqk2vv9qikrm7frhl"; + sha256 = "07ssrjhffkdncxxhsbid21hlg51y7js3x7sb4g474vmmi3qj6vmb"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "0lzwi35lp4a477jkmfa53kxy3g9lzcmh56wprg805gbv4sjnkjk1"; + sha256 = "0r0b8ra0ibzbdpxz6nv6i2zrzh2j5sxgprpnl6gf4d9h0i29ickj"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 7a4928d2662c..ddfd5d0a3fdf 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.9.10"; + version = "1.10.2"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.9.10"; - sha256 = "1iaw3pgh0h53gxk3bl148n1lfr54cx2yv0gnx2rjp2m5599acbz4"; + rev = "Release-1.10.2"; + sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 24043ce47740..68b676d5a3ef 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -4,13 +4,13 @@ with lib; mkDerivation rec { pname = "psc-package"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "0xvnmpfj4c6h4gmc2c3d4gcs44527jrgfl11l2fs4ai1mc69w5zg"; + sha256 = "1zadbph1vha3b5hvmjvs138dcwbab49f3v63air1l6r4cvpb6831"; }; isLibrary = false; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 3ec08a82d017..c6350e42bc23 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -166,10 +166,12 @@ stdenv.mkDerivation { # https://github.com/rust-lang/rust/issues/30181 # enableParallelBuilding = false; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with stdenv.lib; { homepage = https://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; broken = broken; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 5f1c35815c32..80ca6ade8453 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap +{ stdenv, fetchurl, writeText, sbclBootstrap , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system) # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. @@ -10,28 +10,16 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.15"; + version = "1.4.16"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0bipl4gsvpcifi6vkqm5636i3219mk1bl99px4xh5l1q2g7knv28"; + sha256 = "1myg4wkxnbfn5nz38xy62r1jhjy07x3h0b04vg858n41chdsv4wd"; }; buildInputs = [texinfo]; - patches = [ - # 1.4.15 bug, run-program thread safety, remove for 1.4.16 - (fetchpatch { - url = "https://github.com/sbcl/sbcl/commit/c80672bedb1e4bc16124d0d01d7e37f94dd17a5a.patch"; - sha256 = "0pjm9yajwij59gdkqhid7sbgmb8z57cz8zrsikxg7yzfgr7sa7hy"; - }) - ]; - patchPhase = '' - for patch in ${toString patches}; do - patch -Np1 -i "$patch" - done - echo '"${version}.nixos"' > version.lisp-expr echo " (lambda (features) @@ -80,7 +68,8 @@ stdenv.mkDerivation rec { else # Fix software version retrieval '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp + sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ + src/code/run-program.lisp '' ); diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 96954eb43ace..34daebcdf528 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -28,7 +28,7 @@ let params = propagatedBuildInputs = [ coq-ext-lib simple-io ]; }; }; - param = params."${coq.coq-version}"; + param = params."${coq.coq-version}" or params."8.8"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix index cd7ddfefb84a..aa5ebb32b3ce 100644 --- a/pkgs/development/coq-modules/Velisarios/default.nix +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -20,7 +20,7 @@ let params = sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; }; }; - param = params."${coq.coq-version}"; + param = params."${coq.coq-version}" or params."8.8"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 59f2295e2153..a8fd91d9d348 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -18,7 +18,7 @@ let "8.7" = v20180709; "8.8" = v20181016; }; - param = params."${coq.coq-version}"; + param = params."${coq.coq-version}" or params."8.8"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coq-extensible-records/default.nix b/pkgs/development/coq-modules/coq-extensible-records/default.nix new file mode 100644 index 000000000000..513b046c0fee --- /dev/null +++ b/pkgs/development/coq-modules/coq-extensible-records/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, coq }: + +stdenv.mkDerivation { + name = "coq${coq.coq-version}-coq-extensible-records-1.2.0"; + + src = fetchFromGitHub { + owner = "gmalecha"; + repo = "coq-extensible-records"; + rev = "1.2.0"; + sha256 = "0h5m04flqfk0v577syw0v1dw2wf7xrx6jaxv5gpmqzssf5hxafy4"; + }; + + buildInputs = [ coq ]; + + enableParallelBuilding = true; + + installPhase = '' + make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/gmalecha/coq-extensible-records; + description = "Implementation of extensible records in Coq"; + license = licenses.mit; + maintainers = with maintainers; [ ptival ]; + platforms = coq.meta.platforms; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + }; +} diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index 57f31e1847c1..784e360a0dab 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -26,7 +26,7 @@ let params = sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; }; }; - param = params."${coq.coq-version}"; + param = params."${coq.coq-version}" or params."8.8"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 191812b3f2eb..265b97deca2c 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -14,7 +14,7 @@ let params = "8.8" = v_8_8; "8.9" = v_8_8; }; - param = params."${coq.coq-version}" + param = params."${coq.coq-version}" or params."8.9" ; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index e403f7d4fb5c..6a06c1b19875 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -22,7 +22,7 @@ let params = { sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; }; }; -param = params."${coq.coq-version}"; +param = params."${coq.coq-version}" or params."8.8"; in stdenv.mkDerivation { diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 3f049eed34be..1bc66fcf272a 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -19,8 +19,14 @@ let rev = "v1.0-8.8"; sha256 = "0dd7zd5j2sv5cw3mfwg33ss2vcj634q3qykakc41sv7f3rfgqfnn"; }; + + "8.9" = { + version = "1.2beta"; + rev = "v1.2-beta-8.9"; + sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz"; + }; }; - param = params."${coq.coq-version}"; + param = params."${coq.coq-version}" or params."8.8"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index ff7385a9222e..6c0be377bc0b 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,17 +1,31 @@ -{stdenv, bash, which, autoconf, automake, fetchurl, coq}: +{ stdenv, bash, which, autoconf, automake, fetchurl, coq }: + +let params = + if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { + version = "3.0.0"; + uid = "37477"; + sha256 = "1h05ji5cmyqyv2i1l83xgkm7vfvcnl8r1dzvbp5yncm1jr9kf6nn"; + } else { + version = "2.6.1"; + uid = "37454"; + sha256 = "06msp1fwpqv6p98a3i1nnkj7ch9rcq3rm916yxq8dxf51lkghrin"; + } +; in stdenv.mkDerivation rec { name = "coq${coq.coq-version}-flocq-${version}"; - version = "2.6.0"; + inherit (params) version; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37054/flocq-2.6.0.tar.gz; - sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3"; + url = "https://gforge.inria.fr/frs/download.php/file/${params.uid}/flocq-${version}.tar.gz"; + inherit (params) sha256; }; - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 bash which autoconf automake ]; - propagatedBuildInputs = [ coq ]; + nativeBuildInputs = [ bash which autoconf automake ]; + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ + ocaml camlp5 + ]); buildPhase = '' ${bash}/bin/bash autogen.sh @@ -31,4 +45,7 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 901c4d387661..3ff96bf25449 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -85,7 +85,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0wczijw80pw31k6h3a65m76aq9i02aarr2zxl7k5m7p0l6rn82vd"; + sha256 = "0vww2qf94a6dg46mynkgpk0lh3x12vvfby3flqymi4wfrx1fif1k"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -358,6 +358,7 @@ self: super: { persistent-redis = dontCheck super.persistent-redis; pipes-extra = dontCheck super.pipes-extra; pipes-websockets = dontCheck super.pipes-websockets; + posix-pty = dontCheck super.posix-pty; # https://github.com/merijn/posix-pty/issues/12 postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server postgresql-simple-migration = dontCheck super.postgresql-simple-migration; process-streaming = dontCheck super.process-streaming; @@ -720,9 +721,15 @@ self: super: { ''; }); + # A simple MonadFail patch would do too, but not doing the tests is easier + megaparsec_6_5_0 = dontCheck super.megaparsec_6_5_0; + # The standard libraries are compiled separately idris = generateOptparseApplicativeCompletion "idris" ( - doJailbreak (dontCheck super.idris) + doJailbreak (dontCheck (super.idris.override { + # Needed for versions <= 1.3.1 https://github.com/idris-lang/Idris-dev/pull/4610 + megaparsec = self.megaparsec_6_5_0; + })) ); # https://github.com/bos/math-functions/issues/25 @@ -921,15 +928,6 @@ self: super: { # https://github.com/bos/text-icu/issues/32 text-icu = dontCheck super.text-icu; - # https://github.com/haskell/cabal/issues/4969 - # haddock-api = (super.haddock-api.overrideScope (self: super: { - # haddock-library = self.haddock-library_1_6_0; - # })).override { hspec = self.hspec_2_4_8; }; - - # Jailbreak "unix-compat >=0.1.2 && <0.5". - # Jailbreak "graphviz >=2999.18.1 && <2999.20". - darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' -e 's/graphviz .*,/graphviz,/' darcs.cabal"; }); - # aarch64 and armv7l fixes. happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 @@ -1093,10 +1091,6 @@ self: super: { cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; stack = generateOptparseApplicativeCompletion "stack" super.stack; - # https://github.com/pikajude/stylish-cabal/issues/11 - stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; }; - hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; }; - # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 7a5b78ba74c6..cad854170115 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -91,12 +91,11 @@ self: super: { distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: { - Cabal = self.Cabal_2_2_0_1; - haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); - })); # GHC 8.2 doesn't have semigroups included by default ListLike = addBuildDepend super.ListLike self.semigroups; + # https://github.com/pikajude/stylish-cabal/issues/11 + stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 83cb831345c1..04e0a755d100 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -71,4 +71,9 @@ self: super: { yaml = self.yaml_0_11_0_0; }; + # https://github.com/pikajude/stylish-cabal/issues/11 + stylish-cabal = generateOptparseApplicativeCompletion "stylish-cabal" (super.stylish-cabal.overrideScope (self: super: { + haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); + })); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index bb49a31c0eed..b6aae3d8e733 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -68,7 +68,7 @@ self: super: { # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 stack = doJailbreak super.stack; - # Fix build with ghc 8.6.x. - git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch; + # https://github.com/pikajude/stylish-cabal/issues/11 + stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index b71f75033f08..d4ff521273d5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -1,11 +1,18 @@ +## +## Caveat: a copy of configuration-ghc-8.6.x.nix with minor changes: +## +## 1. "8.7" strings +## 2. llvm 6 +## 3. disabled library update: parallel +## { pkgs, haskellLib }: with haskellLib; self: super: { - # This compiler version needs llvm 5.x. - llvmPackages = pkgs.llvmPackages_5; + # This compiler version needs llvm 6.x. + llvmPackages = pkgs.llvmPackages_6; # Disable GHC 8.7.x core libraries. array = null; @@ -20,12 +27,15 @@ self: super: { ghc-boot = null; ghc-boot-th = null; ghc-compact = null; - ghc-prim = null; + ghc-heap = null; ghci = null; + ghc-prim = null; haskeline = null; hpc = null; integer-gmp = null; + libiserv = null; mtl = null; + parallel = null; parsec = null; pretty = null; process = null; @@ -39,60 +49,37 @@ self: super: { unix = null; xhtml = null; - # jailbreak-cabal can use the native Cabal library. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; - - # haddock: No input file(s). - nats = dontHaddock super.nats; - bytestring-builder = dontHaddock super.bytestring-builder; - - # We have time 1.5 - aeson = disableCabalFlag super.aeson "old-locale"; - - # Setup: At least the following dependencies are missing: base <4.8 - hspec-expectations = overrideCabal super.hspec-expectations (drv: { - postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; - }); - utf8-string = overrideCabal super.utf8-string (drv: { - postPatch = "sed -i -e 's|base >= 4.3 && < 4.10|base|' utf8-string.cabal"; - }); - - # bos/attoparsec#92 - attoparsec = dontCheck super.attoparsec; - - # test suite hangs silently for at least 10 minutes - split = dontCheck super.split; - - # Test suite fails with some (seemingly harmless) error. - # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24 - syb = dontCheck super.syb; - - # Test suite has stricter version bounds - retry = dontCheck super.retry; - - # Test suite fails with time >= 1.5 - http-date = dontCheck super.http-date; - - # Version 1.19.5 fails its test suite. - happy = dontCheck super.happy; - - # Workaround for a workaround, see comment for "ghcjs" flag. - jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs"; - in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 - self.webkitgtk3-javascriptcore ]; - - # The compat library is empty in the presence of mtl 2.2.x. - mtl-compat = dontHaddock super.mtl-compat; - - # Won't work with LLVM 3.5. - llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; - - # A bunch of jailbreaks due to 'base' bump - old-time = doJailbreak super.old-time; - old-locale = doJailbreak super.old-locale; - primitive = doJailbreak super.primitive; - test-framework = doJailbreak super.test-framework; - atomic-primops = doJailbreak (appendPatch super.atomic-primops ./patches/atomic-primops-Cabal-1.25.patch); - hashable = doJailbreak super.hashable; + # https://github.com/tibbe/unordered-containers/issues/214 + unordered-containers = dontCheck super.unordered-containers; + + # Test suite does not compile. + cereal = dontCheck super.cereal; + data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x + dates = doJailbreak super.dates; # base >=4.9 && <4.12 + Diff = dontCheck super.Diff; + HaTeX = doJailbreak super.HaTeX; # containers >=0.4 && <0.6 is too tight; https://github.com/Daniel-Diaz/HaTeX/issues/126 + hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 + http-api-data = doJailbreak super.http-api-data; + persistent-sqlite = dontCheck super.persistent-sqlite; + psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x + system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" + unicode-transforms = dontCheck super.unicode-transforms; + wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 + RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14 + monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66 + github = dontCheck super.github; # hspec upper bound exceeded; https://github.com/phadej/github/pull/341 + binary-orphans = dontCheck super.binary-orphans; # tasty upper bound exceeded; https://github.com/phadej/binary-orphans/commit/8ce857226595dd520236ff4c51fa1a45d8387b33 + + # https://github.com/jgm/skylighting/issues/55 + skylighting-core = dontCheck super.skylighting-core; + + # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 + stack = doJailbreak super.stack; + + # Fix build with ghc 8.6.x. + git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch; + + # https://github.com/pikajude/stylish-cabal/issues/11 + stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 27bee9ae2316..e4848f0283eb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.2 + # LTS Haskell 13.5 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -346,7 +346,7 @@ default-package-overrides: - bzlib-conduit ==0.3.0.1 - c2hs ==0.28.6 - Cabal ==2.4.1.0 - - cabal2spec ==2.2.2 + - cabal2spec ==2.2.2.1 - cabal-doctest ==1.0.6 - cabal-rpm ==0.12.6 - cache ==0.1.1.1 @@ -368,7 +368,7 @@ default-package-overrides: - cayley-client ==0.4.8 - cborg ==0.2.1.0 - cborg-json ==0.2.1.0 - - cereal ==0.5.7.0 + - cereal ==0.5.8.0 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 - cereal-time ==0.1.0.0 @@ -408,7 +408,7 @@ default-package-overrides: - clock-extras ==0.1.0.2 - clr-host ==0.2.1.0 - clr-marshal ==0.2.0.0 - - clumpiness ==0.17.0.0 + - clumpiness ==0.17.0.2 - cmark ==0.5.6 - cmark-gfm ==0.1.6 - cmdargs ==0.10.20 @@ -443,7 +443,7 @@ default-package-overrides: - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduit ==1.3.1 - - conduit-algorithms ==0.0.8.2 + - conduit-algorithms ==0.0.9.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - conduit-connection ==0.1.0.4 @@ -490,7 +490,7 @@ default-package-overrides: - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - cryptocompare ==0.1.1 - - crypto-enigma ==0.1.1.4 + - crypto-enigma ==0.1.1.5 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -549,7 +549,7 @@ default-package-overrides: - data-msgpack-types ==0.0.2 - data-or ==1.0.0.5 - data-ordlist ==0.4.7.0 - - data-ref ==0.0.1.2 + - data-ref ==0.0.2 - data-reify ==0.6.1 - data-serializer ==0.3.4 - data-textual ==0.3.0.2 @@ -558,7 +558,7 @@ default-package-overrides: - DAV ==1.3.3 - dbcleaner ==0.1.3 - DBFunctor ==0.1.0.0 - - dbus ==1.2.1 + - dbus ==1.2.3 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 @@ -567,14 +567,14 @@ default-package-overrides: - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - deferred-folds ==0.9.10 - - dejafu ==1.11.0.4 + - dejafu ==1.11.0.5 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - deque ==0.2.7 - deriveJsonNoPrefix ==0.1.0.1 - - deriving-compat ==0.5.2 + - deriving-compat ==0.5.4 - derulo ==1.0.5 - detour-via-sci ==1.0.0 - dhall ==1.19.1 @@ -648,7 +648,7 @@ default-package-overrides: - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - emacs-module ==0.1.1 - - email-validate ==2.3.2.9 + - email-validate ==2.3.2.10 - emd ==0.1.4.0 - enclosed-exceptions ==1.0.3 - entropy ==0.4.1.4 @@ -671,7 +671,7 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.2.0 + - eventstore ==1.2.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.5.0.1 @@ -746,7 +746,7 @@ default-package-overrides: - force-layout ==0.4.0.6 - foreign-store ==0.2 - forkable-monad ==0.2.0.3 - - forma ==1.1.0 + - forma ==1.1.1 - format-numbers ==0.1.0.0 - formatting ==6.3.7 - foundation ==0.0.21 @@ -788,7 +788,7 @@ default-package-overrides: - genvalidity-aeson ==0.2.0.2 - genvalidity-bytestring ==0.3.0.1 - genvalidity-containers ==0.5.1.1 - - genvalidity-hspec ==0.6.2.1 + - genvalidity-hspec ==0.6.2.2 - genvalidity-hspec-aeson ==0.3.0.1 - genvalidity-hspec-binary ==0.2.0.3 - genvalidity-hspec-cereal ==0.2.0.3 @@ -831,14 +831,14 @@ default-package-overrides: - gingersnap ==0.3.1.0 - gi-pango ==1.0.16 - giphy-api ==0.6.0.1 - - githash ==0.1.3.0 - - github-release ==1.2.3 + - githash ==0.1.3.1 + - github-release ==1.2.4 - github-types ==0.2.1 - github-webhooks ==0.10.0 - gitrev ==1.3.1 - gi-vte ==2.91.19 - gl ==0.8.0 - - glabrous ==1.0.0 + - glabrous ==1.0.1 - glaze ==0.3.0.1 - glazier ==1.0.0.0 - GLFW-b ==3.2.1.0 @@ -857,7 +857,7 @@ default-package-overrides: - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graphs ==0.7.1 - - graph-wrapper ==0.2.5.2 + - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - graylog ==0.1.0.1 - greskell ==0.2.3.0 @@ -869,7 +869,7 @@ default-package-overrides: - groundhog-postgresql ==0.10 - groundhog-sqlite ==0.10.0 - groups ==0.4.1.0 - - guarded-allocation ==0.0 + - guarded-allocation ==0.0.1 - gym-http-api ==0.1.0.1 - h2c ==1.0.0 - hackage-db ==2.0.1 @@ -880,16 +880,17 @@ default-package-overrides: - hamilton ==0.1.0.3 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - - hapistrano ==0.3.8.0 + - hapistrano ==0.3.9.1 - happy ==1.19.9 + - hasbolt ==0.1.3.2 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 - hashmap ==1.3.3 - hashtables ==1.2.3.1 - - haskeline ==0.7.4.3 + - haskeline ==0.7.5.0 - haskell-gi ==0.21.5 - - haskell-gi-base ==0.21.4 + - haskell-gi-base ==0.21.5 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - haskell-lsp ==0.8.0.1 @@ -905,7 +906,7 @@ default-package-overrides: - haskoin-core ==0.8.4 - hasql ==1.3.0.3 - hasql-optparse-applicative ==0.3.0.3 - - hasql-pool ==0.5 + - hasql-pool ==0.5.0.1 - hasql-transaction ==0.7 - hasty-hamiltonian ==1.3.2 - haxl ==2.0.1.1 @@ -921,8 +922,10 @@ default-package-overrides: - hedgehog ==0.6.1 - hedgehog-corpus ==0.1.0 - hedis ==0.10.10 + - hedn ==0.2.0.0 - here ==1.2.13 - heredoc ==0.2.0.0 + - heterocephalus ==1.0.5.3 - hex ==0.1.2 - hexml ==0.3.4 - hexml-lens ==0.2.1 @@ -986,7 +989,7 @@ default-package-overrides: - hslua ==1.0.2 - hslua-aeson ==1.0.0 - hslua-module-text ==0.2.0 - - HsOpenSSL ==0.11.4.15 + - HsOpenSSL ==0.11.4.16 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - hspec ==2.6.1 @@ -1002,7 +1005,7 @@ default-package-overrides: - hspec-leancheck ==0.0.3 - hspec-megaparsec ==2.0.0 - hspec-meta ==2.6.0 - - hspec-need-env ==0.1.0.2 + - hspec-need-env ==0.1.0.3 - hspec-pg-transact ==0.1.0.2 - hspec-smallcheck ==0.5.2 - hspec-wai ==0.9.2 @@ -1012,7 +1015,7 @@ default-package-overrides: - HStringTemplate ==0.8.7 - HSvm ==0.1.0.3.22 - HsYAML ==0.1.1.3 - - hsyslog ==5.0.1 + - hsyslog ==5.0.2 - htaglib ==1.2.0 - HTF ==0.13.2.5 - html ==1.0.1.2 @@ -1035,10 +1038,10 @@ default-package-overrides: - http-reverse-proxy ==0.6.0 - http-streams ==0.8.6.1 - http-types ==0.12.2 - - human-readable-duration ==0.2.1.2 + - human-readable-duration ==0.2.1.3 - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==1.2.0.6 + - hunit-dejafu ==1.2.1.0 - hvect ==0.4.0.0 - hvega ==0.1.0.3 - hw-balancedparens ==0.2.0.2 @@ -1075,7 +1078,7 @@ default-package-overrides: - hybrid-vectors ==0.2.2 - hyperloglog ==0.4.2 - hyphenation ==0.7.1 - - hyraxAbif ==0.2.3.10 + - hyraxAbif ==0.2.3.15 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 @@ -1094,7 +1097,7 @@ default-package-overrides: - indexed-list-literals ==0.2.1.2 - infer-license ==0.2.0 - inflections ==0.4.0.4 - - influxdb ==1.6.1 + - influxdb ==1.6.1.2 - ini ==0.3.6 - inline-c ==0.7.0.1 - inline-c-cpp ==0.3.0.1 @@ -1126,7 +1129,7 @@ default-package-overrides: - ip ==1.4.1 - ip6addr ==1.0.0 - iproute ==1.7.7 - - IPv6Addr ==1.1.1 + - IPv6Addr ==1.1.2 - ipython-kernel ==0.9.1.0 - irc ==0.6.1.0 - irc-client ==1.1.0.5 @@ -1146,7 +1149,7 @@ default-package-overrides: - js-jquery ==3.3.1 - json ==0.9.3 - json-alt ==1.0.0 - - json-feed ==1.0.5 + - json-feed ==1.0.6 - json-rpc ==1.0.0 - json-rpc-client ==0.2.5.0 - json-rpc-generic ==0.2.1.5 @@ -1172,7 +1175,7 @@ default-package-overrides: - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.7 + - lackey ==1.0.8 - lame ==0.1.1 - language-c ==0.8.2 - language-c-quote ==0.12.2 @@ -1183,7 +1186,7 @@ default-package-overrides: - language-javascript ==0.6.0.11 - language-puppet ==1.4.2 - lapack-ffi ==0.0.2 - - lapack-ffi-tools ==0.1.1 + - lapack-ffi-tools ==0.1.2 - largeword ==1.2.5 - latex ==0.1.0.4 - lattices ==1.7.1.1 @@ -1191,7 +1194,7 @@ default-package-overrides: - lazyio ==0.1.0.4 - lca ==0.3.1 - leancheck ==0.8.0 - - leancheck-instances ==0.0.1 + - leancheck-instances ==0.0.3 - leapseconds-announced ==2017.1.0.1 - lens ==4.17 - lens-action ==0.2.3 @@ -1203,7 +1206,7 @@ default-package-overrides: - lens-labels ==0.3.0.1 - lens-misc ==0.0.2.0 - lens-properties ==4.11.1 - - lens-regex ==0.1.0 + - lens-regex ==0.1.1 - lens-simple ==0.1.0.9 - lens-typelevel ==0.1.1.0 - lenz ==0.3.0.0 @@ -1225,7 +1228,7 @@ default-package-overrides: - List ==0.6.2 - ListLike ==4.6 - listsafe ==0.1.0.1 - - list-t ==1.0.2 + - list-t ==1.0.3.1 - ListTree ==0.2.3 - llvm-hs-pure ==7.0.0 - lmdb ==0.2.5 @@ -1263,7 +1266,7 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.2.6.0 + - massiv ==0.2.7.0 - massiv-io ==0.1.5.0 - mathexpr ==0.3.0.0 - math-functions ==0.3.1.0 @@ -1275,14 +1278,15 @@ default-package-overrides: - mbox ==0.3.4 - mbox-utility ==0.0.1 - mbtiles ==0.6.0.0 - - mbug ==1.3 + - mbug ==1.3.2 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - megaparsec ==7.0.4 - mega-sdist ==0.3.3.2 - memory ==0.14.18 - MemoTrie ==0.6.9 - - mercury-api ==0.1.0.1 + - menshen ==0.0.1 + - mercury-api ==0.1.0.2 - merkle-tree ==0.1.1 - mersenne-random-pure64 ==0.2.2.0 - metrics ==0.4.1.1 @@ -1371,8 +1375,8 @@ default-package-overrides: - mwc-probability ==2.0.4 - mwc-probability-transition ==0.4 - mwc-random ==0.14.0.0 - - mysql ==0.1.6 - - mysql-haskell ==0.8.4.1 + - mysql ==0.1.7 + - mysql-haskell ==0.8.4.2 - mysql-haskell-nem ==0.1.0.0 - mysql-simple ==0.4.5 - n2o ==0.11.1 @@ -1417,7 +1421,7 @@ default-package-overrides: - NoHoed ==0.1.1 - nonce ==1.0.7 - nondeterminism ==1.4 - - non-empty ==0.3.0.1 + - non-empty ==0.3.1 - nonempty-containers ==0.1.1.0 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.2 @@ -1451,7 +1455,7 @@ default-package-overrides: - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.2.2 - - OpenGLRaw ==3.3.1.0 + - OpenGLRaw ==3.3.2.0 - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.1.0 - openssl-streams ==1.2.1.3 @@ -1511,7 +1515,7 @@ default-package-overrides: - persist ==0.1.1.1 - persistable-record ==0.6.0.4 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.9.0 + - persistent ==2.9.1 - persistent-iproute ==0.2.3 - persistent-mysql ==2.9.0 - persistent-mysql-haskell ==0.5.1 @@ -1558,6 +1562,7 @@ default-package-overrides: - postgresql-libpq ==0.9.4.2 - postgresql-schema ==0.1.14 - postgresql-simple ==0.6 + - postgresql-simple-migration ==0.1.14.0 - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 @@ -1611,15 +1616,15 @@ default-package-overrides: - protolude ==0.2.3 - proxied ==0.3 - psql-helpers ==0.1.0.0 - - psqueues ==0.2.7.0 + - psqueues ==0.2.7.1 - pureMD5 ==2.1.3 - purescript-bridge ==0.13.0.0 - pure-zlib ==0.6.4 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.6 + - pusher-http-haskell ==1.5.1.7 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - - qnap-decrypt ==0.3.3 + - qnap-decrypt ==0.3.4 - quadratic-irrational ==0.0.6 - QuasiText ==0.1.2.6 - quickbench ==1.0 @@ -1649,8 +1654,8 @@ default-package-overrides: - rank2classes ==1.2 - Rasterific ==0.7.4.2 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.7 - - ratel-wai ==1.0.4 + - ratel ==1.0.8 + - ratel-wai ==1.0.5 - rattletrap ==6.0.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 @@ -1683,7 +1688,7 @@ default-package-overrides: - regex-tdfa ==1.2.3.1 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.2.2 + - registry ==0.1.2.3 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.1.0 @@ -1730,7 +1735,7 @@ default-package-overrides: - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 - - salak ==0.1.4 + - salak ==0.1.8 - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 @@ -1738,14 +1743,14 @@ default-package-overrides: - sampling ==0.3.3 - sandman ==0.2.0.1 - say ==0.1.0.1 - - sbp ==2.4.6 + - sbp ==2.4.7 - sbv ==7.13 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanf ==0.1.0.0 - scanner ==0.3 - scientific ==0.3.6.2 - - scotty ==0.11.2 + - scotty ==0.11.3 - scrypt ==0.5.0 - sdl2 ==2.4.1.0 - sdl2-gfx ==0.2 @@ -1771,7 +1776,7 @@ default-package-overrides: - servant-auth ==0.3.2.0 - servant-auth-client ==0.3.3.0 - servant-auth-docs ==0.2.10.0 - - servant-auth-server ==0.4.2.0 + - servant-auth-server ==0.4.3.0 - servant-auth-swagger ==0.2.10.0 - servant-blaze ==0.8 - servant-cassava ==0.10 @@ -1785,7 +1790,7 @@ default-package-overrides: - servant-foreign ==0.15 - servant-js ==0.9.4 - servant-JuicyPixels ==0.3.0.4 - - servant-kotlin ==0.1.1.5 + - servant-kotlin ==0.1.1.6 - servant-lucid ==0.8.1 - servant-mock ==0.8.5 - servant-pandoc ==0.5.0.0 @@ -1815,20 +1820,20 @@ default-package-overrides: - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - shelltestrunner ==1.9 - - shelly ==1.8.1 + - shelly ==1.8.0 - shikensu ==0.3.11 - shortcut-links ==0.4.2.1 - should-not-typecheck ==2.1.0 - - show-combinators ==0.1.0.0 + - show-combinators ==0.1.1.0 - show-prettyprint ==0.2.2 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 - simple-cmd ==0.1.2 - - simple-log ==0.9.10 + - simple-log ==0.9.11 - simple-reflect ==0.3.3 - - simple-sendfile ==0.2.27 - - simple-vec3 ==0.4.0.9 + - simple-sendfile ==0.2.28 + - simple-vec3 ==0.4.0.10 - since ==0.0.0 - singleton-bool ==0.1.4 - singleton-nats ==0.4.2 @@ -1875,12 +1880,13 @@ default-package-overrides: - sql-words ==0.1.6.2 - srcloc ==0.5.1.2 - stache ==2.0.1 + - stack2nix ==0.2.2 - starter ==0.3.0 - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - StateVar ==1.1.1.1 - - static-text ==0.2.0.3 + - static-text ==0.2.0.4 - statistics ==0.15.0.0 - stb-image-redux ==0.2.1.2 - step-function ==0.2 @@ -1898,7 +1904,7 @@ default-package-overrides: - store ==0.5.0.1 - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - - stratosphere ==0.29.0 + - stratosphere ==0.29.1 - streaming ==0.2.2.0 - streaming-attoparsec ==1.0.0 - streaming-bytestring ==0.1.6 @@ -1918,8 +1924,9 @@ default-package-overrides: - string-qq ==0.0.2 - stringsearch ==0.3.6.6 - string-transform ==1.1.0 - - strive ==5.0.7 + - strive ==5.0.8 - structs ==0.1.1 + - stylish-haskell ==0.9.2.1 - summoner ==1.2.0 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 @@ -1952,11 +1959,11 @@ default-package-overrides: - tao ==1.0.0 - tao-example ==1.0.0 - tar ==0.5.1.0 - - tar-conduit ==0.3.1 + - tar-conduit ==0.3.2 - tardis ==0.4.1.0 - tasty ==1.2 - tasty-ant-xml ==1.1.5 - - tasty-dejafu ==1.2.0.8 + - tasty-dejafu ==1.2.1.0 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.1 - tasty-golden ==2.3.2 @@ -1971,7 +1978,7 @@ default-package-overrides: - tasty-th ==0.1.7 - TCache ==0.12.1 - tce-conf ==1.3 - - tcp-streams ==1.0.1.0 + - tcp-streams ==1.0.1.1 - tcp-streams-openssl ==1.0.1.0 - tdigest ==0.2.1 - telegram-bot-simple ==0.2.0 @@ -1980,7 +1987,7 @@ default-package-overrides: - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - - tensors ==0.1.1 + - tensors ==0.1.2 - termbox ==0.1.0 - terminal-size ==0.3.2.1 - test-framework ==0.8.2.0 @@ -2007,6 +2014,7 @@ default-package-overrides: - text-printer ==0.5 - text-region ==0.3.1.0 - text-short ==0.1.2 + - text-show ==3.7.5 - tfp ==1.0.1.1 - tf-random ==0.5 - th-abstraction ==0.2.10.0 @@ -2028,7 +2036,7 @@ default-package-overrides: - throttle-io-stream ==0.2.0.1 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - - th-utilities ==0.2.0.1 + - th-utilities ==0.2.1.0 - thyme ==0.3.5.5 - tile ==0.3.0.0 - time-compat ==0.1.0.3 @@ -2074,7 +2082,7 @@ default-package-overrides: - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - turtle ==1.5.13 - - typed-process ==0.2.3.0 + - typed-process ==0.2.4.0 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2085,7 +2093,7 @@ default-package-overrides: - type-of-html ==1.5.0.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.1.0.4 - - typerep-map ==0.3.0 + - typerep-map ==0.3.1 - type-spec ==0.3.0.1 - tz ==0.1.3.2 - tzdata ==0.1.20181026.0 @@ -2116,7 +2124,7 @@ default-package-overrides: - universum ==1.5.0 - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.1 - - unix-time ==0.4.4 + - unix-time ==0.4.5 - unliftio ==0.2.10 - unliftio-core ==0.1.2.0 - unlit ==0.4.0.0 @@ -2174,13 +2182,13 @@ default-package-overrides: - vivid-supercollider ==0.4.1.2 - void ==0.7.2 - vty ==5.25.1 - - wai ==3.2.1.2 + - wai ==3.2.2 - wai-app-static ==3.1.6.2 - wai-cli ==0.1.1 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.24.3 + - wai-extra ==3.0.25 - wai-handler-launch ==3.0.2.4 - wai-logger ==2.3.4 - wai-middleware-auth ==0.1.2.1 @@ -2195,12 +2203,12 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - - warp ==3.2.25 + - warp ==3.2.26 - warp-tls ==3.2.4.3 - warp-tls-uid ==0.2.0.5 - wave ==0.1.5 - wcwidth ==0.0.2 - - web3 ==0.8.2.1 + - web3 ==0.8.3.1 - webdriver ==0.8.5 - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 @@ -2240,7 +2248,7 @@ default-package-overrides: - writer-cps-mtl ==0.1.1.5 - writer-cps-transformers ==0.1.1.4 - ws ==0.0.5 - - wuss ==1.1.11 + - wuss ==1.1.12 - X11 ==1.9 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2265,6 +2273,7 @@ default-package-overrides: - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0 + - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - xml-isogen ==0.3.0 - xml-lens ==0.1.6.3 @@ -2277,6 +2286,8 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 + - yam ==0.5.11 + - yam-datasource ==0.5.11 - yaml ==0.11.0.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 @@ -2285,13 +2296,13 @@ default-package-overrides: - yesod-alerts ==0.1.2.0 - yesod-auth ==1.6.5 - yesod-auth-hashdb ==1.7.1 - - yesod-auth-oauth2 ==0.6.0.0 + - yesod-auth-oauth2 ==0.6.1.0 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.9 + - yesod-core ==1.6.10.1 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.3 + - yesod-form ==1.6.4 - yesod-form-bootstrap4 ==2.1.0 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.0.0 @@ -2302,7 +2313,7 @@ default-package-overrides: - yesod-recaptcha2 ==0.3.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.5.1 + - yesod-test ==1.6.6 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.1 - yes-precure5-command ==5.5.3 @@ -2357,15 +2368,13 @@ extra-packages: - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hoogle == 5.0.14 # required by hie-hoogle - - hspec < 2.5 # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11 - - hspec-core < 2.5 # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11 - - hspec-discover < 2.5 # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11 - html-conduit ^>= 1.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x - lens-labels == 0.1.* # required for proto-lens-descriptors - mainland-pretty == 0.6.2.* # required for tensorflow-opgen-0.1.0.0 + - megaparsec < 7.0 # required for idris <= 1.3.1: https://github.com/idris-lang/Idris-dev/pull/4610 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -2426,7 +2435,6 @@ package-maintainers: - xmonad - xmonad-contrib gridaphobe: - - ghc-srcspan-plugin - located-base jb55: - bson-lens @@ -2601,11 +2609,13 @@ dont-distribute-packages: accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-llvm-native: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-random: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-utility: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] access-time: [ i686-linux, x86_64-linux, x86_64-darwin ] access-token-provider: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2822,8 +2832,8 @@ dont-distribute-packages: arena: [ i686-linux, x86_64-linux, x86_64-darwin ] arff: [ i686-linux, x86_64-linux, x86_64-darwin ] arghwxhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - argon: [ i686-linux, x86_64-linux, x86_64-darwin ] argon2: [ i686-linux, x86_64-linux, x86_64-darwin ] + argon: [ i686-linux, x86_64-linux, x86_64-darwin ] argparser: [ i686-linux, x86_64-linux, x86_64-darwin ] arguedit: [ i686-linux, x86_64-linux, x86_64-darwin ] ariadne: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2852,8 +2862,8 @@ dont-distribute-packages: asic: [ i686-linux, x86_64-linux, x86_64-darwin ] asif: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ] - asn: [ i686-linux, x86_64-linux, x86_64-darwin ] asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] + asn: [ i686-linux, x86_64-linux, x86_64-darwin ] AspectAG: [ i686-linux, x86_64-linux, x86_64-darwin ] assert: [ i686-linux, x86_64-linux, x86_64-darwin ] assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2912,6 +2922,7 @@ dont-distribute-packages: authoring: [ i686-linux, x86_64-linux, x86_64-darwin ] AutoForms: [ i686-linux, x86_64-linux, x86_64-darwin ] autom: [ i686-linux, x86_64-linux, x86_64-darwin ] + automata: [ i686-linux, x86_64-linux, x86_64-darwin ] autonix-deps-kf5: [ i686-linux, x86_64-linux, x86_64-darwin ] autonix-deps: [ i686-linux, x86_64-linux, x86_64-darwin ] avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3112,6 +3123,7 @@ dont-distribute-packages: biopsl: [ i686-linux, x86_64-linux, x86_64-darwin ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] biostockholm: [ i686-linux, x86_64-linux, x86_64-darwin ] + birch-beer: [ i686-linux, x86_64-linux, x86_64-darwin ] bird: [ i686-linux, x86_64-linux, x86_64-darwin ] BirdPP: [ i686-linux, x86_64-linux, x86_64-darwin ] bisect-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3137,6 +3149,7 @@ dont-distribute-packages: blakesum: [ i686-linux, x86_64-linux, x86_64-darwin ] blank-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] blas-carray: [ i686-linux, x86_64-linux, x86_64-darwin ] + blas-comfort-array: [ i686-linux, x86_64-linux, x86_64-darwin ] blas-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] blas-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] blas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3313,8 +3326,8 @@ dont-distribute-packages: cairo-appbase: [ i686-linux, x86_64-linux, x86_64-darwin ] cairo-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - cake: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] + cake: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] cal-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3335,6 +3348,7 @@ dont-distribute-packages: canteven-listen-http: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-log: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-parsedate: [ i686-linux, x86_64-linux, x86_64-darwin ] + cantor-pairing: [ i686-linux, x86_64-linux, x86_64-darwin ] cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] cao: [ i686-linux, x86_64-linux, x86_64-darwin ] cap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3391,9 +3405,9 @@ dont-distribute-packages: ccnx: [ i686-linux, x86_64-linux, x86_64-darwin ] cctools-workqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] cedict: [ i686-linux, x86_64-linux, x86_64-darwin ] - cef: [ i686-linux, x86_64-linux, x86_64-darwin ] cef3-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] cef3-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + cef: [ i686-linux, x86_64-linux, x86_64-darwin ] ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] celtchar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3435,6 +3449,7 @@ dont-distribute-packages: chell-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] chell: [ i686-linux, x86_64-linux, x86_64-darwin ] chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + chiasma: [ i686-linux, x86_64-linux, x86_64-darwin ] chitauri: [ i686-linux, x86_64-linux, x86_64-darwin ] Chitra: [ i686-linux, x86_64-linux, x86_64-darwin ] choose-exe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3572,6 +3587,7 @@ dont-distribute-packages: colorless-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] colorless-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] colorless: [ i686-linux, x86_64-linux, x86_64-darwin ] + colour-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] columbia: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3640,6 +3656,7 @@ dont-distribute-packages: conductive-base: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-song: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-find: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3759,15 +3776,15 @@ dont-distribute-packages: cqrs-testkit: [ i686-linux, x86_64-linux, x86_64-darwin ] cr: [ i686-linux, x86_64-linux, x86_64-darwin ] crack: [ i686-linux, x86_64-linux, x86_64-darwin ] - craft: [ i686-linux, x86_64-linux, x86_64-darwin ] Craft3e: [ i686-linux, x86_64-linux, x86_64-darwin ] + craft: [ i686-linux, x86_64-linux, x86_64-darwin ] craftwerk-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] craftwerk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ] crawlchain: [ i686-linux, x86_64-linux, x86_64-darwin ] craze: [ i686-linux, x86_64-linux, x86_64-darwin ] - crc: [ i686-linux, x86_64-linux, x86_64-darwin ] crc16: [ i686-linux, x86_64-linux, x86_64-darwin ] + crc: [ i686-linux, x86_64-linux, x86_64-darwin ] crdt: [ i686-linux, x86_64-linux, x86_64-darwin ] creatur: [ i686-linux, x86_64-linux, x86_64-darwin ] credential-store: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3844,7 +3861,6 @@ dont-distribute-packages: darcs-fastconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] darcsden: [ i686-linux, x86_64-linux, x86_64-darwin ] DarcsHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3959,6 +3975,7 @@ dont-distribute-packages: debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ] debug-trace-var: [ i686-linux, x86_64-linux, x86_64-darwin ] debug-tracy: [ i686-linux, x86_64-linux, x86_64-darwin ] + debug: [ i686-linux, x86_64-linux, x86_64-darwin ] decepticons: [ i686-linux, x86_64-linux, x86_64-darwin ] decimal-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] decimal-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4050,9 +4067,11 @@ dont-distribute-packages: dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] dictionaries: [ i686-linux, x86_64-linux, x86_64-darwin ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + diet: [ i686-linux, x86_64-linux, x86_64-darwin ] diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] difference-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] + differential: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4355,8 +4374,8 @@ dont-distribute-packages: Etage-Graph: [ i686-linux, x86_64-linux, x86_64-darwin ] Etage: [ i686-linux, x86_64-linux, x86_64-darwin ] EtaMOO: [ i686-linux, x86_64-linux, x86_64-darwin ] - eternal: [ i686-linux, x86_64-linux, x86_64-darwin ] Eternal10Seconds: [ i686-linux, x86_64-linux, x86_64-darwin ] + eternal: [ i686-linux, x86_64-linux, x86_64-darwin ] eternity-timestamped: [ i686-linux, x86_64-linux, x86_64-darwin ] eternity: [ i686-linux, x86_64-linux, x86_64-darwin ] Etherbunny: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4670,8 +4689,8 @@ dont-distribute-packages: frown: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] - frpnow-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] + frpnow-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4836,6 +4855,7 @@ dont-distribute-packages: ghc-proofs: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-srcspan-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-time-alloc-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4988,8 +5008,8 @@ dont-distribute-packages: GPipe-GLFW: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - gps: [ i686-linux, x86_64-linux, x86_64-darwin ] gps2htmlReport: [ i686-linux, x86_64-linux, x86_64-darwin ] + gps: [ i686-linux, x86_64-linux, x86_64-darwin ] gpx-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] GPX: [ i686-linux, x86_64-linux, x86_64-darwin ] graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5040,6 +5060,7 @@ dont-distribute-packages: grenade: [ i686-linux, x86_64-linux, x86_64-darwin ] gridbounds: [ i686-linux, x86_64-linux, x86_64-darwin ] gridland: [ i686-linux, x86_64-linux, x86_64-darwin ] + grids: [ i686-linux, x86_64-linux, x86_64-darwin ] grm: [ i686-linux, x86_64-linux, x86_64-darwin ] groot: [ i686-linux, x86_64-linux, x86_64-darwin ] gross: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5070,13 +5091,13 @@ dont-distribute-packages: gtk-toggle-button-list: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-traymanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-buildtools: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-rpn: [ i686-linux, x86_64-linux, x86_64-darwin ] Gtk2hsGenerics: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk3-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5095,9 +5116,9 @@ dont-distribute-packages: h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ] h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] - H: [ i686-linux, x86_64-linux, x86_64-darwin ] h2048: [ i686-linux, x86_64-linux, x86_64-darwin ] h2c: [ i686-linux, x86_64-linux, x86_64-darwin ] + H: [ i686-linux, x86_64-linux, x86_64-darwin ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] habit: [ i686-linux, x86_64-linux, x86_64-darwin ] hablog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5177,6 +5198,7 @@ dont-distribute-packages: hakyll-shakespeare: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-shortcode: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] + hal: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5198,8 +5220,9 @@ dont-distribute-packages: hans-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] hans: [ i686-linux, x86_64-linux, x86_64-darwin ] haphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] - happindicator: [ i686-linux, x86_64-linux, x86_64-darwin ] + hapistrano: [ 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 ] @@ -5422,6 +5445,8 @@ dont-distribute-packages: hasql-cursor-query: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-optparse-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5436,7 +5461,6 @@ dont-distribute-packages: hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaTeX: [ i686-linux, x86_64-linux, x86_64-darwin ] hats: [ i686-linux, x86_64-linux, x86_64-darwin ] hatt: [ i686-linux, x86_64-linux, x86_64-darwin ] haven: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5611,6 +5635,7 @@ dont-distribute-packages: hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + hierarchical-spectral-clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5702,6 +5727,7 @@ dont-distribute-packages: hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] hmk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmm-lapack: [ i686-linux, x86_64-linux, x86_64-darwin ] HMM: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm: [ i686-linux, x86_64-linux, x86_64-darwin ] hMollom: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5715,8 +5741,8 @@ dont-distribute-packages: HNM: [ i686-linux, x86_64-linux, x86_64-darwin ] hnormalise: [ i686-linux, x86_64-linux, x86_64-darwin ] ho-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ] hoauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ] hob: [ i686-linux, x86_64-linux, x86_64-darwin ] hobbes: [ i686-linux, x86_64-linux, x86_64-darwin ] hobbits: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5724,6 +5750,7 @@ dont-distribute-packages: hocker: [ i686-linux, x86_64-linux, x86_64-darwin ] hodatime: [ i686-linux, x86_64-linux, x86_64-darwin ] HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hoed: [ i686-linux, x86_64-linux, x86_64-darwin ] hog: [ i686-linux, x86_64-linux, x86_64-darwin ] hogg: [ i686-linux, x86_64-linux, x86_64-darwin ] hoggl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5743,8 +5770,8 @@ dont-distribute-packages: honi: [ i686-linux, x86_64-linux, x86_64-darwin ] hoobuddy: [ i686-linux, x86_64-linux, x86_64-darwin ] hood-off: [ i686-linux, x86_64-linux, x86_64-darwin ] - hood: [ i686-linux, x86_64-linux, x86_64-darwin ] hood2: [ i686-linux, x86_64-linux, x86_64-darwin ] + hood: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodie: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5810,6 +5837,7 @@ dont-distribute-packages: hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ] hpyrg: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpython: [ i686-linux, x86_64-linux, x86_64-darwin ] hquantlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6072,6 +6100,7 @@ dont-distribute-packages: hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-json-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-packed-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6261,9 +6290,9 @@ dont-distribute-packages: iostring: [ i686-linux, x86_64-linux, x86_64-darwin ] iothread: [ i686-linux, x86_64-linux, x86_64-darwin ] iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] - ip: [ i686-linux, x86_64-linux, x86_64-darwin ] ip2location: [ i686-linux, x86_64-linux, x86_64-darwin ] ip2proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] + ip: [ i686-linux, x86_64-linux, x86_64-darwin ] ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ] ipc: [ i686-linux, x86_64-linux, x86_64-darwin ] ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6449,6 +6478,7 @@ dont-distribute-packages: katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] + kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] kdt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6569,8 +6599,8 @@ dont-distribute-packages: language-java-classfile: [ i686-linux, x86_64-linux, x86_64-darwin ] language-kort: [ i686-linux, x86_64-linux, x86_64-darwin ] language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-lua: [ i686-linux, x86_64-linux, x86_64-darwin ] language-lua2: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-lua: [ i686-linux, x86_64-linux, x86_64-darwin ] language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] language-ninja: [ i686-linux, x86_64-linux, x86_64-darwin ] language-oberon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6634,6 +6664,7 @@ dont-distribute-packages: legion: [ i686-linux, x86_64-linux, x86_64-darwin ] leksah-server: [ i686-linux, x86_64-linux, x86_64-darwin ] lendingclub: [ i686-linux, x86_64-linux, x86_64-darwin ] + lens-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6694,6 +6725,7 @@ dont-distribute-packages: linda: [ i686-linux, x86_64-linux, x86_64-darwin ] linden: [ i686-linux, x86_64-linux, x86_64-darwin ] line: [ i686-linux, x86_64-linux, x86_64-darwin ] + linear-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-code: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6782,8 +6814,8 @@ dont-distribute-packages: log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] log-warper: [ i686-linux, x86_64-linux, x86_64-darwin ] - log: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] + log: [ i686-linux, x86_64-linux, x86_64-darwin ] logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] logger: [ i686-linux, x86_64-linux, x86_64-darwin ] logging-effect-extra-file: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6860,6 +6892,7 @@ dont-distribute-packages: machines-amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-process: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + maclight: [ i686-linux, x86_64-linux, x86_64-darwin ] macos-corelibs: [ i686-linux, x86_64-linux, x86_64-darwin ] macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] madlang: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6968,8 +7001,8 @@ dont-distribute-packages: mediabus-rtp: [ i686-linux, x86_64-linux, x86_64-darwin ] mediabus: [ i686-linux, x86_64-linux, x86_64-darwin ] median-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] + mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] medium-sdk-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-core: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7072,6 +7105,7 @@ dont-distribute-packages: modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] modular: [ i686-linux, x86_64-linux, x86_64-darwin ] + modularity: [ i686-linux, x86_64-linux, x86_64-darwin ] module-management: [ i686-linux, x86_64-linux, x86_64-darwin ] modulespection: [ i686-linux, x86_64-linux, x86_64-darwin ] modulo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7084,6 +7118,7 @@ dont-distribute-packages: monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-dijkstra: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-http: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7153,6 +7188,9 @@ dont-distribute-packages: morfette: [ i686-linux, x86_64-linux, x86_64-darwin ] morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] morph: [ i686-linux, x86_64-linux, x86_64-darwin ] + morphisms-functors-inventory: [ i686-linux, x86_64-linux, x86_64-darwin ] + morphisms-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] + morphisms-objects: [ i686-linux, x86_64-linux, x86_64-darwin ] morte: [ i686-linux, x86_64-linux, x86_64-darwin ] mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] moto-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7228,8 +7266,8 @@ dont-distribute-packages: music-suite: [ i686-linux, x86_64-linux, x86_64-darwin ] music-util: [ i686-linux, x86_64-linux, x86_64-darwin ] musicbrainz-email: [ i686-linux, x86_64-linux, x86_64-darwin ] - musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] musicxml2: [ i686-linux, x86_64-linux, x86_64-darwin ] + musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] MutationOrder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7238,6 +7276,7 @@ dont-distribute-packages: mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] mvc: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + mwc-random-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-dataiter: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-nn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7320,6 +7359,7 @@ dont-distribute-packages: network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] network-api-support: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-bsd: [ i686-linux, x86_64-linux, x86_64-darwin ] network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7795,8 +7835,8 @@ dont-distribute-packages: plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ] plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-light-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7859,6 +7899,7 @@ dont-distribute-packages: postgres-tmp: [ i686-linux, x86_64-linux, x86_64-darwin ] postgres-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-copy-escape: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-lo-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-named: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7877,6 +7918,7 @@ dont-distribute-packages: postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8056,6 +8098,7 @@ dont-distribute-packages: QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] quickbooks: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-arbitrary-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-comb: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8146,8 +8189,9 @@ dont-distribute-packages: razom-text-util: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] rc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rdf: [ i686-linux, x86_64-linux, x86_64-darwin ] + rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] + rdf: [ i686-linux, x86_64-linux, x86_64-darwin ] rdioh: [ i686-linux, x86_64-linux, x86_64-darwin ] react-flux-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] react-flux: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8159,8 +8203,8 @@ dont-distribute-packages: reactive-banana-automation: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-bunch: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-gi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-threepenny: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8178,6 +8222,7 @@ dont-distribute-packages: really-simple-xml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] reasonable-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] record-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + record-encode: [ i686-linux, x86_64-linux, x86_64-darwin ] record-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] record-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] record-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8364,6 +8409,7 @@ dont-distribute-packages: rollbar-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] roller: [ i686-linux, x86_64-linux, x86_64-darwin ] RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] + ron: [ i686-linux, x86_64-linux, x86_64-darwin ] rope: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8572,6 +8618,7 @@ dont-distribute-packages: servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-checked-exceptions-core: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-checked-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-client-namedargs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8593,6 +8640,7 @@ dont-distribute-packages: servant-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-multipart: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-namedargs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8606,6 +8654,7 @@ dont-distribute-packages: servant-rawm: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-server-namedargs: [ 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 ] @@ -8797,10 +8846,10 @@ dont-distribute-packages: Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] smsaero: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - SmtLib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + SmtLib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] SMTPClient: [ i686-linux, x86_64-linux, x86_64-darwin ] smtps-gmail: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8881,6 +8930,7 @@ dont-distribute-packages: socket-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] socketed: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] + sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] socketson: [ i686-linux, x86_64-linux, x86_64-darwin ] sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] soegtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8917,6 +8967,7 @@ dont-distribute-packages: special-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] species: [ i686-linux, x86_64-linux, x86_64-darwin ] + spectral-clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] speculation-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] speculation: [ i686-linux, x86_64-linux, x86_64-darwin ] speechmatics: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8984,7 +9035,6 @@ dont-distribute-packages: stack-run: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-type: [ i686-linux, x86_64-linux, x86_64-darwin ] stack2cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-build-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8995,8 +9045,8 @@ dont-distribute-packages: stackage-to-hackage: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-types: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] starling: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9210,8 +9260,8 @@ dont-distribute-packages: tagsoup-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-selection: [ i686-linux, x86_64-linux, x86_64-darwin ] - tai: [ i686-linux, x86_64-linux, x86_64-darwin ] tai64: [ i686-linux, x86_64-linux, x86_64-darwin ] + tai: [ i686-linux, x86_64-linux, x86_64-darwin ] takahashi: [ i686-linux, x86_64-linux, x86_64-darwin ] takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9280,6 +9330,7 @@ dont-distribute-packages: termbox-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] termcolor: [ i686-linux, x86_64-linux, x86_64-darwin ] + terminal-punch: [ i686-linux, x86_64-linux, x86_64-darwin ] terminal-text: [ i686-linux, x86_64-linux, x86_64-darwin ] termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] termonad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9361,13 +9412,14 @@ dont-distribute-packages: threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-flexbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] throttled-io-loop: [ i686-linux, x86_64-linux, x86_64-darwin ] through-text: [ i686-linux, x86_64-linux, x86_64-darwin ] thumbnail-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] - TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] tictactoe3d: [ i686-linux, x86_64-linux, x86_64-darwin ] + TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-serial: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9432,6 +9484,8 @@ dont-distribute-packages: tomato-rubato-openal: [ i686-linux, x86_64-linux, x86_64-darwin ] toml: [ i686-linux, x86_64-linux, x86_64-darwin ] tomland: [ i686-linux, x86_64-linux, x86_64-darwin ] + tonatona-google-server-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + too-many-cells: [ i686-linux, x86_64-linux, x86_64-darwin ] toodles: [ i686-linux, x86_64-linux, x86_64-darwin ] Top: [ i686-linux, x86_64-linux, x86_64-darwin ] top: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9574,6 +9628,7 @@ dont-distribute-packages: type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-admin: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9730,6 +9785,7 @@ dont-distribute-packages: vault-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] + vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] vcf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9986,6 +10042,7 @@ dont-distribute-packages: X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ] x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ] + xattr: [ i686-linux, x86_64-linux, x86_64-darwin ] xcb-types: [ i686-linux, x86_64-linux, x86_64-darwin ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] xcp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -10028,9 +10085,9 @@ dont-distribute-packages: XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] XMLParser: [ i686-linux, x86_64-linux, x86_64-darwin ] xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] - XMMS: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + XMMS: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-gpl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -10063,6 +10120,7 @@ dont-distribute-packages: yajl-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] yajl: [ i686-linux, x86_64-linux, x86_64-darwin ] yak: [ i686-linux, x86_64-linux, x86_64-darwin ] + yam-datasource: [ i686-linux, x86_64-linux, x86_64-darwin ] yam-job: [ i686-linux, x86_64-linux, x86_64-darwin ] yam-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] yam-transaction-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -10079,8 +10137,8 @@ dont-distribute-packages: yampa-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - Yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ] + Yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] YampaSynth: [ i686-linux, x86_64-linux, x86_64-darwin ] yandex-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] yaop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -10090,6 +10148,8 @@ dont-distribute-packages: yarr: [ i686-linux, x86_64-linux, x86_64-darwin ] yate: [ i686-linux, x86_64-linux, x86_64-darwin ] yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaya-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaya: [ i686-linux, x86_64-linux, x86_64-darwin ] ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] yeller: [ i686-linux, x86_64-linux, x86_64-darwin ] yeshql-postgresql-simple: [ 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 6fdb2fd54949..46c8c3f9f5b8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -553,4 +553,7 @@ self: super: builtins.intersectAttrs super { # Avoid infitite recursion with yaya. yaya-hedgehog = super.yaya-hedgehog.override { yaya = dontCheck self.yaya; }; + # Avoid infitite recursion with tonatona. + tonaparser = dontCheck super.tonaparser; + } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index fc2c008be0c8..2a71e7e92d1e 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -78,6 +78,7 @@ in # same package in the (recursive) dependencies of the package being # built. Will delay failures, if any, to compile time. allowInconsistentDependencies ? false +, maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221 } @ args: assert editedCabalFile != null -> revision != null; @@ -250,6 +251,7 @@ stdenv.mkDerivation ({ '' + postPatch; setupCompilerEnvironmentPhase = '' + NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} )) runHook preSetupCompilerEnvironment echo "Build with ${ghc}." @@ -389,7 +391,7 @@ stdenv.mkDerivation ({ rmdir "$packageConfFile" fi for packageConfFile in "$packageConfDir/"*; do - local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) + local pkgId=$( ${gnused}/bin/sed -n -e 's|^id:[ ]\+||p' $packageConfFile ) mv $packageConfFile $packageConfDir/$pkgId.conf done diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 2afe270e0fc8..184d45eda445 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,6 +1,5 @@ -{ stdenv, ghc, pkgconfig, glibcLocales, cacert, stack }@depArgs: - -with stdenv.lib; +{ stdenv, ghc, pkgconfig, glibcLocales +, cacert, stack, makeSetupHook, lib }@depArgs: { buildInputs ? [] , extraArgs ? [] @@ -10,34 +9,27 @@ with stdenv.lib; , ... }@args: -let stackCmd = "stack --internal-re-exec-version=${stack.version}"; - - # Add all dependencies in buildInputs including propagated ones to - # STACK_IN_NIX_EXTRA_ARGS. - addStackArgsHook = '' -for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]} -do - [ -d "$pkg/lib" ] && \ - export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib" - [ -d "$pkg/include" ] && \ - export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include" -done - ''; +let + + stackCmd = "stack --internal-re-exec-version=${stack.version}"; + + # Add all dependencies in buildInputs including propagated ones to + # STACK_IN_NIX_EXTRA_ARGS. + stackHook = makeSetupHook {} ./stack-hook.sh; + in stdenv.mkDerivation (args // { - buildInputs = - buildInputs ++ - optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++ - [ ghc pkgconfig stack ]; + buildInputs = buildInputs + ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; - STACK_PLATFORM_VARIANT="nix"; - STACK_IN_NIX_SHELL=1; - STACK_IN_NIX_EXTRA_ARGS = extraArgs; - shellHook = addStackArgsHook + args.shellHook or ""; + nativeBuildInputs = [ ghc pkgconfig stack stackHook ]; + STACK_PLATFORM_VARIANT = "nix"; + STACK_IN_NIX_SHELL = 1; + STACK_IN_NIX_EXTRA_ARGS = extraArgs; # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042. - LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs); + LD_LIBRARY_PATH = lib.makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs); # ^^^ Internally uses `getOutput "lib"` (equiv. to getLib) # Non-NixOS git needs cert @@ -48,18 +40,33 @@ in stdenv.mkDerivation (args // { preferLocalBuild = true; - configurePhase = args.configurePhase or '' + preConfigure = '' export STACK_ROOT=$NIX_BUILD_TOP/.stack - ${addStackArgsHook} ''; - buildPhase = args.buildPhase or "${stackCmd} build"; + buildPhase = args.buildPhase or '' + runHook preBuild + + ${stackCmd} build + + runHook postBuild + ''; + + checkPhase = args.checkPhase or '' + runHook preCheck - checkPhase = args.checkPhase or "${stackCmd} test"; + ${stackCmd} test + + runHook postCheck + ''; doCheck = args.doCheck or true; installPhase = args.installPhase or '' + runHook preInstall + ${stackCmd} --local-bin-path=$out/bin build --copy-bins + + runHook postInstall ''; }) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2ac7481cfd75..f42742903a9e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8927,7 +8927,6 @@ self: { ]; description = "The Haskell LaTeX library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HaTeX-meta" = callPackage @@ -9181,17 +9180,17 @@ self: { }) {}; "HasCacBDD" = callPackage - ({ mkDerivation, base, Cabal, CacBDD, directory, process + ({ mkDerivation, base, Cabal, CacBDD, directory, hspec, process , QuickCheck }: mkDerivation { pname = "HasCacBDD"; - version = "0.1.0.0"; - sha256 = "1dp4glfvd3ihaq2k3y40h7yz29c5lh76mjdzjcqb0ixvkh13d7dy"; + version = "0.1.0.1"; + sha256 = "0mvhhwgz2k46d2adrrs5bhc4x2yx3zr5fwi2nnxzrjhm1ki9b8zb"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base process QuickCheck ]; librarySystemDepends = [ CacBDD ]; - testHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck ]; description = "Haskell bindings for CacBDD"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -9326,8 +9325,8 @@ self: { }: mkDerivation { pname = "HaskellNet-SSL"; - version = "0.3.4.0"; - sha256 = "03q48g4gzmhjl4a5wwn0q3man8s44pn028a0fidjpmfmgxa95bl3"; + version = "0.3.4.1"; + sha256 = "0j36zcx5vfg4jzc7vvfj4ifcvcgyy2sn9rxnxj3vg2cw77idqyp1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring connection data-default HaskellNet network tls @@ -9703,6 +9702,7 @@ self: { testHaskellDepends = [ base process QuickCheck ]; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HoleyMonoid" = callPackage @@ -9965,8 +9965,10 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.15"; - sha256 = "0idmak6d8mpbxphyq9hkxkmby2wnzhc1phywlgm0zw6q47pwxgff"; + version = "0.11.4.16"; + sha256 = "1jbbrhbvl3y1l0g1wv5h7l59bj7w8ajl8bfpxfwjypgmqlrlks19"; + revision = "1"; + editedCabalFile = "0hc113g6jp7ci5gxx2chhp1h64nzx47c4ahwisyqgs3f6prm6dqr"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -10065,6 +10067,20 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "HsYAML-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector + }: + mkDerivation { + pname = "HsYAML-aeson"; + version = "0.1.0.0"; + sha256 = "1hf1gwa89ghd4aaim6g8dx9wppp6d1y0w1xiddm1r8lpfidca1nw"; + libraryHaskellDepends = [ + aeson base bytestring HsYAML mtl text vector + ]; + description = "JSON to YAML Adapter"; + license = stdenv.lib.licenses.gpl2Plus; + }) {}; + "Hsed" = callPackage ({ mkDerivation, array, base, bytestring, cmdargs, data-accessor , data-accessor-template, data-accessor-transformers, directory @@ -10276,8 +10292,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "1.1.1"; - sha256 = "0l2yfn46xyv0ib30k0kmhw3vl4vfmziqinhbynpi4yrmy6lmj29v"; + version = "1.1.2"; + sha256 = "0zpjji441ys2x6zmndyg7203w3j4j8flhwrl4593a6bz6vqzkwwb"; libraryHaskellDepends = [ aeson attoparsec base iproute network network-info random text ]; @@ -12527,18 +12543,12 @@ self: { }) {}; "MonadCompose" = callPackage - ({ mkDerivation, base, data-default, ghc-prim, kan-extensions - , mmorph, monad-products, mtl, parallel, random, transformers - , transformers-compat - }: + ({ mkDerivation, base, free, mmorph, mtl, transformers }: mkDerivation { pname = "MonadCompose"; - version = "0.8.4.2"; - sha256 = "0y5cigcf6xian619qdnnvs9m5rzqy7n3yhz133ws54im9qzsdhvi"; - libraryHaskellDepends = [ - base data-default ghc-prim kan-extensions mmorph monad-products mtl - parallel random transformers transformers-compat - ]; + version = "0.9.0.0"; + sha256 = "1jq8ms16karqqa6qxp4n24f2v4bcc8n8mzfjm6b6q3n8hg7dj8yd"; + libraryHaskellDepends = [ base free mmorph mtl transformers ]; description = "Methods for composing monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -13123,20 +13133,20 @@ self: { }) {inherit (pkgs) net_snmp;}; "Network-NineP" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, convertible - , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl - , network, NineP, regex-posix, stateref, transformers + ({ mkDerivation, async, base, binary, bytestring, containers + , convertible, exceptions, hslogger, monad-loops, monad-peel + , mstate, mtl, network, NineP, regex-posix, stateref, transformers }: mkDerivation { pname = "Network-NineP"; - version = "0.4.4"; - sha256 = "119v9iimpgd5cym5q7az0gg70irja9034r2mhvq2k4ygmmz0lazy"; + version = "0.4.5"; + sha256 = "1s11idqg8bvimhal86569wlw746cyyq67dxvvabnbn3q23mjkflh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers convertible exceptions hslogger - monad-loops monad-peel mstate mtl network NineP regex-posix - stateref transformers + async base binary bytestring containers convertible exceptions + hslogger monad-loops monad-peel mstate mtl network NineP + regex-posix stateref transformers ]; description = "High-level abstraction over 9P protocol"; license = "unknown"; @@ -13839,22 +13849,6 @@ self: { }: mkDerivation { pname = "OpenGLRaw"; - version = "3.3.1.0"; - sha256 = "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ libGL ]; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL;}; - - "OpenGLRaw_3_3_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, libGL - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; version = "3.3.2.0"; sha256 = "1qy41qpqmksvgy7j73b46ksvm00mh6amgy9n9wkal4czkaj26kpj"; libraryHaskellDepends = [ @@ -13863,7 +13857,6 @@ self: { librarySystemDepends = [ libGL ]; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libGL;}; "OpenGLRaw21" = callPackage @@ -15101,6 +15094,8 @@ self: { pname = "QuickCheck"; version = "2.12.6.1"; sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb"; + revision = "1"; + editedCabalFile = "0w5gygp6pmyjzjjx5irfflcbx586zfnqidq669ssqqfsadf944xv"; libraryHaskellDepends = [ base containers deepseq erf random template-haskell tf-random transformers @@ -16314,6 +16309,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "SVGFonts_1_7_0_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg + , bytestring, cereal, cereal-vector, containers, data-default-class + , diagrams-core, diagrams-lib, directory, parsec, split, text + , vector, xml + }: + mkDerivation { + pname = "SVGFonts"; + version = "1.7.0.1"; + sha256 = "06vnpkkr19s9b1wjp7l2w29vr7fsghcrffd2knlxvdhjacrfpc9h"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base blaze-markup blaze-svg bytestring cereal + cereal-vector containers data-default-class diagrams-core + diagrams-lib directory parsec split text vector xml + ]; + description = "Fonts from the SVG-Font format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "SVGPath" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -16508,8 +16524,10 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "SecureHash-SHA3"; - version = "0.1.0.2"; - sha256 = "0h0mya8bk7zkq92plihzzqd7svfqdk2dphnivfb0r80iw3678nv9"; + version = "0.1.1.0"; + sha256 = "0dva3bzfzyzh8kxljyipd041a2w1zhxjvxmhnw2mlv2jcywnk2hz"; + revision = "1"; + editedCabalFile = "034vwq9cfqjj6hj2nf5g8n2p5gsxpdgp6gwgsmi40klracl5ps5s"; libraryHaskellDepends = [ base bytestring ]; description = "simple static linked SHA3 using private symbols and the ref impl"; license = stdenv.lib.licenses.bsd2; @@ -17319,14 +17337,14 @@ self: { }) {}; "Stack" = callPackage - ({ mkDerivation, base, nats, stm }: + ({ mkDerivation, base, deepseq, nats, stm }: mkDerivation { pname = "Stack"; - version = "0.3.2"; - sha256 = "1rap4xyldzwj26r8mbvzkyy9021q8h06pz8cyd061vyslrl7p89b"; - revision = "1"; - editedCabalFile = "1ngyrylqmc2fc088d49pn41nlps3mqjimh0y8wc6nmpkay5pj0m8"; - libraryHaskellDepends = [ base nats stm ]; + version = "0.4.0"; + sha256 = "0i8frm923gkk9h8z38jijrd43dfsj9rwzxhwj6xv57rq7l3nq583"; + revision = "2"; + editedCabalFile = "1n4zyl9iagzjx3i3zb5w24mf5x51nwwnnzrrc1rgkflvxlirm9md"; + libraryHaskellDepends = [ base deepseq nats stm ]; description = "Stack data structure"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -18581,25 +18599,29 @@ self: { "VKHS" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, clock, containers, data-default-class - , directory, filepath, http-client, http-client-tls, http-types - , mtl, network-uri, optparse-applicative, parsec, pipes, pipes-http - , pretty-show, regexpr, scientific, split, tagsoup, text, time + , directory, filepath, flippers, hashable, http-client + , http-client-tls, http-types, mtl, network-uri + , optparse-applicative, parsec, pipes, pipes-http, pretty-show + , process, regexpr, scientific, split, tagsoup, text, time , utf8-string, vector }: mkDerivation { pname = "VKHS"; - version = "1.9.1"; - sha256 = "1jhllxylsclshs027vinx5p3rql3964dy4p37q916g4g58ml83j6"; + version = "1.9.2"; + sha256 = "0axipbapshpdybzaiklcyyzly1awnfmpg7q2hqf3sy97rw72blbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive clock - containers data-default-class directory filepath http-client - http-client-tls http-types mtl network-uri optparse-applicative - parsec pipes pipes-http pretty-show scientific split tagsoup time - utf8-string vector + containers data-default-class directory filepath flippers hashable + http-client http-client-tls http-types mtl network-uri + optparse-applicative parsec pipes pipes-http pretty-show process + regexpr scientific split tagsoup text time utf8-string vector + ]; + executableHaskellDepends = [ + base bytestring directory filepath mtl optparse-applicative parsec + regexpr text ]; - executableHaskellDepends = [ regexpr text ]; description = "Provides access to Vkontakte social network via public API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -20158,6 +20180,7 @@ self: { testHaskellDepends = [ base doctest ]; description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-arithmetic" = callPackage @@ -20451,6 +20474,7 @@ self: { ]; description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-llvm" = callPackage @@ -20657,6 +20681,8 @@ self: { pname = "acid-state"; version = "0.14.3"; sha256 = "1d8hq8cj6h4crfnkmds6mhrhhg7r1b1byb8fybaj8khfa99sj0nm"; + revision = "1"; + editedCabalFile = "1sff496w6wpvs88jjk8306zvf0z1169g9n0y99sglqgzb03bw6gp"; libraryHaskellDepends = [ array base bytestring cereal containers directory extensible-exceptions filepath mtl network safecopy stm @@ -20760,6 +20786,22 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-circular-containers" = callPackage + ({ mkDerivation, base, containers, doctest, doctest-discover + , graph-wrapper + }: + mkDerivation { + pname = "acme-circular-containers"; + version = "0.1.0.0"; + sha256 = "1xngqlx0avn84qx696hjm8cdqqs9p0ls90kklkz5rs48fbcma3pr"; + libraryHaskellDepends = [ base containers graph-wrapper ]; + testHaskellDepends = [ + base containers doctest doctest-discover graph-wrapper + ]; + description = "Spineless containers which are fast to read but inefficient to update"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "acme-cofunctor" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21963,18 +22005,18 @@ self: { }) {}; "aeson-filthy" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, text + ({ mkDerivation, aeson, base, bytestring, doctest, text, time , unordered-containers }: mkDerivation { pname = "aeson-filthy"; - version = "0.1.2"; - sha256 = "1sph4iq87vl66rbxvhhh5j699yskpb8zs1mvc3nvp60nyg1145b8"; + version = "0.1.3"; + sha256 = "121ygm5k9qjizwjj7w5dklxs5sv0zysrnpvwb37ar4bjkcxhs0ap"; libraryHaskellDepends = [ - aeson base bytestring text unordered-containers + aeson base bytestring text time unordered-containers ]; testHaskellDepends = [ - aeson base bytestring doctest text unordered-containers + aeson base bytestring doctest text time unordered-containers ]; description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input"; license = stdenv.lib.licenses.bsd3; @@ -22030,6 +22072,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-gadt-th" = callPackage + ({ mkDerivation, aeson, base, dependent-sum, markdown-unlit + , template-haskell, transformers + }: + mkDerivation { + pname = "aeson-gadt-th"; + version = "0.1.2.0"; + sha256 = "1rlcf37qb16cxrym9f0p1spmwplf521hkvdc4kl5af7q573dahkg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base dependent-sum template-haskell transformers + ]; + executableHaskellDepends = [ + aeson base dependent-sum markdown-unlit + ]; + description = "Derivation of Aeson instances for GADTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-generic-compat" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -22437,18 +22499,16 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, base-prelude, bytestring, foldl - , json-pointer, json-pointer-aeson, mtl-prelude, scientific, text + ({ mkDerivation, aeson, base, bytestring, mtl, scientific, text , transformers, unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.12.4"; - sha256 = "0ya2gbyf2gg1psbmm1cz7qbv9m9kp3lls9rzzkmadhxnqr1wfn2f"; + version = "0.14.3"; + sha256 = "1ikj4kdd9qs50a5zqfhmw0f6k6b8pi9w78nk6r1vpm352xs3vsi1"; libraryHaskellDepends = [ - aeson base-prelude bytestring foldl json-pointer json-pointer-aeson - mtl-prelude scientific text transformers unordered-containers - vector + aeson base bytestring mtl scientific text transformers + unordered-containers vector ]; description = "An API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; @@ -27010,6 +27070,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-terminal_0_9" = callPackage + ({ mkDerivation, base, colour }: + mkDerivation { + pname = "ansi-terminal"; + version = "0.9"; + sha256 = "00xcq21rp0y8248pwik9rlrfb2m8c27aasla37zdg741yb0c4mfp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base colour ]; + description = "Simple ANSI terminal support, with Windows compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, hspec, linebreak, split, terminal-size, timers-tick @@ -27036,6 +27110,8 @@ self: { pname = "ansi-wl-pprint"; version = "0.6.8.2"; sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56"; + revision = "1"; + editedCabalFile = "00b704rygy4ap540jj3ry7cgiqwwi5zx9nhj7c3905m6n6v3in88"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base ]; @@ -29019,15 +29095,15 @@ self: { pname = "armor"; version = "0.1"; sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71"; - revision = "1"; - editedCabalFile = "075nxkch0azmf4fkrnckwsr9s7bmxpm38xbwkj9kak3lsfaml4sk"; + revision = "3"; + editedCabalFile = "1aksr6s5hcvxjjxd95z4n0xadhdpvz8l75906v5f18p7gkk6sjm7"; libraryHaskellDepends = [ base bytestring containers directory filepath HUnit lens ]; testHaskellDepends = [ aeson base bytestring containers directory hspec HUnit lens text ]; - description = "Armor data structures against serialization backwards compatibility problems"; + description = "Prevent serialization backwards compatibility problems using golden tests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -31357,6 +31433,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "automata" = callPackage + ({ mkDerivation, base, bytestring, containers, contiguous + , enum-types, HUnit, leancheck, leancheck-enum-instances, primitive + , primitive-containers, QuickCheck, quickcheck-classes + , quickcheck-enum-instances, semirings, tasty, tasty-hunit + , tasty-leancheck, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "automata"; + version = "0.1.0.0"; + sha256 = "1xb0rqnkykazg7m50dsxa5pxfd2096wmqbwli01j7wxw8lrqcy9i"; + libraryHaskellDepends = [ + base bytestring containers contiguous primitive + primitive-containers semirings transformers + ]; + testHaskellDepends = [ + base containers enum-types HUnit leancheck leancheck-enum-instances + primitive QuickCheck quickcheck-classes quickcheck-enum-instances + tasty tasty-hunit tasty-leancheck tasty-quickcheck + ]; + description = "automata"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "automitive-cse" = callPackage ({ mkDerivation, base, bytestring, cereal, cryptonite, memory , quickcheck-simple @@ -31506,8 +31607,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "28"; - editedCabalFile = "1x653r0x4frpp78jncvr91kc7g41i9c3s561cizyh518318lvsnr"; + revision = "29"; + editedCabalFile = "07vc32yn5d954higzxg3c94l3wzgc38b7y2xq8c5rkxwqz8xf97s"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -32646,8 +32747,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.51"; - sha256 = "1mjylfxw7ivmxma7kskjs7plcd9wxknfd9slxb7zjgawzksdv3bq"; + version = "0.5.61"; + sha256 = "0yr29ynxiwc2qr000c5h1w3k373qvbr5p8z451r3q24i4c6rcrid"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36696,8 +36797,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.0.0"; - sha256 = "11f1lf19a78795id30hdxa6h52jwcmjq4jbmm1qaw6lgjfkzfg6a"; + version = "0.1.0.1"; + sha256 = "1xnv6zg9rc8klsjvaqf524pvplhizydjdrfybxnfjsi4d3kp612g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36716,6 +36817,7 @@ self: { ]; description = "Plot a colorful tree"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bird" = callPackage @@ -36739,6 +36841,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bisc" = callPackage + ({ mkDerivation, base, directory, filepath, selda, selda-sqlite + , text, xdg-basedir + }: + mkDerivation { + pname = "bisc"; + version = "0.1.0.0"; + sha256 = "16gjnqjp1rhsi59nxhx24zxwabzk75wiz97163pd657j02a5mwl0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath selda selda-sqlite text xdg-basedir + ]; + description = "A small tool that clears qutebrowser cookies"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "bisect-binary" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hashable , haskeline, integer-logarithms, optparse-applicative, process @@ -37726,8 +37845,8 @@ self: { }: mkDerivation { pname = "blas-carray"; - version = "0.0.1.1"; - sha256 = "0ijzcdrbfb9w3vs4g96p30h7ilh9s05ij8n0prinmr1ngmvipbdx"; + version = "0.1.0.1"; + sha256 = "1aqphwgzcryzfzjzsv6ph4kcmswqd7mgs65dj8lsjzkhfc6izggl"; libraryHaskellDepends = [ base blas-ffi carray netlib-carray netlib-ffi storable-complex transformers @@ -37737,6 +37856,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blas-comfort-array" = callPackage + ({ mkDerivation, base, blas-ffi, comfort-array + , netlib-comfort-array, netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "blas-comfort-array"; + version = "0.0.0.1"; + sha256 = "1m6kq46sz4chjfc5kh1vqvdfzvn0c46iq93hv9d5rrc9adhma7gb"; + libraryHaskellDepends = [ + base blas-ffi comfort-array netlib-comfort-array netlib-ffi + storable-complex transformers + ]; + description = "Auto-generated interface to Fortran BLAS via comfort-array"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blas-ffi" = callPackage ({ mkDerivation, base, blas, netlib-ffi }: mkDerivation { @@ -39389,8 +39525,8 @@ self: { ({ mkDerivation, base, directory, process }: mkDerivation { pname = "brainfuck-monad"; - version = "0.5.0"; - sha256 = "0dr371scgb6hc43vdj2fbic9z1aw4bfhnc910y22a9y26kcldp2g"; + version = "0.5.1"; + sha256 = "1y0dz80q2rniz23b0m2dircyl244id9888pblaqj8d4zcapsnsww"; libraryHaskellDepends = [ base directory process ]; description = "BrainFuck monad"; license = stdenv.lib.licenses.bsd3; @@ -39536,6 +39672,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "brick-filetree" = callPackage + ({ mkDerivation, base, brick, comonad, containers, directory + , directory-tree, filepath, free, vector, vty + }: + mkDerivation { + pname = "brick-filetree"; + version = "0.1.0.2"; + sha256 = "0ppc2y407db7kx8hzrjbx3qhd4w39d5p4zra3bxsc99ny9aqbrmk"; + libraryHaskellDepends = [ + base brick comonad containers directory directory-tree filepath + free vector vty + ]; + testHaskellDepends = [ + base brick comonad containers directory directory-tree filepath + free vector vty + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "brick-skylighting" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty @@ -40223,6 +40378,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "buffon-machines" = callPackage + ({ mkDerivation, base, multiset, random, template-haskell }: + mkDerivation { + pname = "buffon-machines"; + version = "1.0.0.0"; + sha256 = "0s8gfbfilvnhkyjs94fb7s0amcar3nvhjb5lx1gzqgbxdgs1grdy"; + libraryHaskellDepends = [ base multiset random template-haskell ]; + description = "Perfect simulation of discrete random variables"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bug" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -40663,6 +40829,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bv-embed" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "bv-embed"; + version = "0.1.0"; + sha256 = "0afywcb7n2h2vycxg47myaqz49xrlnjpyq753smildjlkl79jx79"; + libraryHaskellDepends = [ base ]; + description = "Define embeddings of small bit vectors into larger ones"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bv-little" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit @@ -41529,6 +41706,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ca-province-codes" = callPackage + ({ mkDerivation, aeson, base, hspec, QuickCheck, text }: + mkDerivation { + pname = "ca-province-codes"; + version = "1.0.0.0"; + sha256 = "1lhmmqn83v9bflm4x2nqbxx6pjh393id29syglinaqal4dvl5qq3"; + libraryHaskellDepends = [ aeson base text ]; + testHaskellDepends = [ aeson base hspec QuickCheck text ]; + description = "ISO 3166-2:CA Province Codes and Names"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cab" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, conduit , conduit-extra, containers, directory, filepath, process @@ -42087,6 +42276,8 @@ self: { pname = "cabal-plan"; version = "0.5.0.0"; sha256 = "1vfa4lwfjhv4nyl1rwm7i99zdkwriighlhfcz0rgjwzgg56wrihq"; + revision = "1"; + editedCabalFile = "0nnh6qq36cpfwzqrv1i1cn93n6n32nbl6ddp0y22jmmxnx9xsrvp"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -42099,7 +42290,7 @@ self: { optparse-applicative parsec text vector ]; doHaddock = false; - description = "Library and utiltity for processing cabal's plan.json file"; + description = "Library and utility for processing cabal's plan.json file"; license = "GPL-2.0-or-later AND BSD-3-Clause"; }) {}; @@ -42450,8 +42641,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.2.2"; - sha256 = "1rb7z4lslqsf8ipsyy7nc3mz4ixz5f5cv5jn5nidj0pc5rl16sxw"; + version = "2.2.2.1"; + sha256 = "0jv335b6vz1y6jp381hhrb2miniyqzkn18ansc67as04yf3ngmay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -43350,17 +43541,20 @@ self: { "cantor-pairing" = callPackage ({ mkDerivation, arithmoi, base, containers, hspec, hspec-discover - , integer-gmp + , integer-gmp, integer-logarithms, mtl }: mkDerivation { pname = "cantor-pairing"; - version = "0.1.0.0"; - sha256 = "110iq8fldw4rk46lxq1b78mfpbp5dxcjc2vg89996j95xd88xkjp"; - libraryHaskellDepends = [ arithmoi base containers integer-gmp ]; - testHaskellDepends = [ base hspec ]; + version = "0.1.1.0"; + sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw"; + libraryHaskellDepends = [ + arithmoi base containers integer-gmp integer-logarithms + ]; + testHaskellDepends = [ base containers hspec mtl ]; testToolDepends = [ hspec-discover ]; description = "Convert data to and from a natural number representation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cao" = callPackage @@ -43447,38 +43641,38 @@ self: { }) {}; "capnp" = callPackage - ({ mkDerivation, array, base, binary, bytes, bytestring, cereal - , containers, cpu, data-default, data-default-instances-vector - , deepseq, directory, dlist, exceptions, filepath, heredoc, HUnit - , mtl, pretty-show, primitive, process, process-extras, QuickCheck - , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, transformers, utf8-string, vector, wl-pprint-text + ({ mkDerivation, async, base, bytes, bytestring, containers, cpu + , data-default, data-default-instances-vector, deepseq, directory + , exceptions, filepath, focus, hashable, heredoc, hspec, list-t + , mtl, network, network-simple, pretty-show, primitive, process + , process-extras, QuickCheck, quickcheck-instances, quickcheck-io + , reinterpret-cast, resourcet, safe-exceptions, stm, stm-containers + , supervisors, text, transformers, vector, wl-pprint-text }: mkDerivation { pname = "capnp"; - version = "0.3.0.0"; - sha256 = "17i7m168bqp57m5lb04sbfh2amc1sicv2jajkl61jb1gsidwdkrz"; - revision = "1"; - editedCabalFile = "0faisbw98h1zjsqja57c0xac6hhnhb4sghzh9a3225pp8wxnbjr7"; + version = "0.4.0.0"; + sha256 = "1dzabszp3nn13rmvqmdl2gimwmkdpjzd303chbi0jw8248s14bfx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytes bytestring cpu data-default - data-default-instances-vector exceptions mtl primitive - reinterpret-cast text transformers vector + async base bytes bytestring containers cpu data-default + data-default-instances-vector exceptions focus hashable list-t mtl + network network-simple pretty-show primitive reinterpret-cast + safe-exceptions stm stm-containers supervisors text transformers + vector ]; executableHaskellDepends = [ - array base binary bytes bytestring cereal containers directory - dlist exceptions filepath mtl primitive reinterpret-cast text - transformers utf8-string vector wl-pprint-text + base bytes bytestring containers data-default directory exceptions + filepath mtl primitive reinterpret-cast safe-exceptions text + transformers vector wl-pprint-text ]; testHaskellDepends = [ - array base binary bytes bytestring data-default deepseq directory - exceptions heredoc HUnit mtl pretty-show primitive process - process-extras QuickCheck quickcheck-instances quickcheck-io - reinterpret-cast resourcet test-framework test-framework-hunit - test-framework-quickcheck2 text transformers vector + async base bytes bytestring containers data-default deepseq + directory exceptions heredoc hspec mtl network network-simple + pretty-show primitive process process-extras QuickCheck + quickcheck-instances quickcheck-io reinterpret-cast resourcet + safe-exceptions stm supervisors text transformers vector ]; description = "Cap'n Proto for Haskell"; license = stdenv.lib.licenses.mit; @@ -44915,25 +45109,6 @@ self: { }: mkDerivation { pname = "cereal"; - version = "0.5.7.0"; - sha256 = "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - description = "A binary serialization library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cereal_0_5_8_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; version = "0.5.8.0"; sha256 = "10j205g4w311ypk24ds2nmv1816s8645788s6a1vrfippa56dlrp"; libraryHaskellDepends = [ @@ -44945,7 +45120,6 @@ self: { ]; description = "A binary serialization library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-conduit" = callPackage @@ -45304,8 +45478,8 @@ self: { pname = "cgi"; version = "3001.3.0.3"; sha256 = "1rml686pvjhpd51vj6g79c6132m8kx6kxikk7g246imps3bl90gb"; - revision = "2"; - editedCabalFile = "082i8x8j8ry2nf7m99injh18sr9llbw66ck5ylqlyvh6bhwspa6b"; + revision = "3"; + editedCabalFile = "06gyp3mxx9jkkbz9sbn389wjsz33s231vk53pbsm37a1z9ply14a"; libraryHaskellDepends = [ base bytestring containers exceptions mtl multipart network network-uri parsec time xhtml @@ -45314,6 +45488,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cgi_3001_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, mtl + , multipart, network-uri, parsec, time, xhtml + }: + mkDerivation { + pname = "cgi"; + version = "3001.4.0.0"; + sha256 = "1d0nh5ymkqskkp4yn0gfz4mff8i0cxyw1wws8xxp6k1mg1ywa25k"; + revision = "1"; + editedCabalFile = "0q1s49hglw0zjcqsi7ba8nminywxgn6b83xds2lfp0r12q2h00xr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl multipart network-uri + parsec time xhtml + ]; + description = "A library for writing CGI programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cgi-undecidable" = callPackage ({ mkDerivation, base, cgi, mtl }: mkDerivation { @@ -46009,6 +46204,7 @@ self: { ]; description = "tmux api"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chimera" = callPackage @@ -48512,8 +48708,8 @@ self: { ({ mkDerivation, base, containers, tree-fun }: mkDerivation { pname = "clumpiness"; - version = "0.17.0.0"; - sha256 = "15f4js9rnn2rpkrvr9lphh624hkf4m15rdlvfwn29bvf40yk0jzx"; + version = "0.17.0.2"; + sha256 = "1h1n349sq2lpikpvzzarz74200b8k7dkdjpp4rpkx79xdlfc58pc"; libraryHaskellDepends = [ base containers tree-fun ]; description = "Calculate the clumpiness of leaf properties in a tree"; license = stdenv.lib.licenses.gpl3; @@ -49779,6 +49975,7 @@ self: { libraryHaskellDepends = [ accelerate base ]; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colour-space" = callPackage @@ -50078,8 +50275,8 @@ self: { }: mkDerivation { pname = "comfort-array"; - version = "0.2"; - sha256 = "0h8qn36ivxd2bc7cmqgyfa54jlwcfwr3rwpfp02p0yxqb4q03z45"; + version = "0.3"; + sha256 = "0vwp11vcw6h9shrafqgpiqbdm2ni9ad18z2r644hspxcrs24r4d6"; libraryHaskellDepends = [ base deepseq guarded-allocation non-empty primitive QuickCheck storable-record transformers utility-ht @@ -51761,41 +51958,6 @@ self: { "conduit-algorithms" = 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 - , streaming-commons, test-framework, test-framework-hunit - , test-framework-th, transformers, unliftio-core, vector - }: - mkDerivation { - pname = "conduit-algorithms"; - version = "0.0.8.2"; - sha256 = "1s423n2hybxdsady7spi4iy9s5lm07dsl0rjxn400y09faizm5x8"; - libraryHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq exceptions lzma-conduit - monad-control mtl pqueue 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 pqueue resourcet stm stm-conduit - streaming-commons test-framework test-framework-hunit - test-framework-th transformers unliftio-core vector - ]; - benchmarkHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers criterion deepseq exceptions lzma-conduit - monad-control mtl pqueue resourcet stm stm-conduit - streaming-commons transformers unliftio-core vector - ]; - description = "Conduit-based algorithms"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-algorithms_0_0_9_0" = callPackage - ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, conduit-zstd, containers , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit , monad-control, mtl, pqueue, resourcet, stm, stm-conduit @@ -52710,6 +52872,8 @@ self: { pname = "connection"; version = "0.2.8"; sha256 = "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh"; + revision = "1"; + editedCabalFile = "15qdwqqjv60w14m319a58yjmhzr39dydsnk6r26ydkwxwh23rk73"; libraryHaskellDepends = [ base byteable bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation @@ -52997,12 +53161,19 @@ self: { }) {}; "constraints-extras" = callPackage - ({ mkDerivation, base, constraints, template-haskell }: + ({ mkDerivation, aeson, base, constraints, markdown-unlit + , template-haskell + }: mkDerivation { pname = "constraints-extras"; - version = "0.2.1.0"; - sha256 = "17rz4j5xgh4qn8ngd4b2814zdp1c59mcksg9jxbln6nvzvw7q0ng"; + version = "0.2.3.1"; + sha256 = "1invhgwvhsab9jj776aaa180xsk1cbnwygxfappasbis42l26ab9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; + executableHaskellDepends = [ + aeson base constraints markdown-unlit + ]; description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -53350,12 +53521,18 @@ self: { }) {}; "continued-fractions" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, QuickCheck, test-framework + , test-framework-quickcheck2 + }: mkDerivation { pname = "continued-fractions"; - version = "0.9.1.1"; - sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh"; + version = "0.10.0.2"; + sha256 = "03s1vrsps2l114b3jg8nmglbv9bwsrjv79j06lyg9pxgvhk4lcpx"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers QuickCheck test-framework + test-framework-quickcheck2 + ]; description = "Continued fractions"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -55791,25 +55968,6 @@ self: { }: mkDerivation { pname = "crypto-enigma"; - version = "0.1.1.4"; - sha256 = "17bggc1wz1qp0midriwwackm86w148r6y8ph3x0nsxblqzw8021z"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers split text ]; - executableHaskellDepends = [ - ansi-terminal base containers optparse-applicative split text - ]; - testHaskellDepends = [ base HUnit QuickCheck ]; - description = "An Enigma machine simulator with display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "crypto-enigma_0_1_1_5" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, HUnit - , optparse-applicative, QuickCheck, split, text - }: - mkDerivation { - pname = "crypto-enigma"; version = "0.1.1.5"; sha256 = "001kl84ngfwr644v7dyk5shkqfw606bpza8b61bv4p4lqyfk96l2"; isLibrary = true; @@ -55821,7 +55979,6 @@ self: { testHaskellDepends = [ base HUnit QuickCheck ]; description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-multihash" = callPackage @@ -56272,6 +56429,8 @@ self: { pname = "cryptol"; version = "2.6.0"; sha256 = "0hlgff177s8lhv3s90cmqc3x2xr60g3vxvc7p1mhzb354zxbp2jz"; + revision = "1"; + editedCabalFile = "1smkc0gxbj1vl626iiy56aarx6rcnjzqprqzh443222samrrzr25"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -56448,8 +56607,8 @@ self: { }: mkDerivation { pname = "csg"; - version = "0.1.0.5"; - sha256 = "12zwf2xiqiq4snwqhwvk1k3fl1bzlfbcd2vc2hsnv6v61ci6shq9"; + version = "0.1.0.6"; + sha256 = "0i4sr9qf78fs841j8d9rkdd73dm9i34rj6sp0475r3pnj7czqcq6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57721,8 +57880,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.14.1"; - sha256 = "0dfd6bp2wy0aabxx7l93gi3dmq21j970cds424xdy1mgmjcvrpb1"; + version = "2.14.2"; + sha256 = "0zm2486gyhiga1amclbg92cd09bvki6vgh0ll75hv5kl72j61lb5"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -57749,7 +57908,6 @@ self: { ''; description = "a distributed, interactive, smart revision control system"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) curl;}; "darcs-benchmark" = callPackage @@ -59377,12 +59535,12 @@ self: { }) {}; "data-ref" = callPackage - ({ mkDerivation, base, stm, transformers }: + ({ mkDerivation, base, data-accessor, stm, transformers }: mkDerivation { pname = "data-ref"; - version = "0.0.1.2"; - sha256 = "0896wjkpk52cndlzkdr51s1rasi0n9b100058f1sb4qzl1dgcp30"; - libraryHaskellDepends = [ base stm transformers ]; + version = "0.0.2"; + sha256 = "0xqgzcpp9b0y2w5h1nln529dizdplhpfl41vxvbhxxcdkng3j53v"; + libraryHaskellDepends = [ base data-accessor stm transformers ]; description = "Unify STRef and IORef in plain Haskell 98"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -60266,8 +60424,8 @@ self: { pname = "dbus"; version = "0.10.15"; sha256 = "1a5sjavq8mfzz4zxpkd9b6jxsvy0kl1rjq2hhy40gcz2qjfnamb4"; - revision = "1"; - editedCabalFile = "04fy208xlvdyi2ms9c2l2xd7jwi6vd0wzpv2v2s0bc2icha79rih"; + revision = "2"; + editedCabalFile = "0v9k4yrpzpkk3k33gp3z8qmv0q6kf0d6xps3ar4d3xs9ybrwvg0c"; libraryHaskellDepends = [ base bytestring cereal containers deepseq libxml-sax network parsec random text transformers unix vector xml-types @@ -60294,8 +60452,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.1"; - sha256 = "1mxijj32lvl6dxkpz95mxywq2hrj7krc9r8q41zbyqqx0hvc3n4r"; + version = "1.2.3"; + sha256 = "04x0scjl9kyhh2wl02slfa7ykd2lmxbx6x7bp7wv8x4pwgd849zc"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -60848,8 +61006,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.93.3"; - sha256 = "0wjkk6dnps837pnsh75cf1093587r6yxg8fhjz8jrw06y2g85fzn"; + version = "3.93.5"; + sha256 = "0nncxa65lhdvypnx1j7v179v4pk2jfglxzs88p9cka2nr095hs55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60926,6 +61084,7 @@ self: { ]; description = "Simple trace-based debugger"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debug-diff" = callPackage @@ -61487,14 +61646,31 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "1.11.0.4"; - sha256 = "0zks4mqdndlyg8mqa1gshwahcqn45zawksgp738crls3yafgh9dg"; + version = "1.11.0.5"; + sha256 = "18pcjk60r1q798qba285g20fh8v5q2qphgpx3r0a0yy7p1qnjwv2"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; + }) {}; + + "dejafu_1_12_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "1.12.0.0"; + sha256 = "1nkpqd7alnw383lkhbfqxfj2apks2gw84bk59f2agmiry5pbcs3p"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -62008,8 +62184,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.6.4"; - sha256 = "08vhs17h6lzgdr2b0iyl8scilfivvir5fav1qxxpqmdm7f8f8dis"; + version = "2.6.5"; + sha256 = "1rfh7pahrksjzypdkrs8wcijybdwnv2wlkiqax7svn11wgnym3c1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62174,10 +62350,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.5.2"; - sha256 = "0h5jfpwawp7xn9vi82zqskaypa3vypm97lz2farmmfqvnkw60mj9"; - revision = "1"; - editedCabalFile = "1s672vc7w96fmvr1p3fkqi9q80sn860j14545sskpxb8iz9f7sxg"; + version = "0.5.4"; + sha256 = "0kd76zvaj84391k9847q3zdvw5hlkdw3qwncysfbsvsh4g9glqwr"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -63072,8 +63246,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.3"; sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5"; - revision = "1"; - editedCabalFile = "16ici9kx7cnva1ihhin5nyc1icif17yks3nwcxxzqxjjw556vpig"; + revision = "2"; + editedCabalFile = "0xpw4myq4n6k5lxdll1wg76m3gfymwb746x6qd48qfy3z22nrymw"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -63634,6 +63808,7 @@ self: { ]; description = "Discrete Interval Encoding Trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diff" = callPackage @@ -63782,6 +63957,7 @@ self: { ]; description = "Finds out whether an entity comes from different distributions (statuses)"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diffmap" = callPackage @@ -64576,8 +64752,10 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "0.7.0"; - sha256 = "0zq9aaarh34c24ih49ap5bblswpzc1nwcp8rw8bw1j4agp2ndpy0"; + version = "0.7.1"; + sha256 = "0cl40ph5qwpxa05q7jr67syq9dijxyzvmqzgw53wfri4800qxphn"; + revision = "1"; + editedCabalFile = "022rnkpy9frsn81d2m9n8r5crsjzjk679mfja5d65s5bzzg3plyj"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default http-client iso8601-time JuicyPixels MonadRandom req @@ -65885,6 +66063,8 @@ self: { pname = "dns"; version = "3.0.4"; sha256 = "1aa4zb9zkk244rndimrq8maxj9qrmz3rb13v9n8jblmp6ssk6d3v"; + revision = "1"; + editedCabalFile = "15jafrm919w4p23m7kpmyc1yvzpy88jcccycc00dza69d119zjdr"; libraryHaskellDepends = [ async attoparsec auto-update base base64-bytestring binary bytestring containers cryptonite iproute mtl network psqueues safe @@ -68028,8 +68208,8 @@ self: { }: mkDerivation { pname = "dynamic-graphs"; - version = "0.1.0.2"; - sha256 = "0fy64gfkg6vhhyzay0wh2dis423j8xbcdjzfl06h8hbrb0gb8p7r"; + version = "0.1.0.3"; + sha256 = "1zwrvpg8nxc4lx3mc5jaj1fcbg1hhk4b52ng4qh5r57xkhqj6xg5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68038,8 +68218,9 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers deepseq hashable mwc-random - primitive QuickCheck test-framework test-framework-quickcheck2 - test-framework-th text unordered-containers + primitive QuickCheck semigroups test-framework + test-framework-quickcheck2 test-framework-th text + unordered-containers ]; benchmarkHaskellDepends = [ base criterion primitive ]; description = "Dynamic graph algorithms"; @@ -70228,8 +70409,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.9"; - sha256 = "12sf380s0f78npga3x1bz9wkz82h477vvf3bvsxq69hrc7m6xb5f"; + version = "2.3.2.10"; + sha256 = "0wfk5dkpaw0gk4p0vwdpb24c6kz4gjx0z4am79v5c3k38gmb3rak"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -72239,6 +72420,8 @@ self: { pname = "euler-tour-tree"; version = "0.1.1.0"; sha256 = "166gbinlf0ay8y2clzjzf5b2x489hcr1gzj8w5qk341z01f8pckh"; + revision = "1"; + editedCabalFile = "0rix7nslzfdds5hz2hvam8dydndhv04xg10wazf7l37q88gk880w"; libraryHaskellDepends = [ base containers fingertree mtl parser-combinators transformers Unique @@ -72691,42 +72874,6 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.2.0"; - sha256 = "03ckizx7phz6jykj10s1vj7wfc454qzjq04jrmqhxsbrrqilhyk3"; - 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 safe-exceptions semigroups stm stm-chans streaming 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 - safe-exceptions semigroups stm stm-chans streaming 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_2_1" = 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 - , safe-exceptions, semigroups, stm, stm-chans, streaming, tasty - , tasty-hspec, tasty-hunit, text, time, transformers-base - , unordered-containers, uuid - }: - mkDerivation { - pname = "eventstore"; version = "1.2.1"; sha256 = "1yya52bk3sgfgrarf88a3n7i0jdwr1hd615a17ixxbb1vc9v44y8"; libraryHaskellDepends = [ @@ -73728,25 +73875,26 @@ self: { "expresso" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable , haskeline, mtl, parsec, tasty, tasty-hunit, template-haskell - , terminfo, text, unordered-containers, wl-pprint + , text, unordered-containers, wl-pprint }: mkDerivation { pname = "expresso"; - version = "0.1.1.0"; - sha256 = "1c0mibbgwdxz36qr02nc31mpg6d3l9mgjfqwy174ib2kv3wndivh"; + version = "0.1.2.0"; + sha256 = "15s4gpf7pv6wv13q5i1cff7s93nx5vb8gyjfm4ifz76ki3xafgcn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath hashable haskeline mtl parsec - template-haskell terminfo text unordered-containers wl-pprint + template-haskell text unordered-containers wl-pprint ]; executableHaskellDepends = [ base containers directory filepath hashable haskeline mtl parsec - terminfo text unordered-containers wl-pprint + text unordered-containers wl-pprint ]; testHaskellDepends = [ base containers directory filepath hashable haskeline mtl parsec - tasty tasty-hunit terminfo text unordered-containers wl-pprint + tasty tasty-hunit text unordered-containers wl-pprint ]; description = "A simple expressions language based on row types"; license = stdenv.lib.licenses.bsd3; @@ -74253,8 +74401,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "failable"; - version = "0.1.0.3"; - sha256 = "1kmp5xgsj5yv4h9q3h1r73z6pb9cj6kb4i458rb322l6w88ci0rf"; + version = "0.1.1.0"; + sha256 = "0wg4jhilnyqxs6kqikbli1ia6xl4hi4hipdc1pp1f2d2gxgg0afb"; libraryHaskellDepends = [ base mtl transformers ]; description = "A 'Failable' error monad class to unify failure across monads that can fail"; license = stdenv.lib.licenses.bsd3; @@ -74847,8 +74995,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.24.0.1"; - sha256 = "05z8dyw1yf2bh42mrrk1d9rxqdz1p6gn8sjnpk66s2k76xrg4vm2"; + version = "0.24.0.2"; + sha256 = "00qm6n8ali6inqmm64mrcz414iwiin8zwpavq5w1hnrmvzlbazg5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -75403,6 +75551,8 @@ self: { pname = "feed"; version = "1.0.1.0"; sha256 = "076krkyvbh24s50chdw3nz6w2svwchys65ppjzlm8gy42ddhbgc7"; + revision = "1"; + editedCabalFile = "10xjd3syr70g3blnjy7xvd6s21y68vxsi69f6bmizpsylbfb0245"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -76532,8 +76682,8 @@ self: { }: mkDerivation { pname = "find-clumpiness"; - version = "0.2.3.1"; - sha256 = "0aicxjh58cz25kxigz013j07a0vc5jyirs75daqjmlgd3rj5b7h8"; + version = "0.2.3.2"; + sha256 = "1qid4dinkydpikw1a7q4zj3cx3bh7mzz7bfd8l1mz7fykdi8lwac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76759,14 +76909,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "first-class-families_0_4_0_0" = callPackage + "first-class-families_0_5_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "first-class-families"; - version = "0.4.0.0"; - sha256 = "1hkvk4vhx8zanx7sc8a7nsz4h38nsfhr1rdn1ky1fim328fi4gx6"; - revision = "1"; - editedCabalFile = "1nrcbznpzbfxlk29f8q2zsn11h5zf67w84np25z9bc907d0xljiw"; + version = "0.5.0.0"; + sha256 = "03skw4axj6zk593zi8fwynzjyiq6s7apjqmjqv6rxpxhj17vqwpj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "First class type families"; @@ -77340,6 +77488,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {FLAC = null;}; + "flac_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , exceptions, filepath, FLAC, hspec, hspec-discover, mtl, temporary + , text, transformers, vector, wave + }: + mkDerivation { + pname = "flac"; + version = "0.2.0"; + sha256 = "03zmsnnpkk26ss8ka2l7x9gsfcmiqfyc73v7fna6sk5cwzxsb33c"; + revision = "1"; + editedCabalFile = "1phwdnya8bgw24a80vbw0m4pm7r67grnc6si8683jz620snnsm48"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers directory exceptions filepath mtl text + transformers vector wave + ]; + librarySystemDepends = [ FLAC ]; + testHaskellDepends = [ + base bytestring directory filepath hspec temporary transformers + vector wave + ]; + testToolDepends = [ hspec-discover ]; + description = "Complete high-level binding to libFLAC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {FLAC = null;}; + "flac-picture" = callPackage ({ mkDerivation, base, bytestring, data-default-class, directory , flac, hspec, JuicyPixels, temporary @@ -78216,8 +78391,8 @@ self: { pname = "fmt"; version = "0.6.1.1"; sha256 = "1bfj94ahc06xj6x5v5gmjzgw30cgxsc1vjygajqiqnanimbhn8i6"; - revision = "1"; - editedCabalFile = "13ypmyg0axadzhycfl0g1s73bk9a2myshf38y8dslf3hlg76wbmv"; + revision = "2"; + editedCabalFile = "1prdnb8a8n338clkvjx0c8hmbkiy8x2c9j87b94302bq6x7rmf9d"; libraryHaskellDepends = [ base base64-bytestring bytestring call-stack containers formatting microlens text time time-locale-compat @@ -78870,10 +79045,8 @@ self: { }: mkDerivation { pname = "forma"; - version = "1.1.0"; - sha256 = "09f377ak1208lr8sskdga3nq47a151whd7z982pwv552w1q75p5p"; - revision = "2"; - editedCabalFile = "1yc9gv1rjbl4lsxscp5idfpn7jp27c38j6gm9v7isxgyaih0j4v4"; + version = "1.1.1"; + sha256 = "10q06yjz66h92qm0569l172v0c6mp9m3jfyakyva5v7xdqr8rvxb"; libraryHaskellDepends = [ aeson base containers mtl text unordered-containers ]; @@ -79097,14 +79270,17 @@ self: { }) {}; "forsyde-shallow" = callPackage - ({ mkDerivation, base, directory, hspec, old-time, process, random + ({ mkDerivation, base, directory, doctest, hspec, old-time, process + , QuickCheck, random }: mkDerivation { pname = "forsyde-shallow"; - version = "3.3.3.0"; - sha256 = "0avpy9h0x30c6zbzfrf248k2il4w0hk5rnkcqaday7rgsf70cfc0"; + version = "3.4.0.0"; + sha256 = "0czrgfx22j94xp56mf4cwrz2rdw2id77va89xpjxxrhdzwzfsvcn"; libraryHaskellDepends = [ base directory old-time process random ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ + base directory doctest hspec old-time process QuickCheck random + ]; description = "ForSyDe's Haskell-embedded Domain Specific Language"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79151,17 +79327,15 @@ self: { }) {}; "fortytwo" = callPackage - ({ mkDerivation, ansi-terminal, async, base, doctest, hspec - , process, text - }: + ({ mkDerivation, ansi-terminal, base, doctest, hspec, text }: mkDerivation { pname = "fortytwo"; - version = "1.0.4"; - sha256 = "0gbvhlsyhfslxrwkdldn15adj8f371rhx5qxfapcpqfa6pwbjsfd"; + version = "1.0.5"; + sha256 = "1jmvj3h70h31a906b8wvycqwl1spfqgdmwhzf5x84aykih5xlcfs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base text ]; - testHaskellDepends = [ async base doctest hspec process ]; + testHaskellDepends = [ base doctest hspec ]; description = "Interactive terminal prompt"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -79592,8 +79766,8 @@ self: { ({ mkDerivation, base, free-algebras }: mkDerivation { pname = "free-category"; - version = "0.0.1.0"; - sha256 = "0cpcn10kbsx1xvvxvvcx5hpa0p9vhkrjf7cmzva2zpmhdj4jp5rg"; + version = "0.0.2.0"; + sha256 = "16gs7n3gl5whda376j87qm9jfdx6zhmnyp43fjfaj6s5y2s0z53z"; libraryHaskellDepends = [ base free-algebras ]; description = "Free category"; license = stdenv.lib.licenses.mpl20; @@ -81015,6 +81189,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "function-builder" = callPackage + ({ mkDerivation, base, tagged }: + mkDerivation { + pname = "function-builder"; + version = "0.1.0.4"; + sha256 = "1iiz1fx8m152wg55k6vgv8sf3zf9wvc9zmx2wca8yc38bki43h61"; + libraryHaskellDepends = [ base tagged ]; + description = "Create poly variadic functions for monoidal results"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "function-combine" = callPackage ({ mkDerivation, base, data-type }: mkDerivation { @@ -83247,27 +83432,6 @@ self: { }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.2.1"; - sha256 = "100mjmbjfzy431a52yqkq2rja0mb5zw8dbkpfbfy17rdkwwx2yn1"; - libraryHaskellDepends = [ - base genvalidity genvalidity-property hspec hspec-core QuickCheck - transformers validity - ]; - testHaskellDepends = [ - base doctest genvalidity genvalidity-property hspec hspec-core - QuickCheck validity - ]; - description = "Standard spec's for GenValidity instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "genvalidity-hspec_0_6_2_2" = callPackage - ({ mkDerivation, base, doctest, genvalidity, genvalidity-property - , hspec, hspec-core, QuickCheck, transformers, validity - }: - mkDerivation { - pname = "genvalidity-hspec"; version = "0.6.2.2"; sha256 = "1npy88slf7immafk1vgl6w9gp526xdlvhr96qnrc8phf7b7bfkrf"; libraryHaskellDepends = [ @@ -84707,7 +84871,7 @@ self: { libraryHaskellDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-syb" = callPackage @@ -86384,20 +86548,20 @@ self: { }) {}; "git" = callPackage - ({ mkDerivation, base, basement, byteable, bytedump, bytestring - , containers, cryptonite, hourglass, memory, patience, random - , system-fileio, system-filepath, tasty, tasty-quickcheck - , unix-compat, utf8-string, vector, zlib, zlib-bindings + ({ mkDerivation, base, basement, bytedump, bytestring, containers + , cryptonite, hourglass, memory, random, system-fileio + , system-filepath, tasty, tasty-quickcheck, unix-compat + , utf8-string, vector, zlib, zlib-bindings }: mkDerivation { pname = "git"; - version = "0.2.2"; - sha256 = "18sn3rvmrqw8xy7xaqpv82inqj981z79sm6h1aw4jvvzsf6llzwa"; + version = "0.3.0"; + sha256 = "0kd35qnxv2vnfaaq13dbf734jq11p05v6sdbxf91pag49817b6bz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base basement byteable bytestring containers cryptonite hourglass - memory patience random system-fileio system-filepath unix-compat - utf8-string vector zlib zlib-bindings + base basement bytestring containers cryptonite hourglass memory + random system-fileio system-filepath unix-compat utf8-string vector + zlib zlib-bindings ]; testHaskellDepends = [ base bytedump bytestring hourglass tasty tasty-quickcheck @@ -86448,8 +86612,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20181211"; - sha256 = "05zvi2z4fs2sprzgm31m6y1rhvwkhmjilvmgvyajzs12vzsaik6x"; + version = "7.20190122"; + sha256 = "0z5a5sskmjmayh1w9m48v7b81s1ybcglglry2jy1awdbn2l4mxk5"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp" @@ -86852,25 +87016,6 @@ self: { }: mkDerivation { pname = "githash"; - version = "0.1.3.0"; - sha256 = "0rnp5ljrb05kd127fy2s5jlxjvjfs50dar92pahb36w2qw2clnp7"; - libraryHaskellDepends = [ - base bytestring directory filepath process template-haskell - ]; - testHaskellDepends = [ - base bytestring directory filepath hspec process template-haskell - temporary unliftio - ]; - description = "Compile git revision info into Haskell projects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "githash_0_1_3_1" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec - , process, template-haskell, temporary, unliftio - }: - mkDerivation { - pname = "githash"; version = "0.1.3.1"; sha256 = "0vpwzbhnr0xwc7vkg3l5qy4awgsr1fkxj58lz6m56jayaad6hn7a"; libraryHaskellDepends = [ @@ -86882,7 +87027,6 @@ self: { ]; description = "Compile git revision info into Haskell projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github" = callPackage @@ -86991,8 +87135,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.2.3"; - sha256 = "14jb82gybm2zwri05bqxsibwr29lhghcaj3n0171nbndqs0dyl0y"; + version = "1.2.4"; + sha256 = "1s4vmqrzq7w35kfij9pyxm9b672khhx03whi4adz6l51xij6a3yb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87525,8 +87669,8 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "1.0.0"; - sha256 = "00q07675lrsniwrzb85bz2b5n8llbhyp0zxkscm9yr8mlirasr3k"; + version = "1.0.1"; + sha256 = "11s7fhlv3aq80h20jf2l447bmxy95dy7dqvzqfp0myy4hgsasks3"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -87833,8 +87977,8 @@ self: { pname = "glirc"; version = "2.29"; sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx"; - revision = "1"; - editedCabalFile = "0kjari98vcx5d1nfvxk8f6nx557hpy6njw7fj5p1lfdals81qifz"; + revision = "2"; + editedCabalFile = "0s37m39c3vnwskvbsiziysm9ck7l30bfkp2jg0l49dhi8v01q6cs"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -88234,13 +88378,14 @@ self: { "glue-common" = callPackage ({ mkDerivation, async, base, ekg-core, hashable, hspec - , lifted-base, monad-control, QuickCheck, quickcheck-instances - , text, time, transformers, transformers-base, unordered-containers + , hspec-discover, lifted-base, monad-control, QuickCheck + , quickcheck-instances, text, time, transformers, transformers-base + , unordered-containers }: mkDerivation { pname = "glue-common"; - version = "0.5"; - sha256 = "0wza8cmschfh6kk21wm2bz12ly3in7kf0cv6jma0a78fiphdwg2q"; + version = "0.6.1"; + sha256 = "1s4fm4cf88n4fw7alqb4jigw1pjh242jr7a8d9p52qcgkqn9qnwy"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -88250,6 +88395,7 @@ self: { QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88257,14 +88403,14 @@ self: { "glue-core" = callPackage ({ mkDerivation, async, base, ekg-core, glue-common, hashable - , hspec, lifted-base, monad-control, QuickCheck + , hspec, hspec-discover, lifted-base, monad-control, QuickCheck , quickcheck-instances, text, time, transformers, transformers-base , unordered-containers }: mkDerivation { pname = "glue-core"; - version = "0.5"; - sha256 = "0x89h04j8z58nd1cx6rxn0hgjgb24kdzgl21m2xrlj7h1fp9fwfi"; + version = "0.6.1"; + sha256 = "0fmqir0wcyhgl154rzg93qxdmxzfpi05mckzg7mihkh57fsy4pk0"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -88274,6 +88420,7 @@ self: { monad-control QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88281,14 +88428,14 @@ self: { "glue-ekg" = callPackage ({ mkDerivation, async, base, ekg-core, glue-common, hashable - , hspec, lifted-base, monad-control, QuickCheck + , hspec, hspec-discover, lifted-base, monad-control, QuickCheck , quickcheck-instances, text, time, transformers, transformers-base , unordered-containers }: mkDerivation { pname = "glue-ekg"; - version = "0.5"; - sha256 = "0ckbmjizfclpdyzrc85l9hh79yl82rmbkim5gq543qnppi1pn4h6"; + version = "0.6.1"; + sha256 = "1pigh4s546mv4l2bnwrr6y8473bss0s8ydymr929bz2svrfyhlmz"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -88298,6 +88445,7 @@ self: { monad-control QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88310,8 +88458,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.5"; - sha256 = "10nw8bzxbcghyy9xyb69ka3a3w66fysczhhgrshy462ihpw8p8bw"; + version = "0.6.1"; + sha256 = "1na0rnl0ac666man17xi4f5rg0zrw7f7ky44nfn2cag6398b109i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91263,8 +91411,8 @@ self: { }: mkDerivation { pname = "graph-wrapper"; - version = "0.2.5.2"; - sha256 = "1kcdfr1bz2ks71gapz6wrzv7sj6qbmj1zadj1cmh39g9xvqjx94q"; + version = "0.2.6.0"; + sha256 = "19jvr7d1kkyh4qdscljbgqnlpv6rr7fsn3h9dm3bji3dgbsdd7mq"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ array base containers deepseq hspec QuickCheck @@ -91935,17 +92083,26 @@ self: { }) {}; "grids" = callPackage - ({ mkDerivation, adjunctions, base, distributive, finite-typelits - , lens, vector + ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive + , gauge, hspec, singletons, vector }: mkDerivation { pname = "grids"; - version = "0.1.1.0"; - sha256 = "048k7r9x7d6vfyhsspqawzjrabk30igf3049hjnji27xhpghr90k"; + version = "0.3.0.0"; + sha256 = "01i6izwlgkv4pc6sfywn8fg2s01x15q0lwxag3kzzhb63nm20kli"; libraryHaskellDepends = [ - adjunctions base distributive finite-typelits lens vector + adjunctions base comonad deepseq distributive singletons vector + ]; + testHaskellDepends = [ + adjunctions base comonad deepseq distributive hspec singletons + vector + ]; + benchmarkHaskellDepends = [ + adjunctions base comonad deepseq distributive gauge singletons + vector ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grm" = callPackage @@ -92651,7 +92808,7 @@ self: { description = "Bindings for the Gtk/OS X integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk-mac-integration-gtk2 = null;}; + }) {inherit (pkgs) gtk-mac-integration-gtk2;}; "gtk-serialized-event" = callPackage ({ mkDerivation, array, base, containers, glib, gtk, gtk2 @@ -93059,8 +93216,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "guarded-allocation"; - version = "0.0"; - sha256 = "1fj8zf9drvkd8bydiy7g0z9dqqjn7d8mf1jdhwcyx6c013ixnmsj"; + version = "0.0.1"; + sha256 = "15a6g0bkjf9r0zl7x61ip05kb7k4rf7yxr7z8jybs5q8g78i1b0c"; libraryHaskellDepends = [ base ]; description = "Memory allocation with added stress tests and integrity checks"; license = stdenv.lib.licenses.bsd3; @@ -95629,20 +95786,23 @@ self: { }) {}; "hakyll-images" = callPackage - ({ mkDerivation, base, bytestring, hakyll, HUnit-approx - , JuicyPixels, JuicyPixels-extra, tasty, tasty-hunit + ({ mkDerivation, base, binary, bytestring, directory, filepath + , hakyll, HUnit-approx, JuicyPixels, JuicyPixels-extra, tasty + , tasty-hunit }: mkDerivation { pname = "hakyll-images"; - version = "0.1.0"; - sha256 = "1l135gmlm2ydqj3d27gfarykcg6k1g204cysm3bk163f499b8w50"; + version = "0.4.2"; + sha256 = "0la1c25jlqw0y0zfcskkj4mlmkpamr2psqfnsrgz52zvmhy2ha2p"; + revision = "1"; + editedCabalFile = "1kmvb0cxvphmx0f1bgjq636yga58n4g2lqrg2xg5xfpwf8r956qf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring hakyll JuicyPixels JuicyPixels-extra + base binary bytestring hakyll JuicyPixels JuicyPixels-extra ]; testHaskellDepends = [ - base bytestring hakyll HUnit-approx JuicyPixels JuicyPixels-extra - tasty tasty-hunit + base binary bytestring directory filepath hakyll HUnit-approx + JuicyPixels JuicyPixels-extra tasty tasty-hunit ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; @@ -95745,6 +95905,7 @@ self: { ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halberd" = callPackage @@ -96383,37 +96544,8 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.8.0"; - sha256 = "1kkasqfx7k8sl22sklysxl76d5ljcm7p96hgcak7qgwwbj7igj56"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base filepath formatting gitrev mtl path process stm time - transformers typed-process - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process QuickCheck - silently temporary - ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_9_0" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, QuickCheck, silently, stm, temporary, time - , transformers, typed-process, yaml - }: - mkDerivation { - pname = "hapistrano"; - version = "0.3.9.0"; - sha256 = "11b4aq2qpjnsvzcir9sldv4qpccipfffvcf4q8z6ji84hyf3zb3y"; + version = "0.3.9.1"; + sha256 = "0s2xhisyjx3d9rgzqcc09l2x3a8fkc5d7rdcrrcrgwz6vxcdv0pv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -97505,8 +97637,8 @@ self: { pname = "hasbolt"; version = "0.1.3.2"; sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i"; - revision = "1"; - editedCabalFile = "127j24130d412ccn9zc71lxjfr6w0srbc8ir67s3zbmzs6g1l9j8"; + revision = "3"; + editedCabalFile = "10h7pbkrkc9cdxx09zk0s8ygcdva2xy646zq3k8czph3vdaffzqx"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default network text transformers @@ -97519,20 +97651,25 @@ self: { }) {}; "hasbolt-extras" = callPackage - ({ mkDerivation, aeson, aeson-casing, base, containers, free - , hasbolt, lens, mtl, neat-interpolation, scientific - , template-haskell, text, th-lift-instances, unordered-containers - , vector + ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers + , data-default, free, hasbolt, lens, mtl, neat-interpolation + , scientific, template-haskell, text, th-lift-instances + , unordered-containers, vector }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.14"; - sha256 = "1sqlngr8wbvs94j1qmqam0q5shjbil61j7dq520qa87rblljs96i"; + version = "0.0.0.15"; + sha256 = "114yzmvj96nhq37947p5kf3zc4hdh4dnbavms0f1ndszmn1q7hd9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base containers free hasbolt lens mtl neat-interpolation scientific template-haskell text th-lift-instances unordered-containers vector ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default hasbolt mtl text + ]; description = "Extras for hasbolt library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -98179,18 +98316,18 @@ self: { }) {}; "haskdogs" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hasktags, optparse-applicative, process, text + ({ mkDerivation, base, containers, directory, filepath, hasktags + , optparse-applicative, process-extras, text }: mkDerivation { pname = "haskdogs"; - version = "0.5.4"; - sha256 = "1f35np3a99y3aifqgp24c5wdjr5nvvs3jj6g71v39355sjj1hsqq"; + version = "0.6.0"; + sha256 = "0xqnsirgbwnp3kbvdmbg8d1b8lm2yk4fvjx71k8274gi7z62l458"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring containers directory filepath hasktags - optparse-applicative process text + base containers directory filepath hasktags optparse-applicative + process-extras text ]; description = "Generate tags file for Haskell project and its nearest deps"; license = stdenv.lib.licenses.bsd3; @@ -98215,14 +98352,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_4_3" = callPackage + "haskeline_0_7_5_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, stm, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.4.3"; - sha256 = "0ydnsr1nhh7mfgvbpclidcfbgzf7j8g5vnwxrnkmgg1dphq0jv84"; + version = "0.7.5.0"; + sha256 = "1inyq7qwih0hnqlm6gy769vsxzjpvqx9ry390dmcvvql9520hrfj"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath process stm terminfo @@ -98718,19 +98855,18 @@ self: { }) {}; "haskell-gettext" = callPackage - ({ mkDerivation, base, binary, bytestring, bytestring-trie - , containers, filepath, haskell-src-exts, mtl, old-locale, parsec - , text, time, transformers, uniplate + ({ mkDerivation, base, binary, bytestring, containers, filepath + , haskell-src-exts, mtl, old-locale, parsec, text, time + , transformers, uniplate }: mkDerivation { pname = "haskell-gettext"; - version = "0.1.1.0"; - sha256 = "1kfqrm90my0h15f1x6n4fzzf9fvyicg87fqwbal37hj888jb0gv8"; + version = "0.1.2.0"; + sha256 = "1j7f8bcqqidgz3zbnlpy5v9adbp6yr9mla6b1a3m0gam9c7zlgin"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bytestring-trie containers mtl parsec text - time transformers + base binary bytestring containers mtl parsec text time transformers ]; executableHaskellDepends = [ base filepath haskell-src-exts old-locale time uniplate @@ -98766,25 +98902,12 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.21.4"; - sha256 = "0vrl0cqws1l0ba7avf16c9zyfsvq7gd8wv4sjzd7rjk6jmg38vds"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - description = "Foundation for libraries generated by haskell-gi"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_21_5" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; version = "0.21.5"; sha256 = "1pxnwljicxyxr83c7d8xvla7zbp2krv1n6fp4i2zh8bqwln3fkgh"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-gi-overloading_0_0" = callPackage @@ -100973,8 +101096,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.9.2"; - sha256 = "1p4za0b6n7ldz7jnq25n9f7wmngxy8ic0vy1kppb7wka0a96sdh1"; + version = "0.9.3"; + sha256 = "17k51kh9vi2bkf6hfn50wpqsnc0qrclvphqy8wcmsz0n2ik8rb7h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101919,17 +102042,20 @@ self: { ]; description = "\"optparse-applicative\" parsers for \"hasql\""; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-pool" = callPackage - ({ mkDerivation, base-prelude, hasql, resource-pool, time }: + ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: mkDerivation { pname = "hasql-pool"; - version = "0.5"; - sha256 = "0bsxh9yf5p2iknrnssrif563n42ih14cj95qmy9z2lz2kbycscrs"; + version = "0.5.0.1"; + sha256 = "1isnn3klvqcr13wvq6fsj3b5sysjs6xlll9s3ysihd1x4v87zii8"; libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-postgres" = callPackage @@ -102378,10 +102504,8 @@ self: { }: mkDerivation { pname = "haven"; - version = "0.2.0.0"; - sha256 = "0cclphiq2jkk1msp5yg2mpkfn98jlqnc0vvwmi3vqcy5ln7641v1"; - revision = "1"; - editedCabalFile = "1p4m1iv3649b2wf6wdgbknhpms8rna5sibdi93zxyj0a4b23dh23"; + version = "0.2.0.1"; + sha256 = "15q9cgfifz87ns730agv2vzc8rp5lqggiclc91khpckm2qppk6yd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102565,10 +102689,10 @@ self: { }: mkDerivation { pname = "haxr"; - version = "3000.11.2"; - sha256 = "0iwbdvywily6ma1a1v9l4kflvm8d8234zhvyb9imx7g7grns1kgb"; + version = "3000.11.3"; + sha256 = "1ab422ngg63w91a71j17swzzdxk0y2053fijml0illarcrd77cnj"; revision = "1"; - editedCabalFile = "1l0xrffx8xy023g89xijmm7vnaci5hsshpm1rvdchb0nbvq08cnr"; + editedCabalFile = "0h71nvlia8k7ykhywxbx79xj30g6ld0gqqmrdhyp3aip8ly6cb6y"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -104076,23 +104200,21 @@ self: { }) {}; "hedn" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, bytestring - , containers, deepseq, hspec, hspec-contrib, HUnit, mtl, QuickCheck - , scientific, stringsearch, template-haskell, text, time - , time-locale-compat, utf8-string, vector + ({ mkDerivation, base, containers, deepseq, deriving-compat + , hedgehog, megaparsec, parser-combinators, prettyprinter + , scientific, template-haskell, text, time, uuid, vector }: mkDerivation { pname = "hedn"; - version = "0.1.9.1"; - sha256 = "0ynajgg5kl37rv72408hg5jiypy6vmzazqxa58405knb49h0gvvz"; + version = "0.2.0.0"; + sha256 = "1yi7j2ikpd1lv32hzgv38v1r4wzh7ffq71js2648d4j1v9jhq1sj"; libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq mtl - scientific stringsearch text time time-locale-compat utf8-string - vector + base containers deepseq deriving-compat megaparsec + parser-combinators prettyprinter scientific template-haskell text + time uuid vector ]; testHaskellDepends = [ - base bytestring containers hspec hspec-contrib HUnit QuickCheck - template-haskell text time vector + base containers hedgehog megaparsec text time uuid vector ]; description = "EDN parsing and encoding"; license = stdenv.lib.licenses.bsd3; @@ -105009,8 +105131,8 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.21"; - sha256 = "0h3d1b2xdd59d3rl1a9ng1hz2hr3g6n1dpak0a4namjlcfxvwwhd"; + version = "0.24"; + sha256 = "0bzhswisrmlw8ajl6mr13vr3a7l0vywl394aihrc0xs6vwgyflh0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -106100,23 +106222,34 @@ self: { }) {inherit (pkgs) hidapi;}; "hid-examples" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cassava, Chart - , Chart-diagrams, directory, extra, filepath, fmt, hint, mtl - , optparse-applicative, random, safe, text, time, transformers - , unix-compat + ({ mkDerivation, aeson, base, blaze-html, bytestring, cassava + , Chart, Chart-diagrams, data-default, directory, doctest, extra + , filepath, fmt, hedgehog, hint, http-client, mtl + , optparse-applicative, random, req, safe, safe-exceptions, split + , system-locale, tasty, tasty-golden, tasty-hedgehog, tasty-hspec + , text, time, transformers, unix-compat }: mkDerivation { pname = "hid-examples"; - version = "0.3"; - sha256 = "11zqnmsd07zpwmw40ynhv64zqc6fl27a281rihd6yc7n68qvpz6n"; + version = "0.4"; + sha256 = "11r2ln131axkw31afki3jnrz1md668z0qnvx915qwyppga62rk8l"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base hedgehog safe safe-exceptions split + ]; executableHaskellDepends = [ - base blaze-html bytestring cassava Chart Chart-diagrams directory - extra filepath fmt hint mtl optparse-applicative random safe text - time transformers unix-compat + aeson base blaze-html bytestring cassava Chart Chart-diagrams + data-default directory extra filepath fmt hedgehog hint http-client + mtl optparse-applicative random req safe safe-exceptions + system-locale text time transformers unix-compat + ]; + testHaskellDepends = [ + base doctest filepath hedgehog tasty tasty-golden tasty-hedgehog + tasty-hspec ]; + doHaddock = false; description = "Examples to accompany the book \"Haskell in Depth\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -106221,8 +106354,8 @@ self: { }: mkDerivation { pname = "hierarchical-spectral-clustering"; - version = "0.2.1.0"; - sha256 = "1vgvpa9il2pmcwjq0nnq93ppbanrs5yaxdcs9skbwz1r6gx0k64y"; + version = "0.2.2.0"; + sha256 = "0c0lv9vr8srb6bipjx70m7p5mr91hfhnymv8brwj6hllq4cp576m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106238,6 +106371,7 @@ self: { ]; description = "Hierarchical spectral clustering of a graph"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hierarchy" = callPackage @@ -106890,8 +107024,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "0.8.2"; - sha256 = "02vm78bmmvsiz9iwma3398j91dhs3fnwfnacqg40wv3dypd3x3h1"; + version = "0.8.3"; + sha256 = "10pm7hdir81f46d081rk3pc6nnlxhpksmd7qrh1vwyvad4nf9p55"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite deepseq exceptions lifted-async lifted-base memory monad-control @@ -107251,29 +107385,20 @@ self: { }) {}; "hit" = callPackage - ({ mkDerivation, attoparsec, base, byteable, bytedump, bytestring - , containers, cryptohash, hourglass, mtl, parsec, patience, random - , system-fileio, system-filepath, tasty, tasty-quickcheck - , unix-compat, utf8-string, vector, zlib, zlib-bindings + ({ mkDerivation, base, bytestring, containers, git, hashable + , hashtables, hourglass }: mkDerivation { pname = "hit"; - version = "0.6.3"; - sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv"; - revision = "2"; - editedCabalFile = "1wcc2lywirc6dmhssnbhgv38vf3xz371y99id30bhg1brmiwmii3"; - isLibrary = true; + version = "0.7.0"; + sha256 = "1d3kqc9yd5hxcrr406cwbxjqnqj0bh4laayx2v1mqqz48x6rmqah"; + isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base byteable bytestring containers cryptohash hourglass - mtl parsec patience random system-fileio system-filepath - unix-compat utf8-string vector zlib zlib-bindings - ]; - testHaskellDepends = [ - base bytedump bytestring hourglass tasty tasty-quickcheck + executableHaskellDepends = [ + base bytestring containers git hashable hashtables hourglass ]; - description = "Git operations in haskell"; + description = "Git like program in haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -107930,8 +108055,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.12"; - sha256 = "1d3gbvjs7zg9n4fbj2b3c5wn5xf2idygx9cqjdbmgndk3jic9rbx"; + version = "2.1.14"; + sha256 = "0arz6x0r4pji37papdrc6brybcd2a2sackvhzmhy89ycgy0k04kk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -108596,8 +108721,8 @@ self: { }: mkDerivation { pname = "hmm-lapack"; - version = "0.3.0.1"; - sha256 = "150aqwg7n9i5hsdlxxbsynaxn3shgnx20drax16z5785rz0bbrjx"; + version = "0.3.0.2"; + sha256 = "1rwxp4gjk2z8k42k7l1g3sy07jl2rhc7xgypjripb3chmfkp6zvn"; libraryHaskellDepends = [ base boxes comfort-array containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat @@ -108606,6 +108731,7 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Hidden Markov Models using LAPACK primitives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmp3" = callPackage @@ -109728,8 +109854,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.17.4"; - sha256 = "059dys3vlbxpd4kx1nrjib1ww9rqkk9am3gdsy3d8vl0fxx2p6s9"; + version = "5.0.17.5"; + sha256 = "1vpx6v8b0jixn82iqz085w2qpyj5pl2qyhrcd0a4p0vs5qmplf60"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -109787,8 +109913,8 @@ self: { pname = "hookup"; version = "0.2.2"; sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf"; - revision = "3"; - editedCabalFile = "0fmnfnlcc5jg0na2723ibh26sch190s62d52g14gffh9fsl9icgy"; + revision = "4"; + editedCabalFile = "1l52m4pl1l0mrnl4czx25i8xvba03l7bvqskk59cgwfk8q1kk935"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -109891,8 +110017,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.21.2"; - sha256 = "13064b3ybjsa78gw1dhykl24l1ccqxsdq773zwb95ccz3v4dy65l"; + version = "0.21.3"; + sha256 = "18y6qxb53v9dbjz4mhxvzc0b8jyk909w140y22hxcbwn41vqh48l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -111157,6 +111283,7 @@ self: { ]; description = "Python language tools"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hquantlib" = callPackage @@ -112152,6 +112279,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {xenctrl = null;}; + "hsakamai" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit + , conduit-extra, cryptonite, doctest, http-client, http-conduit + , http-types, memory, optparse-applicative, random, text, unix + , unix-time, uuid, xml-conduit, yaml + }: + mkDerivation { + pname = "hsakamai"; + version = "0.1.0.0"; + sha256 = "1wg0jw7m0hvvv6b5xz0y012kgnx4zxfms53gvryw0zk6ll841h3i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive conduit cryptonite + http-client http-conduit http-types memory random text unix-time + uuid xml-conduit + ]; + executableHaskellDepends = [ + aeson base bytestring case-insensitive conduit conduit-extra + cryptonite http-client http-conduit http-types memory + optparse-applicative random text unix unix-time uuid xml-conduit + yaml + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive conduit cryptonite doctest + http-client http-conduit http-types memory random text unix-time + uuid xml-conduit + ]; + description = "Akamai API(Edgegrid and Netstorage)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsaml2" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, cryptonite, data-default, http-types, HUnit, hxt @@ -113020,6 +113179,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsdev_0_3_3_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec + , base, bytestring, Cabal, containers, cpphs, data-default, deepseq + , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc + , ghc-boot, ghc-paths, haddock-api, haddock-library, haskell-names + , haskell-src-exts, hdocs, hformat, hlint, hspec, http-client, lens + , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl + , network, network-uri, optparse-applicative, process + , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm + , syb, template-haskell, text, text-region, time, transformers + , transformers-base, uniplate, unix, unordered-containers, vector + }: + mkDerivation { + pname = "hsdev"; + version = "0.3.3.0"; + sha256 = "17pylby88xmr8hibhpiyygzdnjwznh1zss4969z6w2dk2489lkrz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty array async attoparsec base bytestring Cabal + containers cpphs data-default deepseq direct-sqlite directory + exceptions filepath fsnotify ghc ghc-boot ghc-paths haddock-api + haddock-library haskell-names haskell-src-exts hdocs hformat hlint + http-client lens lifted-base mmorph monad-control monad-loops mtl + network network-uri optparse-applicative process regex-pcre-builtin + scientific simple-log sqlite-simple stm syb template-haskell text + text-region time transformers transformers-base uniplate unix + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers deepseq directory + exceptions filepath monad-loops mtl network optparse-applicative + process text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson async base containers data-default deepseq directory filepath + hformat hspec lens lens-aeson mtl text + ]; + description = "Haskell development library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsdif" = callPackage ({ mkDerivation, base, bytestring, hosc }: mkDerivation { @@ -113054,12 +113256,30 @@ self: { pname = "hsdns"; version = "1.7.1"; sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; + revision = "1"; + editedCabalFile = "0w4hrmj7ph5dgarl82xpa0g77ncjdqk0wc9wp771pry98xxihzl8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers network ]; + librarySystemDepends = [ adns ]; + description = "Asynchronous DNS Resolver"; + license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {inherit (pkgs) adns;}; + + "hsdns_1_8" = callPackage + ({ mkDerivation, adns, base, containers, network }: + mkDerivation { + pname = "hsdns"; + version = "1.8"; + sha256 = "0jxnfgzsshhaf3n8ywhxy84l6ldhz5cdwaayr61v26iqgm3c3qk0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers network ]; librarySystemDepends = [ adns ]; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; @@ -113350,8 +113570,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.6"; - sha256 = "0ylbg5bcylc0gql0qvmih66dj1qj8imn31b6bl70mynwkqh96g1d"; + version = "0.8.8"; + sha256 = "0q6348iz4w8zfdrzv98vydw5rdxlhqapdqhxrnhd6dqlcjq3rf1j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113945,43 +114165,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec_2_4_8" = callPackage - ({ mkDerivation, base, call-stack, directory, hspec-core - , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck - , stringbuilder, transformers + "hspec" = callPackage + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.4.8"; - sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l"; + version = "2.6.1"; + sha256 = "1jkfqhdymr62rzqmlmc22mpla23p67rnls3v3zs30ggxbgs4dxlb"; libraryHaskellDepends = [ - base call-stack hspec-core hspec-discover hspec-expectations HUnit - QuickCheck transformers - ]; - testHaskellDepends = [ - base call-stack directory hspec-core hspec-discover - hspec-expectations hspec-meta HUnit QuickCheck stringbuilder - transformers + base hspec-core hspec-discover hspec-expectations QuickCheck ]; - testToolDepends = [ hspec-discover ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec" = callPackage + "hspec_2_7_0" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.6.1"; - sha256 = "1jkfqhdymr62rzqmlmc22mpla23p67rnls3v3zs30ggxbgs4dxlb"; + version = "2.7.0"; + sha256 = "1qbikvd91cimbn439zwsdcrz0hsl7n2w4cl0vlcw8kbf94nm6z7z"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -114028,36 +114240,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-core_2_4_8" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq - , directory, filepath, hspec-expectations, hspec-meta, HUnit - , process, QuickCheck, quickcheck-io, random, setenv, silently, stm - , temporary, tf-random, time, transformers + "hspec-core" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers }: mkDerivation { pname = "hspec-core"; - version = "2.4.8"; - sha256 = "02zr6n7mqdncvf1braf38zjdplaxrkg11x9k8717k4yg57585ji4"; - revision = "1"; - editedCabalFile = "05rfar3kl9nkh421jxx71p6dn3zykj61lj1hjhrj0z3s6m1ihn5q"; + version = "2.6.1"; + sha256 = "0xg43kan7p6ahi5827qwcyiic6bq0bp8n0n8h3j4kh87qhdl4avv"; libraryHaskellDepends = [ - ansi-terminal array base call-stack deepseq directory filepath - hspec-expectations HUnit QuickCheck quickcheck-io random setenv stm - tf-random time transformers + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers ]; testHaskellDepends = [ - ansi-terminal array base call-stack deepseq directory filepath - hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently stm temporary tf-random time + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random transformers ]; + testToolDepends = [ hspec-meta ]; testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec-core" = callPackage + "hspec-core_2_7_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -114065,8 +114275,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.6.1"; - sha256 = "0xg43kan7p6ahi5827qwcyiic6bq0bp8n0n8h3j4kh87qhdl4avv"; + version = "2.7.0"; + sha256 = "1y4j0ivngz7jrff1riyy2iirnb5kc9p4cr619wdrsrvrm3blgzrz"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -114082,6 +114292,7 @@ self: { testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-dirstream" = callPackage @@ -114102,13 +114313,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hspec-discover_2_4_8" = callPackage + "hspec-discover" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.4.8"; - sha256 = "0llwdfpjgfpi7dr8caw0fldb9maqznmqh4awkvx72bz538gqmlka"; + version = "2.6.1"; + sha256 = "189gj8drfzdf3j3xm8gbj9hjc1ha95ajhi47s9r440yjhyarlmlx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -114116,18 +114327,18 @@ self: { testHaskellDepends = [ base directory filepath hspec-meta QuickCheck ]; + testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec-discover" = callPackage + "hspec-discover_2_7_0" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.6.1"; - sha256 = "189gj8drfzdf3j3xm8gbj9hjc1ha95ajhi47s9r440yjhyarlmlx"; + version = "2.7.0"; + sha256 = "1n3by0dn3x3kfy7vnyfdz0dr2wwwj82m0ijlm9s1n6aa976xddhw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -114138,6 +114349,7 @@ self: { testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations" = callPackage @@ -114412,8 +114624,8 @@ self: { }: mkDerivation { pname = "hspec-need-env"; - version = "0.1.0.2"; - sha256 = "0393l0faajrdfckjgclrhpvm79r0mhba8jrrsvr4rj5ifajmrfns"; + version = "0.1.0.3"; + sha256 = "164ng7ryb9dpw2v0wazi9s8xqwsx9yla83p0ln05m6zlirpp6jc6"; libraryHaskellDepends = [ base hspec-core hspec-expectations ]; testHaskellDepends = [ base hspec hspec-core setenv transformers ]; description = "Read environment variables for hspec tests"; @@ -115488,16 +115700,14 @@ self: { }) {}; "hsyslog" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: + ({ mkDerivation, base }: mkDerivation { pname = "hsyslog"; - version = "5.0.1"; - sha256 = "05k0ckgqzjpa3mqamlswi0kpvqxvq40awip0cvhpzjx64240vpl6"; + version = "5.0.2"; + sha256 = "1kkypn0dd92aqv8dr112bhkr9k9r9mchnyyvy41kvhj2zg447v1y"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; description = "FFI interface to syslog(3) from POSIX.1-2001"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; @@ -116238,7 +116448,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_6_0" = callPackage + "http-client_0_6_1" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -116247,8 +116457,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.6.0"; - sha256 = "1z38v6vgs5hzd42ljkwxdxs1j3ixwsj9klyxd2ng3pxdnb8wyvvk"; + version = "0.6.1"; + sha256 = "0ryj5far7744c297ji9aaqcm56rpm2fyma8mbghli086nq4xiryl"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -116352,6 +116562,8 @@ self: { pname = "http-client-openssl"; version = "0.3.0.0"; sha256 = "0y7d1bp045mj1lnbd74a1v4viv5g5awivdhbycq75hnvqf2n50vl"; + revision = "2"; + editedCabalFile = "0p8vgakciq8ar9pfahh1bmriann3h0xn4z3xb328lgbcxxxpwqfd"; libraryHaskellDepends = [ base bytestring HsOpenSSL http-client network ]; @@ -116530,6 +116742,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-conduit_2_3_5" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, connection, cookie + , data-default-class, hspec, http-client, http-client-tls + , http-types, HUnit, mtl, network, resourcet, streaming-commons + , temporary, text, time, transformers, unliftio, unliftio-core + , utf8-string, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.3.5"; + sha256 = "0hbdsp5x7mwxcjkshkf0hqfgkjcsy1g34m4im5v078izhv3fzad9"; + revision = "1"; + editedCabalFile = "03yfl2n04blmmqca18b18jwplmcz7qjzqjgzrrzbd1nr290ivqjz"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra http-client + http-client-tls http-types mtl resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit network resourcet streaming-commons + temporary text time transformers unliftio utf8-string wai + wai-conduit warp warp-tls + ]; + doCheck = false; + description = "HTTP client package with conduit interface and HTTPS support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -116673,6 +116916,8 @@ self: { pname = "http-io-streams"; version = "0.1.0.0"; sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv"; + revision = "1"; + editedCabalFile = "10fcy17ny5qvabm98md9j8r7vfklgzxvg89iinna7wm4v6q6j5w5"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring case-insensitive containers directory HsOpenSSL io-streams mtl @@ -117507,8 +117752,8 @@ self: { ({ mkDerivation, base, criterion, doctest, Glob }: mkDerivation { pname = "human-readable-duration"; - version = "0.2.1.2"; - sha256 = "142ng2395pa9lcllb0sh8n974d58r4ny05nlsj6y3gd04prdwlk5"; + version = "0.2.1.3"; + sha256 = "1zq85v9knc73ck9lqrn4k0w121ifpjg7j053qmhgam0605j89236"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; benchmarkHaskellDepends = [ base criterion ]; @@ -117579,8 +117824,8 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.2.0.6"; - sha256 = "10zndwkgpliyycyynfd34nhzplfhs9cychpznzzcwbpckx3w5ajl"; + version = "1.2.1.0"; + sha256 = "075xx6rz1bxyj00plkrfz04wfq1rim8nkn43xj0d7js86qhvqyrc"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -118316,6 +118561,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-json-simd" = callPackage + ({ mkDerivation, base, bytestring, c2hs, hw-prim, lens + , optparse-applicative, vector + }: + mkDerivation { + pname = "hw-json-simd"; + version = "0.1.0.0"; + sha256 = "015frhg0v7vxrl1m4bjg2rfa7z0846g9xclirdhb4n5pjzr11rp9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + base bytestring hw-prim lens optparse-applicative vector + ]; + testHaskellDepends = [ base bytestring hw-prim lens vector ]; + description = "SIMD-based JSON semi-indexer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache , containers, errors, hashable, hspec, http-client, http-types @@ -118344,21 +118610,22 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, rdkafka, transformers, unix + , either, hspec, monad-loops, rdkafka, text, transformers, unix }: mkDerivation { pname = "hw-kafka-client"; - version = "2.5.0"; - sha256 = "0cr3s26ivb46d14mglnr9phhnsj85h8n3b8p6lmcjk1xs4jidick"; + version = "2.6.0"; + sha256 = "1318gyl3jn3q2namzpzf0254hqpib2nn1kipf6gnfp4dvwv0wbgn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors bytestring containers transformers unix + base bifunctors bytestring containers text transformers unix ]; librarySystemDepends = [ rdkafka ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base bifunctors bytestring containers either hspec monad-loops + base bifunctors bytestring containers either hspec monad-loops text + transformers ]; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; @@ -118371,8 +118638,8 @@ self: { }: mkDerivation { pname = "hw-kafka-conduit"; - version = "2.5.0"; - sha256 = "0n495336vhikd0r5j6i8ydrxv3xwwckbg2ympaf3flcsjv4bwc08"; + version = "2.6.0"; + sha256 = "0z3rhxzj8zni2z0mb7aka21dblyniqby0qf2y6cnnjw6gmvrkc1b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119861,31 +120128,6 @@ self: { }: mkDerivation { pname = "hyraxAbif"; - version = "0.2.3.10"; - sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b"; - revision = "2"; - editedCabalFile = "1dwkqlkjg5hbjlwl7cjxmhg1camhlqpaqjrpmkwknscj76hfckvi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring directory filepath protolude text - ]; - executableHaskellDepends = [ - base bytestring hscolour pretty-show protolude text - ]; - testHaskellDepends = [ - base binary bytestring hedgehog protolude text - ]; - description = "Modules for parsing, generating and manipulating AB1 files"; - license = "(BSD-3-Clause OR Apache-2.0)"; - }) {}; - - "hyraxAbif_0_2_3_15" = callPackage - ({ mkDerivation, base, binary, bytestring, directory, filepath - , hedgehog, hscolour, pretty-show, protolude, text - }: - mkDerivation { - pname = "hyraxAbif"; version = "0.2.3.15"; sha256 = "1wfmlqgk751ij30x0dkyc9fyc6j1a96l0s7fjj1sywdvawd8cfh1"; isLibrary = true; @@ -119901,7 +120143,6 @@ self: { ]; description = "Modules for parsing, generating and manipulating AB1 files"; license = "(BSD-3-Clause OR Apache-2.0)"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hzaif" = callPackage @@ -122238,32 +122479,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.1"; - sha256 = "1hfyp284lpvgy0rqn7rjr7c8z0ah8h0vl3xhfrff8x1z1511n2dp"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "influxdb_1_6_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, QuickCheck, scientific - , tagged, template-haskell, text, time, unordered-containers - , vector - }: - mkDerivation { - pname = "influxdb"; - version = "1.6.1.1"; - sha256 = "0cmhy4v00jvz1n4xfa0pcxgld7mc6idj4jl2b3n01jfhjff22ryi"; + version = "1.6.1.2"; + sha256 = "1bzy78amw6k02bi2fjm2i8vah9lwxpy2fdlq35gdsffhwrif29mg"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -122275,7 +122492,6 @@ self: { testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -123375,8 +123591,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.7.1.1"; - sha256 = "1s947b71r0m3f81w8sid2cwgh9j16bxsmlpi498rzxajq32cd5yk"; + version = "0.7.2"; + sha256 = "0iv79rlgi7xi5l0a530m8vniba5jnn45hddwfrrm9yyfvpfgx1sw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -123754,6 +123970,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-streams_1_5_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , deepseq, directory, filepath, HUnit, mtl, network, primitive + , process, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers, vector + , zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.5.1.0"; + sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la"; + configureFlags = [ "-fNoInteractiveTests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder network primitive + process text time transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder deepseq directory + filepath HUnit mtl network primitive process QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + time transformers vector zlib zlib-bindings + ]; + description = "Simple, composable, and easy-to-use stream I/O"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "io-streams-haproxy" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers @@ -123775,6 +124018,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-streams-haproxy_1_0_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams + , network, test-framework, test-framework-hunit, transformers + }: + mkDerivation { + pname = "io-streams-haproxy"; + version = "1.0.1.0"; + sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp"; + libraryHaskellDepends = [ + attoparsec base bytestring io-streams network transformers + ]; + testHaskellDepends = [ + attoparsec base bytestring HUnit io-streams network test-framework + test-framework-hunit transformers + ]; + description = "HAProxy protocol 1.5 support for io-streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "io-streams-http" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , io-streams, mtl, transformers @@ -124122,6 +124385,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ipynb" = callPackage + ({ mkDerivation, aeson, aeson-diff, base, base64-bytestring + , bytestring, containers, directory, filepath, microlens + , microlens-aeson, tasty, tasty-hunit, text, unordered-containers + , vector + }: + mkDerivation { + pname = "ipynb"; + version = "0.1"; + sha256 = "0daadhzil4q573mqb0rpvjzm0vpkzgzqcimw480qpvlh6rhppwj5"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-diff base base64-bytestring bytestring directory + filepath microlens microlens-aeson tasty tasty-hunit text + unordered-containers vector + ]; + description = "Data structure for working with Jupyter notebooks (ipynb)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, directory, filepath, memory, mtl, process, temporary @@ -124662,6 +124948,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "isobmff" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, data-default + , function-builder, hspec, mtl, pretty-types, QuickCheck + , singletons, tagged, template-haskell, text, time, type-spec + , vector + }: + mkDerivation { + pname = "isobmff"; + version = "0.13.0.0"; + sha256 = "032lcpdifrryi4ryz3gwzh9l5927amcpr8xk8jbjwz0mj3z857d5"; + libraryHaskellDepends = [ + base bytestring data-default function-builder mtl pretty-types + singletons tagged template-haskell text time type-spec vector + ]; + testHaskellDepends = [ + base binary bytestring hspec mtl pretty-types QuickCheck tagged + text type-spec + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion tagged type-spec + ]; + description = "A parser and generator for the ISO-14496-12/14 base media file format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "isobmff-builder" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, data-default , hspec, mtl, pretty-types, QuickCheck, singletons, tagged @@ -126830,8 +127141,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.5"; - sha256 = "17y8hnqp4ahg7cx6fwfd4y65pz16py1avhfkn4fcfjs06xv465qs"; + version = "1.0.6"; + sha256 = "1j5x5ibax81348m4m1fv8pz0044gbvlskgh9gpn5dn8d0cpd7vf7"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -126904,12 +127215,14 @@ self: { }) {}; "json-pointer" = callPackage - ({ mkDerivation, attoparsec, base-prelude, text }: + ({ mkDerivation, attoparsec, base, base-prelude, text }: mkDerivation { pname = "json-pointer"; - version = "0.1.2.1"; - sha256 = "1anij6svbkygz9qyssqhz9vyj43gyhsvrypb6fzjl4k5ss7aibq0"; - libraryHaskellDepends = [ attoparsec base-prelude text ]; + version = "0.1.2.2"; + sha256 = "0cwk5jxg528dipfdhrmmjpz950pfpaykncvw16rajvf35wvcnk9x"; + revision = "1"; + editedCabalFile = "0bs7fa02jjq9r7bn3vlwn4xq93yllj62h3bb5g2lsihx1svk7lkn"; + libraryHaskellDepends = [ attoparsec base base-prelude text ]; description = "JSON Pointer parsing and interpretation utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -128530,6 +128843,7 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kbq-gu" = callPackage @@ -129964,8 +130278,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.7"; - sha256 = "0n90m4dsqfp4x4bckwxasg2cmjrzxp2szrlqf43pmp2dsc8g0646"; + version = "1.0.8"; + sha256 = "0nryr2bsl7wn80nfwpvs45nyf02micq422b95dhw8ln79knpa4vm"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -130820,6 +131134,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {mp3lame = null;}; + "lame_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, directory, exceptions, filepath + , hspec, hspec-discover, htaglib, mp3lame, temporary, text + , transformers, wave + }: + mkDerivation { + pname = "lame"; + version = "0.2.0"; + sha256 = "1bqq3aanfffdsl3v0am7jdfslcr6y372cq7jx36z7g09zy5mp2sp"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath text transformers + wave + ]; + librarySystemDepends = [ mp3lame ]; + testHaskellDepends = [ + base directory filepath hspec htaglib temporary text + ]; + testToolDepends = [ hspec-discover ]; + description = "Fairly complete high-level binding to LAME encoder"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {mp3lame = null;}; + "lame-tester" = callPackage ({ mkDerivation, base-noprelude, bizzlelude, containers, semigroups , tasty, tasty-hunit, validation @@ -131557,26 +131895,29 @@ self: { "language-oberon" = callPackage ({ mkDerivation, base, containers, directory, either, filepath , grammatical-parsers, optparse-applicative, parsers, prettyprinter - , rank2classes, repr-tree-syb, tasty, tasty-hunit, text + , rank2classes, repr-tree-syb, tasty, tasty-hunit, template-haskell + , text, transformers }: mkDerivation { pname = "language-oberon"; - version = "0.2"; - sha256 = "052kgd4d1cwdqs8znkx2fagjlb39x6c2lhvic6il2c67ali53nhr"; + version = "0.2.1"; + sha256 = "1ia0m9bgrz1jksw349a0pgmkfvy5ykc29n55w7w457c60y37bs02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory either filepath grammatical-parsers - parsers prettyprinter rank2classes text + parsers prettyprinter rank2classes template-haskell text + transformers ]; executableHaskellDepends = [ base containers either filepath grammatical-parsers optparse-applicative prettyprinter rank2classes repr-tree-syb text ]; testHaskellDepends = [ - base directory either filepath tasty tasty-hunit + base directory either filepath grammatical-parsers prettyprinter + tasty tasty-hunit text ]; - description = "Parser and pretty-printer for the Oberon programming language"; + description = "Parser, pretty-printer, and type checker for the Oberon programming language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -131946,14 +132287,15 @@ self: { "lapack" = callPackage ({ mkDerivation, base, blas-ffi, boxes, ChasingBottoms - , comfort-array, deepseq, fixed-length, guarded-allocation - , lapack-ffi, lazyio, netlib-ffi, non-empty, QuickCheck, semigroups - , tfp, transformers, utility-ht + , comfort-array, data-ref, deepseq, fixed-length + , guarded-allocation, lapack-ffi, lazyio, netlib-ffi, non-empty + , QuickCheck, quickcheck-transformer, random, semigroups, tfp + , transformers, unique-logic-tf, utility-ht }: mkDerivation { pname = "lapack"; - version = "0.2"; - sha256 = "173yjhf2drabx13rw7kzs6wp40pg2r5yibr7psgdyidx7543svvy"; + version = "0.2.1"; + sha256 = "1m6n36cjk69maqrb2alya8ki2kndvpfjn2nyb8p4k5333x4ka6xm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131962,8 +132304,9 @@ self: { transformers utility-ht ]; testHaskellDepends = [ - base ChasingBottoms comfort-array netlib-ffi non-empty QuickCheck - semigroups tfp transformers utility-ht + base ChasingBottoms comfort-array data-ref netlib-ffi non-empty + QuickCheck quickcheck-transformer random semigroups tfp + transformers unique-logic-tf utility-ht ]; description = "Numerical Linear Algebra using LAPACK"; license = stdenv.lib.licenses.bsd3; @@ -131976,8 +132319,8 @@ self: { }: mkDerivation { pname = "lapack-carray"; - version = "0.0.2"; - sha256 = "1dr4mbhc5y21mbnksyi530rsvckfp4mclhhig2rjhx3b06cksfna"; + version = "0.0.3"; + sha256 = "1l4dwkdk6m5ran92j7k9yxqin1spgx8sg0bi2kfn1pcs6jzgn3si"; libraryHaskellDepends = [ base carray lapack-ffi netlib-carray netlib-ffi storable-complex transformers @@ -131986,6 +132329,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lapack-comfort-array" = callPackage + ({ mkDerivation, base, comfort-array, lapack-ffi + , netlib-comfort-array, netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "lapack-comfort-array"; + version = "0.0"; + sha256 = "06pzjr9n5pn0aqgf1p7njls65m10zfryzld3sxlr9ybailmnsa2j"; + libraryHaskellDepends = [ + base comfort-array lapack-ffi netlib-comfort-array netlib-ffi + storable-complex transformers + ]; + description = "Auto-generated interface to Fortran LAPACK via comfort-array"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lapack-ffi" = callPackage ({ mkDerivation, base, liblapack, netlib-ffi }: mkDerivation { @@ -132006,8 +132365,8 @@ self: { }: mkDerivation { pname = "lapack-ffi-tools"; - version = "0.1.1"; - sha256 = "1y3h69mkbjidl146y1w0symk8rgpir5gb5914ymmg83nsyyl16vk"; + version = "0.1.2"; + sha256 = "14wfnddya7ch8hm3wgabd7nma7ahcgv6h2innfbp1ck92isn2s0q"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -132759,6 +133118,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "leancheck_0_9_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.9.0"; + sha256 = "12s3pwihb6i5anv5zm8xvlz6gq4bfk0nrgvkmg83my1sg5pcknl4"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Enumerative property-based testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "leancheck-enum-instances" = callPackage ({ mkDerivation, base, enum-types, leancheck }: mkDerivation { @@ -132771,13 +133143,19 @@ self: { }) {}; "leancheck-instances" = callPackage - ({ mkDerivation, base, bytestring, leancheck, nats, text }: + ({ mkDerivation, array, base, bytestring, containers, leancheck + , nats, text, time + }: mkDerivation { pname = "leancheck-instances"; - version = "0.0.1"; - sha256 = "1p7d6z82s689l8vi1c0rq6cnzvzlcx17nmr3wzy4yj3h80g1hnlq"; - libraryHaskellDepends = [ base bytestring leancheck nats text ]; - testHaskellDepends = [ base bytestring leancheck nats text ]; + version = "0.0.3"; + sha256 = "1h6aw2fvdcjaz9r90l3c9znykn0y9gvg74ycvkrqw823sd9ywwd6"; + libraryHaskellDepends = [ + array base bytestring containers leancheck nats text time + ]; + testHaskellDepends = [ + base bytestring containers leancheck nats text + ]; description = "Common LeanCheck instances"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -133149,6 +133527,7 @@ self: { libraryHaskellDepends = [ accelerate base lens ]; description = "Instances to mix lens with accelerate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-action" = callPackage @@ -133324,26 +133703,6 @@ self: { }: mkDerivation { pname = "lens-regex"; - version = "0.1.0"; - sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base lens regex-base template-haskell - ]; - testHaskellDepends = [ - base directory doctest filepath regex-posix - ]; - description = "Lens powered regular expression"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens-regex_0_1_1" = callPackage - ({ mkDerivation, array, base, directory, doctest, filepath, lens - , regex-base, regex-posix, template-haskell - }: - mkDerivation { - pname = "lens-regex"; version = "0.1.1"; sha256 = "0c673v6k6y7dng6qmi4jbh3jlx803mg5g1911bz54r785fm6p50d"; isLibrary = true; @@ -133356,7 +133715,6 @@ self: { ]; description = "Lens powered regular expression"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-simple" = callPackage @@ -134347,6 +134705,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "libraft_0_2_0_0" = callPackage + ({ mkDerivation, atomic-write, attoparsec, base, base16-bytestring + , bytestring, cereal, concurrency, containers, cryptohash-sha256 + , dejafu, directory, exceptions, file-embed, haskeline + , hunit-dejafu, lifted-base, monad-control, mtl, network + , network-simple, parsec, postgresql-simple, process, protolude + , QuickCheck, quickcheck-state-machine, random, repline, stm, tasty + , tasty-dejafu, tasty-discover, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, text, time, transformers, transformers-base + , tree-diff, word8 + }: + mkDerivation { + pname = "libraft"; + version = "0.2.0.0"; + sha256 = "0lm2b9n1xlpzsxcvnhc3bkcgzbrwxb1l0ffjjqa55hn42dw8ng1d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-write attoparsec base base16-bytestring bytestring cereal + concurrency containers cryptohash-sha256 directory exceptions + file-embed haskeline lifted-base monad-control mtl network + network-simple parsec postgresql-simple protolude random repline + text time transformers transformers-base word8 + ]; + executableHaskellDepends = [ + atomic-write attoparsec base base16-bytestring bytestring cereal + concurrency containers cryptohash-sha256 directory exceptions + file-embed haskeline lifted-base monad-control mtl network + network-simple parsec postgresql-simple protolude random repline + stm text time transformers transformers-base word8 + ]; + testHaskellDepends = [ + atomic-write attoparsec base base16-bytestring bytestring cereal + concurrency containers cryptohash-sha256 dejafu directory + exceptions file-embed haskeline hunit-dejafu lifted-base + monad-control mtl network network-simple parsec postgresql-simple + process protolude QuickCheck quickcheck-state-machine random + repline tasty tasty-dejafu tasty-discover tasty-expected-failure + tasty-hunit tasty-quickcheck text time transformers + transformers-base tree-diff word8 + ]; + testToolDepends = [ tasty-discover ]; + description = "Raft consensus algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "librandomorg" = callPackage ({ mkDerivation, base, bytestring, curl }: mkDerivation { @@ -134648,6 +135053,8 @@ self: { pname = "libzfs"; version = "0.2.0.0"; sha256 = "1g3bn3dmkzalzpm645ag4vk9736in0xcszj28girpyphyiyfkk45"; + revision = "1"; + editedCabalFile = "0rvk7mbqz5yr5qx52ais53x1sknbf9r87q7rypk63jznjj1jcbmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl transformers ]; @@ -135201,6 +135608,7 @@ self: { testHaskellDepends = [ base doctest ]; description = "Lifting linear vector spaces into Accelerate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linear-algebra-cblas" = callPackage @@ -136088,8 +136496,8 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1.0.2"; - sha256 = "08wjng9d1sqjqc6pgq2lh84gcaabqmrslm3slc0rvaxh1lvasv6s"; + version = "1.0.3.1"; + sha256 = "0h6bwljy0cqm1fsq151glglnvczjcvbphxiw7c83ps2zy9whg4y9"; libraryHaskellDepends = [ base mmorph monad-control mtl transformers transformers-base ]; @@ -137388,10 +137796,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.10.0.0"; - sha256 = "0bjsng7ganwbqxvj9zi7w7l547iw9yh972bc0mc82cnwd6awclj5"; - revision = "1"; - editedCabalFile = "11sd5si8snl5agl34arp9lkxjnm07rd5rs05apq1lvcac70la18d"; + version = "0.10.0.1"; + sha256 = "1nnchsrkcm08r1lrlldr7icqnzsz3g024dlwg2z9la66n9d0fvl0"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -138400,8 +138806,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "5"; - editedCabalFile = "0dfrgg60nd7l7pfjar1s1g380r4591y6ccv9fyh0n34ymhizk84y"; + revision = "6"; + editedCabalFile = "1zkf8ss6siai3py4drb5hr0m3np2kk3vrzb6kcxhq0vxxz3xynjh"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -139456,6 +139862,8 @@ self: { pname = "maclight"; version = "0.1.0.0"; sha256 = "0qf44jza8avq2yfsx2f0bdxbnda4lm3xq9qaivmslfbdfjy3mxv3"; + revision = "1"; + editedCabalFile = "0v10y2x6c2cyh1qc0yki1mn69bcps0bdbq1mipf35mjmd0zs5iyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filemanip filepath parsec strict ]; @@ -139467,6 +139875,7 @@ self: { ]; description = "Control screen and keyboard backlights on MACs under Linux"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "macos-corelibs" = callPackage @@ -139630,8 +140039,8 @@ self: { ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { pname = "magico"; - version = "0.0.1.1"; - sha256 = "0cr6dk02k80ljfajg715rk5afzlll12zlg50dpxlb39624nli7hl"; + version = "0.0.1.2"; + sha256 = "17vr7bn7w7wyh7v3gw4lv7nj0qzv2b8cn9f9drjlb08ahxqgqg08"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141037,8 +141446,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.2.6.0"; - sha256 = "07mns6fqkvyq9v80jqpqawb37a58irz85hplgq38aqz4gihv642f"; + version = "0.2.7.0"; + sha256 = "080pdghb6yf08addkysdpgdgzf60lc90z580vk2igjfc23w9xwc7"; libraryHaskellDepends = [ base bytestring data-default-class deepseq ghc-prim primitive vector @@ -141797,31 +142206,6 @@ self: { }: mkDerivation { pname = "mbug"; - version = "1.3"; - sha256 = "1pa3myyd2qrb14797hix4dh0ajpwr49219x5bf030yps6b0hsi91"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring directory extra formatting http-client - http-client-tls mtl optparse-applicative process scalpel-core - tagsoup text time xdg-basedir - ]; - executableHaskellDepends = [ - base bytestring directory extra formatting http-client - http-client-tls mtl optparse-applicative process scalpel-core - tagsoup text time xdg-basedir - ]; - description = "download bugs mailboxes"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "mbug_1_3_2" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, formatting - , http-client, http-client-tls, mtl, optparse-applicative, process - , scalpel-core, tagsoup, text, time, xdg-basedir - }: - mkDerivation { - pname = "mbug"; version = "1.3.2"; sha256 = "05cyznwvwjc1ajjkr28h8dawlk10nx60ybx30g6vs5h68zlq43nd"; isLibrary = true; @@ -141838,7 +142222,6 @@ self: { ]; description = "download bugs mailboxes"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mcl" = callPackage @@ -142340,6 +142723,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "megaparsec_6_5_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, hspec, hspec-discover, hspec-expectations + , mtl, parser-combinators, QuickCheck, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "6.5.0"; + sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy"; + revision = "4"; + editedCabalFile = "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec hspec-expectations mtl QuickCheck + scientific text transformers + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "megaparsec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl @@ -142781,34 +143191,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {menoh = null;}; - "mercury-api" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory - , hashable, HUnit, optparse-applicative, text, unordered-containers + "menshen" = callPackage + ({ mkDerivation, aeson, base, hspec, QuickCheck, regex-tdfa + , scientific, text }: mkDerivation { - pname = "mercury-api"; - version = "0.1.0.1"; - sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr"; - revision = "2"; - editedCabalFile = "093c8afmcrnbfliz1ykpyc4w40dli2wig0qi0xcwg8445idwp2kg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base bytestring clock hashable text - unordered-containers - ]; - executableHaskellDepends = [ - ansi-terminal base bytestring optparse-applicative text - ]; + pname = "menshen"; + version = "0.0.1"; + sha256 = "1i4h5s3d57466hzyp7mag1z7dbp306qm2sf4k3a0frpsz2n2ijsw"; + libraryHaskellDepends = [ base regex-tdfa scientific text ]; testHaskellDepends = [ - base bytestring directory HUnit optparse-applicative text + aeson base hspec QuickCheck regex-tdfa scientific text ]; - description = "Haskell binding to Mercury API for ThingMagic RFID readers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + description = "Data Validation"; + license = stdenv.lib.licenses.bsd3; }) {}; - "mercury-api_0_1_0_2" = callPackage + "mercury-api" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory , hashable, HUnit, optparse-applicative, text, unordered-containers }: @@ -144597,6 +144996,8 @@ self: { pname = "miss"; version = "0"; sha256 = "1xcbjmv2fyjffn1j2xhn0glvxdb2cqd8frvc9yr1pgz6874sv60w"; + revision = "1"; + editedCabalFile = "0m4dvn39917fxmgd2ahigz70qqy4ccfsi4n0885v82kiqwgmvxxq"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring containers cryptohash-sha1 deepseq digest exceptions filesystem-abstractions @@ -145202,13 +145603,14 @@ self: { }: mkDerivation { pname = "modularity"; - version = "0.2.0.3"; - sha256 = "1w1w9fcsh758wnnq3i1c4bklpg5m622lh3qybddacs65gvih64sy"; + version = "0.2.1.0"; + sha256 = "1xs9hdxsdpylhq3dzmyxfycwyqzy3v1zz48gvzpfcamfivxxpdph"; libraryHaskellDepends = [ base eigen hmatrix sparse-linear-algebra spectral-clustering vector ]; description = "Find the modularity of a network"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "module-management" = callPackage @@ -145576,17 +145978,20 @@ self: { }) {}; "monad-dijkstra" = callPackage - ({ mkDerivation, base, free, hlint, mtl, psqueues, tasty - , tasty-hspec, transformers + ({ mkDerivation, base, containers, free, hlint, mtl, psqueues + , tasty, tasty-hspec, transformers }: mkDerivation { pname = "monad-dijkstra"; - version = "0.1.1.1"; - sha256 = "0j29ffim7hwvj791na92yrbgly1frn0qvcpyc1z29837kawap190"; - libraryHaskellDepends = [ base free mtl psqueues transformers ]; + version = "0.1.1.2"; + sha256 = "1890rnypk3ra4f0f3m7nr31df3x6pmpw6ivid77wj7h9mdp0bdb6"; + libraryHaskellDepends = [ + base containers free mtl psqueues transformers + ]; testHaskellDepends = [ base hlint tasty tasty-hspec ]; - description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm"; + description = "A monad transformer for weighted graph searches"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-exception" = callPackage @@ -146457,10 +146862,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monadLib"; - version = "3.8"; - sha256 = "1y414xfaavp63w5za4jby4cnaqwivkvkxxknb488z1k040kiisv1"; - revision = "1"; - editedCabalFile = "1mnzhliilvhsynv5h7rqchngvf8by1z33j4lj8zqqzl1xdmy2knx"; + version = "3.9"; + sha256 = "1vibzls4ld4v7rib14nb9blni1c42csv4b1igaplks85xyr5grrm"; libraryHaskellDepends = [ base ]; description = "A collection of monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -147381,11 +147784,12 @@ self: { ({ mkDerivation, morphisms }: mkDerivation { pname = "morphisms-functors"; - version = "0.1.6"; - sha256 = "103mg7pdykmiyx4xygrrygamj1d26v3xlph14l3w1hh02i6w4x4h"; + version = "0.1.7"; + sha256 = "1mv2sjn68n55482496icg84nbf3mn85fizf4q42781qn689np60q"; libraryHaskellDepends = [ morphisms ]; description = "Functors, theirs compositions and transformations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "morphisms-functors-inventory" = callPackage @@ -147397,6 +147801,7 @@ self: { libraryHaskellDepends = [ morphisms morphisms-functors ]; description = "Inventory is state and store"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "morphisms-objects" = callPackage @@ -147408,6 +147813,7 @@ self: { libraryHaskellDepends = [ morphisms ]; description = "Algebraic structures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "morte" = callPackage @@ -147718,21 +148124,21 @@ self: { }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage - ({ mkDerivation, base, binary, bytestring, c2hs, criterion - , monad-loops, openmpi, packman, store + ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion + , monad-loops, openmpi, store }: mkDerivation { pname = "mpi-hs"; - version = "0.4.1.0"; - sha256 = "0bf0ghzvakww5slvfd3fq0sa0972i6y60lg6ibby49nslfkl52wd"; + version = "0.5.1.1"; + sha256 = "0vvbvck5hd3ca1l1bdcnkkb5p2xf9gj9ljf8v130x0fx3zhxjp13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring monad-loops packman store + base binary bytestring cereal monad-loops store ]; librarySystemDepends = [ openmpi ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base binary ]; testHaskellDepends = [ base monad-loops ]; benchmarkHaskellDepends = [ base criterion ]; description = "MPI bindings for Haskell"; @@ -148863,6 +149269,8 @@ self: { pname = "multiset-comb"; version = "0.2.4.1"; sha256 = "1nih0101d6z2m4wi22804vjxrd5nr35mmqk31lm7bhanmwnl7qwa"; + revision = "1"; + editedCabalFile = "1amjahzg4lpgmhf4v456waa216afjpq3gcb45pqid5km9z1ycjdg"; libraryHaskellDepends = [ base containers transformers ]; description = "Combinatorial algorithms over multisets"; license = stdenv.lib.licenses.bsd3; @@ -149623,6 +150031,7 @@ self: { libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-random-monad" = callPackage @@ -149911,8 +150320,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.6"; - sha256 = "1vlr4z3ng8sibb7g8363xlhff3811z8b5nmm0ljai6r5r5hrym4y"; + version = "0.1.7"; + sha256 = "1nbj958nsr568c1mhwhcidz8d1p35c6b99m8xz2z0w8ig737nbgg"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ mysql ]; @@ -149948,8 +150357,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.8.4.1"; - sha256 = "0m3kqm5ldy47gv0gbh3sxv2zm4kmszw96r5sar5bzb3v9jvmz94x"; + version = "0.8.4.2"; + sha256 = "1lg9w9kwjnrx948r24flw0yjwxc8f93ygg45dl2djk4kfxdfnlaz"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring bytestring-lexing cryptonite io-streams memory monad-loops network @@ -150408,8 +150817,8 @@ self: { ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { pname = "namespace"; - version = "0.1.4.0"; - sha256 = "12v2mk4wcqsdcwym6dbwkwcamr04l4vncdwfj0bsnxzvf4mjzx7p"; + version = "0.1.4.1"; + sha256 = "14z8g7nya4pp4gvspcmz4pkz1vd9g268pav2xxb203vi7va7wbff"; libraryHaskellDepends = [ base containers monoid-extras ]; testHaskellDepends = [ base ]; description = "A Generic Haskell library for managing namespaces"; @@ -150524,8 +150933,10 @@ self: { }: mkDerivation { pname = "nanomsg-haskell"; - version = "0.2.3"; - sha256 = "0q9zjay4njlr3dakmwhcmyhh3hw7p3q2ani3s5acmm3zdj25slqx"; + version = "0.2.4"; + sha256 = "00941a7vp6y4gzxpjlr4516ic96l5892w0akqajq3jyh5601jqg3"; + revision = "1"; + editedCabalFile = "02ahbmda51j7ayvda9nwvkbw8wnd1gm9kqa3lqdqh8s587wl4wm7"; libraryHaskellDepends = [ base binary bytestring ]; librarySystemDepends = [ nanomsg ]; testHaskellDepends = [ @@ -151355,26 +151766,27 @@ self: { "net-mqtt" = callPackage ({ mkDerivation, async, attoparsec, base, binary, bytestring , conduit, conduit-extra, containers, HUnit, network-conduit-tls - , QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck, text + , network-uri, QuickCheck, stm, tasty, tasty-hunit + , tasty-quickcheck, text }: mkDerivation { pname = "net-mqtt"; - version = "0.2.1.0"; - sha256 = "177w50gcjj7n44y9q4q5xb3gh42ivx7ld7ha3mqg8ik803q523y9"; + version = "0.2.2.0"; + sha256 = "1pmjlj90jzyg7ypzaiyw4cl8qv6h5l7923b3zhfwsvi07c2lwi1h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec base binary bytestring conduit conduit-extra - containers network-conduit-tls stm text + containers network-conduit-tls network-uri stm text ]; executableHaskellDepends = [ async attoparsec base binary bytestring conduit conduit-extra - containers network-conduit-tls stm text + containers network-conduit-tls network-uri stm text ]; testHaskellDepends = [ async attoparsec base binary bytestring conduit conduit-extra - containers HUnit network-conduit-tls QuickCheck stm tasty - tasty-hunit tasty-quickcheck text + containers HUnit network-conduit-tls network-uri QuickCheck stm + tasty tasty-hunit tasty-quickcheck text ]; description = "An MQTT Protocol Implementation"; license = stdenv.lib.licenses.bsd3; @@ -151479,16 +151891,31 @@ self: { }) {}; "netlib-carray" = callPackage - ({ mkDerivation, base, carray, netlib-ffi, transformers }: + ({ mkDerivation, array, base, carray, netlib-ffi, transformers }: mkDerivation { pname = "netlib-carray"; - version = "0.0.1.1"; - sha256 = "1vxyffhpayyxwak36b9i7gw35gz61ym9lxnhk45l0h4js3v05iwv"; - libraryHaskellDepends = [ base carray netlib-ffi transformers ]; + version = "0.1"; + sha256 = "0rh4m4xxwm8n0577khqa2cx74hnwmgz94phq2rwhsdppg6dd2xx5"; + libraryHaskellDepends = [ + array base carray netlib-ffi transformers + ]; description = "Helper modules for CArray wrappers to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; }) {}; + "netlib-comfort-array" = callPackage + ({ mkDerivation, base, comfort-array, netlib-ffi, transformers }: + mkDerivation { + pname = "netlib-comfort-array"; + version = "0.0"; + sha256 = "1lr28jpv4yznkfak9jvcmjnxfy6334bplvq8rkf7nsqs6jbjx3al"; + libraryHaskellDepends = [ + base comfort-array netlib-ffi transformers + ]; + description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "netlib-ffi" = callPackage ({ mkDerivation, base, guarded-allocation, storable-complex , transformers @@ -151843,6 +152270,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network_3_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, hspec + , hspec-discover, HUnit, unix + }: + mkDerivation { + pname = "network"; + version = "3.0.0.0"; + sha256 = "1j9lhyb50k056ynyfsyh1ak9gn1knh11cyajlnbix8yhahm2mkla"; + libraryHaskellDepends = [ base bytestring deepseq unix ]; + testHaskellDepends = [ base bytestring directory hspec HUnit ]; + testToolDepends = [ hspec-discover ]; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-address" = callPackage ({ mkDerivation, base, Cabal, QuickCheck, test-framework , test-framework-quickcheck2 @@ -151998,15 +152441,15 @@ self: { }) {}; "network-bsd" = callPackage - ({ mkDerivation, base, network }: + ({ mkDerivation, base, deepseq, network }: mkDerivation { pname = "network-bsd"; - version = "2.8.0.0"; - sha256 = "0dfbwgrr28y6ypw7p1ppqg7v746qf14569q4xazj4ahdjw2xkpi5"; - libraryHaskellDepends = [ base network ]; - doHaddock = false; - description = "Network.BSD"; + version = "2.8.1.0"; + sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; + libraryHaskellDepends = [ base deepseq network ]; + description = "POSIX network database (<netdb.h>) API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-builder" = callPackage @@ -152049,6 +152492,8 @@ self: { pname = "network-bytestring"; version = "0.1.3.4"; sha256 = "19m10mj9nqsa7s0syv9dyhqkhvmf2h7yna8n7bq0xkdp8m9l0g96"; + revision = "1"; + editedCabalFile = "0znp4qkad1sd650kjqhbbrr2ap7bb772g3db92k7r2rrydr19cdl"; libraryHaskellDepends = [ base bytestring network unix ]; description = "Fast, memory-efficient, low-level networking"; license = stdenv.lib.licenses.bsd3; @@ -152781,8 +153226,8 @@ self: { ({ mkDerivation, base, doctest, network-uri, template-haskell }: mkDerivation { pname = "network-uri-static"; - version = "0.1.2.0"; - sha256 = "1r1blpz313v6qacvbns53c2i1zgvadvl0ibmp2s3bv1ymm4caj74"; + version = "0.1.2.1"; + sha256 = "0sfyqkm49vgw6x2xkgaa0lv2fmrzwgcz33ch333jsib0qbmji5vw"; libraryHaskellDepends = [ base network-uri template-haskell ]; testHaskellDepends = [ base doctest ]; description = "A small utility to declare type-safe static URIs"; @@ -153156,8 +153601,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.6.2"; - sha256 = "1wvh33raci7s4hczcfn5sj2kk1g61ry6xwn3lg7g3yy5bn7azv73"; + version = "1.6.4"; + sha256 = "13q2699mamkqfkklk6wgm9jzsb650lrbiqsf8sg66yvhgrxmmk0i"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -153172,8 +153617,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.2.4"; - sha256 = "0a8w68bzlh7v2b9infvxlscg3mnfi8fngi7z3bap3zwbz86hwb0k"; + version = "0.4.4.0"; + sha256 = "19x6qzryjdac1alq4wsmy0as6258ga9b3ga3iszqwvqjdpc89a6n"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -153943,10 +154388,8 @@ self: { }: mkDerivation { pname = "non-empty"; - version = "0.3.0.1"; - sha256 = "00zbnpcnmchbbdgyw19m1bl3bdhmw89pp9k0mq3z75nz0i40gg9z"; - revision = "1"; - editedCabalFile = "1628z42q77xjvwpyx3rifqf6mh4y6ivdl0lkhngxwz8c21bnf7d3"; + version = "0.3.1"; + sha256 = "0118vf88pzx1spzx4amc9sxz5vdrmfpryp816fh9l7k5hnzhy0bh"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -154381,10 +154824,10 @@ self: { ({ mkDerivation, base, containers, numeric-prelude, primes }: mkDerivation { pname = "np-extras"; - version = "0.3.1.1"; - sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf"; - revision = "2"; - editedCabalFile = "01jp7y4lsdxlfrbi5vqsc5iyjzzc996w7g88amkkfg5k6amlxb9r"; + version = "0.3.1.2"; + sha256 = "1nah4gxagr02nhwbyq2zinx6nj93h40lyw6fv1bv16x8v3d8p69m"; + revision = "1"; + editedCabalFile = "1imcizgbckwcmxwjicads55g0v6abprz3g69b6blkkgmcq5r9x6b"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -154607,6 +155050,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "num-non-negative" = callPackage + ({ mkDerivation, base, inj }: + mkDerivation { + pname = "num-non-negative"; + version = "0.1"; + sha256 = "0ikhjcjwziv55gnf79fhajhgp5m3441snxg8amc241h5iw4rls8x"; + libraryHaskellDepends = [ base inj ]; + description = "Non-negative numbers"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "number" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -157008,6 +157462,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "openssl-streams_1_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams + , network, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "openssl-streams"; + version = "1.2.2.0"; + sha256 = "0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL io-streams network + ]; + testHaskellDepends = [ + base bytestring HsOpenSSL HUnit io-streams network test-framework + test-framework-hunit + ]; + description = "OpenSSL network support for io-streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opentheory" = callPackage ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { @@ -158198,8 +158672,8 @@ self: { pname = "ottparse-pretty"; version = "0.1.2.6"; sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5"; - revision = "2"; - editedCabalFile = "05fxdr12vwf486609f8ld6d3cgpr632402n404gi8hgxj5ijc6yx"; + revision = "3"; + editedCabalFile = "0g17l53dp1vcn2yzv37yvph9r4jsw4lgwip4l3h038r9g940lwjc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158896,6 +159370,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.4.0"; sha256 = "15vfqpfkw4wnsg98804l5ylqbc926s2j5z4ik5zhval4d3kiamgz"; + revision = "1"; + editedCabalFile = "06ic2286am3jpmlb6jxnrx0y9c7rh5rs3l0chv1s5ahharp341g9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -159234,6 +159710,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandora" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "pandora"; + version = "0.1.0"; + sha256 = "1hfm9a8rfjksjv8qmz8a17f9pg1qw2rizaakl108lafckbz7f4ya"; + description = "A box of patterns and paradigms"; + license = stdenv.lib.licenses.mit; + }) {}; + "pang-a-lambda" = callPackage ({ mkDerivation, base, bytestring, containers, IfElse, mtl, SDL , SDL-gfx, SDL-ttf, transformers, Yampa @@ -160880,8 +161366,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.1.2"; - sha256 = "0lvgb0jl0bfzjqpap3gxlhn0mhbwbd15h33l1idpghxqpmzgvczy"; + version = "0.8.2.0"; + sha256 = "04cvvff88ga3s22rcsjiyifdggjqpymfkbbcay7ibjhmiqwhisfq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161988,23 +162474,19 @@ self: { "pencil" = callPackage ({ mkDerivation, base, data-default, directory, doctest - , edit-distance, feed, filepath, hashable, hsass, mtl, pandoc - , parsec, semigroups, text, time, unordered-containers, vector, xml - , yaml + , edit-distance, filepath, hashable, hsass, mtl, pandoc, parsec + , semigroups, text, time, unordered-containers, vector, xml, yaml }: mkDerivation { pname = "pencil"; - version = "0.1.2"; - sha256 = "0wgs79vsz52cnmbcfzbb3avn98ciadnispgr98h6kwhgj5pmaxbm"; - isLibrary = true; - isExecutable = true; + version = "0.1.3"; + sha256 = "0kga9i19qxp6g51dyavnybfs6znsija87hxsfrxblsyi4gqs9hbp"; libraryHaskellDepends = [ - base data-default directory edit-distance feed filepath hashable - hsass mtl pandoc parsec semigroups text time unordered-containers - vector xml yaml + base data-default directory edit-distance filepath hashable hsass + mtl pandoc parsec semigroups text time unordered-containers vector + xml yaml ]; - executableHaskellDepends = [ base text unordered-containers ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ base doctest text unordered-containers ]; description = "Static site generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -162524,10 +163006,10 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.9.0"; - sha256 = "0qgjfydyhcyfr8mni0qjykn3jsh4r299yy2wqsl3rsd19bmmr1p7"; - revision = "2"; - editedCabalFile = "1szx008irw7w2h9qz443mml06sg6w9vazbxxyi67d91hyjlgca2j"; + version = "2.9.1"; + sha256 = "1b6shb1d8p7dapj428glmsy7w69424bxrvgf7ws8jd266h4gshk7"; + revision = "1"; + editedCabalFile = "1ing9cdpafmfx0mpvrl3xzfvmw5aw2lpiq69nnhrsmlhb9pi8ni0"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers fast-logger http-api-data @@ -162769,6 +163251,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-mysql-haskell_0_5_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-logger, mysql-haskell, network, persistent + , persistent-template, resource-pool, resourcet, text, time, tls + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.5.2"; + sha256 = "1kc2q9cbgij5b5kz70jcy694v2frgzzb7mvld8dypsz11dlpmhjn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-logger + mysql-haskell network persistent resource-pool resourcet text time + tls transformers unliftio-core + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -162932,6 +163439,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-spatial" = callPackage + ({ mkDerivation, aeson, base, hspec, http-api-data + , integer-logarithms, lens, persistent, QuickCheck, text + }: + mkDerivation { + pname = "persistent-spatial"; + version = "0.1.0.0"; + sha256 = "0x9ialzl7mmq3h4nx79z51czddn7xgs0sngixc38cdlmddvm2g36"; + libraryHaskellDepends = [ + aeson base http-api-data integer-logarithms lens persistent text + ]; + testHaskellDepends = [ + aeson base hspec http-api-data persistent QuickCheck text + ]; + description = "Database agnostic, spatially indexed type for geographic points"; + license = stdenv.lib.licenses.mit; + }) {}; + "persistent-sqlite_2_6_4" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-control, monad-logger, old-locale @@ -163016,6 +163541,30 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template_2_6_0" = callPackage + ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers + , ghc-prim, hspec, http-api-data, monad-control, monad-logger + , path-pieces, persistent, QuickCheck, tagged, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.6.0"; + sha256 = "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv"; + libraryHaskellDepends = [ + aeson aeson-compat base bytestring containers ghc-prim + http-api-data monad-control monad-logger path-pieces persistent + tagged template-haskell text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text transformers + ]; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-template-classy" = callPackage ({ mkDerivation, base, lens, persistent, persistent-sqlite , persistent-template, template-haskell, text @@ -164091,8 +164640,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.10.1.3"; - sha256 = "1shn877lirnbbhk6wzbypv5j5cqh8wyvgg0333h7mhkmvkm0v569"; + version = "0.10.1.4"; + sha256 = "1kmkxcvkfqwp2p46s22gdnvk12g7bx9dqr8cs04wjw1rbj0mli49"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random text time @@ -167309,8 +167858,8 @@ self: { ({ mkDerivation, base, primitive, tasty, tasty-hunit }: mkDerivation { pname = "posix-api"; - version = "0.1.0.0"; - sha256 = "1f1cbvjak0ywhmrrjqvrjfzicq5jfxifxs6alp692rwnm2cbim07"; + version = "0.2.0.0"; + sha256 = "059b5zip3i7cfa977kz0jzxc7b8nws9libkxwf8pnvxk70i7apq1"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive tasty tasty-hunit ]; description = "posix bindings"; @@ -167684,6 +168233,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; + "postgresql-lo-stream" = callPackage + ({ mkDerivation, base, bytestring, io-streams, lifted-base + , monad-loops, mtl, postgresql-simple + }: + mkDerivation { + pname = "postgresql-lo-stream"; + version = "0.1.1.0"; + sha256 = "196f6lz8i8y0cfnd4lqjky69wpi0mc2jfs7jz5v0j3r15jbs5212"; + libraryHaskellDepends = [ + base bytestring io-streams lifted-base monad-loops mtl + postgresql-simple + ]; + description = "Utilities for streaming PostgreSQL LargeObjects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-named" = callPackage ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl , postgresql-libpq, postgresql-simple, utf8-string @@ -167838,8 +168404,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-migration"; - version = "0.1.13.1"; - sha256 = "0xblb0k3xnsbvdqrl5k3i6jimj4cskgip6w021byirn8i73s7j8a"; + version = "0.1.14.0"; + sha256 = "1z9fdfwpcnhbsq977070hn8ykxcnisjzvpdh5lz4bqirscx2gr2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168167,8 +168733,8 @@ self: { }: mkDerivation { pname = "postmaster"; - version = "0.3.2"; - sha256 = "1l1hq77qxi1f9nv7bxgkfvcm50p61svqvn9f59aq3b9zj2vikmf6"; + version = "0.3.3"; + sha256 = "05608xvaig1d67j3h8ykw7a11yr1mqkw98p0ii7gbp4mp3d9kncd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -168198,8 +168764,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.1.3"; - sha256 = "1cg89jh2s2dim874h8vv52ab2dzvq01zvjn45fwdzs3j6815nlj4"; + version = "2.1.4.1"; + sha256 = "1hc7jp7q6mdqva40v0dppihp1bnl30h7vxnkawg0kmczq5p9js35"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -168229,21 +168795,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "potoki-conduit" = callPackage + ({ mkDerivation, acquire, base, base-prelude, bytestring, conduit + , potoki, potoki-core, profunctors, QuickCheck + , quickcheck-instances, rerebase, slave-thread, stm-chans, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "potoki-conduit"; + version = "0.1"; + sha256 = "11hg5zib91b1kp75amlng96b1n357rkj120afnc0825vvb81ky14"; + libraryHaskellDepends = [ + acquire base base-prelude bytestring conduit potoki-core + profunctors slave-thread stm-chans text + ]; + testHaskellDepends = [ + conduit potoki QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Integration of \"potoki\" and \"conduit\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "potoki-core" = callPackage ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion , deepseq, deferred-folds, directory, foldl, hashable, ilist , primitive, profunctors, ptr, QuickCheck, quickcheck-instances - , random, rerebase, scanner, split, stm, tasty, tasty-hunit - , tasty-quickcheck, text, text-builder, time, transformers - , unordered-containers, vector + , random, rerebase, scanner, split, stm, stm-chans, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "potoki-core"; - version = "2.3.3"; - sha256 = "1f6rr75h4cqgy1qjh5qplcq1qz2pwc11mi4k61z691clz5yfmbm0"; + version = "2.3.4.1"; + sha256 = "0mg8hd85xim33jv1abzgjfcy85mmrrvs30gpvspdci5d7xghqrmv"; libraryHaskellDepends = [ acquire attoparsec base bytestring deepseq deferred-folds directory - foldl hashable primitive profunctors ptr scanner stm text + foldl hashable primitive profunctors ptr scanner stm stm-chans text text-builder time transformers unordered-containers vector ]; testHaskellDepends = [ @@ -168723,6 +169312,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "prefetch" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "prefetch"; + version = "0.1.0.0"; + sha256 = "0qc4khx92xqjzq8pp5agxzh9l1l79np32s7af1kffpvffz4r5rpn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base bytestring ]; + description = "Prefetch stdin even before stdout is ready"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prefix-expression" = callPackage ({ mkDerivation, base, hspec, regex-pcre-builtin }: mkDerivation { @@ -169257,6 +169859,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-types_0_3_0_1" = callPackage + ({ mkDerivation, base, hspec, mtl, tagged }: + mkDerivation { + pname = "pretty-types"; + version = "0.3.0.1"; + sha256 = "06dkyk3zdi9wv77yza0vgwl9v8zhyazyhdjbffkqpism07c80rgv"; + libraryHaskellDepends = [ base mtl tagged ]; + testHaskellDepends = [ base hspec tagged ]; + description = "A small pretty printing DSL for complex types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyFunctionComposing" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -170666,8 +171281,8 @@ self: { }: mkDerivation { pname = "prolog"; - version = "0.2.0.1"; - sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0"; + version = "0.2.1.1"; + sha256 = "0cl1d4d4jgkqk37q2n3n7xqmd847srd6sqikciz4b8cfp57lw8m7"; libraryHaskellDepends = [ base containers mtl parsec syb template-haskell th-lift transformers @@ -170699,8 +171314,8 @@ self: { ({ mkDerivation, base, fgl, graphviz, mtl, prolog, text }: mkDerivation { pname = "prolog-graph-lib"; - version = "0.2.0.1"; - sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr"; + version = "0.2.1.1"; + sha256 = "1qxikgryyh47zm0qwbsa7lpqmiphbl1askjjjc0rfr9dh5f0wclr"; libraryHaskellDepends = [ base fgl graphviz mtl prolog text ]; description = "Generating images of resolution trees for Prolog queries"; license = stdenv.lib.licenses.publicDomain; @@ -170739,8 +171354,8 @@ self: { }: mkDerivation { pname = "prometheus"; - version = "2.1.0"; - sha256 = "0kpzfmdibpp08rhc8v92nizi8hbb9dm7ysqd0wclx9s5273zqxal"; + version = "2.1.1"; + sha256 = "09g3xi6x6m6h15p3ibwyabfq15rhcaphq7ix2w23aphjwc64ll97"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-client http-types network-uri text transformers wai warp @@ -170820,6 +171435,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "prometheus-proc" = callPackage + ({ mkDerivation, base, filepath, prometheus-client + , regex-applicative, unix, unix-memory + }: + mkDerivation { + pname = "prometheus-proc"; + version = "0.1.0.0"; + sha256 = "1384kcsnhby17ivjlii2ixqw1qhas6y4l1h8vq3lzaxqydbidhbm"; + libraryHaskellDepends = [ + base filepath prometheus-client regex-applicative unix unix-memory + ]; + description = "Export metrics from /proc for the current process"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "promise" = callPackage ({ mkDerivation, async, base }: mkDerivation { @@ -170911,8 +171541,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.5.0"; - sha256 = "0mcj3xsi125vcxf605h8fm4swg84b79iv01qnhv5vmp872dhmwbv"; + version = "5.6.1"; + sha256 = "1wbh9vc0jkdqsrqfnxvz2498awqkr0jph9qv6c0zwbqm7zbjzn04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171699,31 +172329,6 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.7.0"; - sha256 = "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc"; - revision = "1"; - editedCabalFile = "0ncag4p7v41x5disbvkwzmv0c7ifc85lmjljzvf8d33arh7b08bj"; - libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; - testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq fingertree-psqueue ghc-prim - hashable mtl PSQueue random unordered-containers - ]; - description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "psqueues_0_2_7_1" = callPackage - ({ mkDerivation, array, base, containers, criterion, deepseq - , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue - , QuickCheck, random, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2, unordered-containers - }: - mkDerivation { - pname = "psqueues"; version = "0.2.7.1"; sha256 = "1hcfxb977lzxsmd47z0snjj4xdhiwnqzif8xkpwzw28dspn44zh4"; revision = "1"; @@ -171739,7 +172344,6 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pstemmer" = callPackage @@ -171817,8 +172421,8 @@ self: { }: mkDerivation { pname = "publicsuffix"; - version = "0.20180825"; - sha256 = "0wyni1f9v647zb7hg70da4s30dplv6whywd0jwghph1vqdlzlbma"; + version = "0.20190115"; + sha256 = "1w73kpqb8s6yc7h66cam89gcmz6qnsgis2fqvyr9vrqs466k3j01"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -172619,30 +173223,6 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.6"; - sha256 = "0i5lf3aniff8lnvgkl3mmy5xbjr130baz1h25p6q3asapirbj1k0"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-types memory text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hspec - http-client http-types QuickCheck scientific text time transformers - unordered-containers vector - ]; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pusher-http-haskell_1_5_1_7" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-types, memory - , QuickCheck, scientific, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "pusher-http-haskell"; version = "1.5.1.7"; sha256 = "01p168y4hwn38b4lpf3pi7pv5w46pd8gmli42q7bs3jxd6jhhppc"; libraryHaskellDepends = [ @@ -172657,7 +173237,6 @@ self: { ]; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -173110,8 +173689,8 @@ self: { }: mkDerivation { pname = "qnap-decrypt"; - version = "0.3.3"; - sha256 = "0gwnpyzyrfw6i8a5arm8q6psjhwa8kl8n94wcglsnl59k1iadfb6"; + version = "0.3.4"; + sha256 = "0s263zkdns50bvanjiaiavdk6bpd1ccqbckdmxwbbl2sxp2s3jxz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -173813,6 +174392,7 @@ self: { ]; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage @@ -174051,31 +174631,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "quickcheck-state-machine_0_5_0" = callPackage + "quickcheck-state-machine_0_6_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , directory, doctest, exceptions, filelock, filepath, http-client , matrix, monad-logger, mtl, network, persistent , persistent-postgresql, persistent-template, pretty-show, process , QuickCheck, quickcheck-instances, random, resourcet, servant - , servant-client, servant-server, split, strict, string-conversions - , tasty, tasty-hunit, tasty-quickcheck, text, tree-diff, unliftio - , vector, wai, warp + , servant-client, servant-server, strict, string-conversions, tasty + , tasty-hunit, tasty-quickcheck, text, tree-diff, unliftio, vector + , wai, warp }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.5.0"; - sha256 = "0wds624fhvzwxcbrr05pgfq802c5namrsqpkdr2388j525374lsj"; + version = "0.6.0"; + sha256 = "0zbjap2jjd534w6cigi4xz34x3f6w8icvxyvxs35j61c52cp2pry"; libraryHaskellDepends = [ ansi-wl-pprint base containers exceptions matrix mtl pretty-show - QuickCheck split tree-diff unliftio vector + QuickCheck tree-diff unliftio vector ]; testHaskellDepends = [ base bytestring containers directory doctest filelock filepath http-client matrix monad-logger mtl network persistent - persistent-postgresql persistent-template process QuickCheck - quickcheck-instances random resourcet servant servant-client - servant-server strict string-conversions tasty tasty-hunit - tasty-quickcheck text tree-diff unliftio vector wai warp + persistent-postgresql persistent-template pretty-show process + QuickCheck quickcheck-instances random resourcet servant + servant-client servant-server strict string-conversions tasty + tasty-hunit tasty-quickcheck text tree-diff unliftio vector wai + warp ]; description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; @@ -174135,6 +174716,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quickcheck-transformer" = callPackage + ({ mkDerivation, base, QuickCheck, random, transformers }: + mkDerivation { + pname = "quickcheck-transformer"; + version = "0.3"; + sha256 = "1lj6w1ywy8bixiwvapgb7ng5yy0nrxgvr8y9dn4kl3yvah936k4j"; + libraryHaskellDepends = [ base QuickCheck random transformers ]; + description = "A GenT monad transformer for QuickCheck library"; + license = stdenv.lib.licenses.mit; + }) {}; + "quickcheck-unicode" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -174673,8 +175265,8 @@ self: { }: mkDerivation { pname = "radius"; - version = "0.6.0.0"; - sha256 = "02jvlbj3w5ww59ms37l24crr8vib7ghzr9y79bip3p4mhpi4c32l"; + version = "0.6.0.1"; + sha256 = "19c2bv0iq4j0709rf9k9jk5q2s756bvjnr1gy630mcgp92rg8d9j"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -175522,6 +176114,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rank2classes_1_2_1" = callPackage + ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit + , template-haskell, transformers + }: + mkDerivation { + pname = "rank2classes"; + version = "1.2.1"; + sha256 = "0dbg5hc8vy0nikyw9h99d9z5jpwfzqb3jwg1li5h281fi5cm4nb0"; + libraryHaskellDepends = [ + base distributive template-haskell transformers + ]; + testHaskellDepends = [ + base distributive doctest tasty tasty-hunit + ]; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rapid" = callPackage ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { @@ -175823,8 +176434,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.7"; - sha256 = "1kp6f45wn3a7wnsvj08a3b0kp5wwprw4rjrrqqd22yr9mpwx2z7w"; + version = "1.0.8"; + sha256 = "045hr0jilydb1xcvhh9q5iwazpf1k1d2q1y0h4gkgnbn6qmgwhnk"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -175843,8 +176454,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.0.4"; - sha256 = "1cri461f40xa43kwg3wq5k98irfqypsi97xdk9n60yqhc8msca4m"; + version = "1.0.5"; + sha256 = "07k2gzc2by6zhsk1zqp0kjk37zc6ikigdp0j5d38pd7x30a7qk7x"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -175906,6 +176517,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rattletrap_6_2_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits + , bytestring, clock, containers, filepath, http-client + , http-client-tls, HUnit, template-haskell, temporary, text + , transformers + }: + mkDerivation { + pname = "rattletrap"; + version = "6.2.1"; + sha256 = "0pygwgq5q6mvpbkis2xiw6ac65fn8q9452qql5dc21p4mi27bwka"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + testHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring clock + containers filepath http-client http-client-tls HUnit + template-haskell temporary text transformers + ]; + description = "Parse and generate Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers @@ -176157,6 +176800,7 @@ self: { ]; description = "Read-Copy-Update for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rdf" = callPackage @@ -176979,15 +177623,20 @@ self: { }) {}; "record-encode" = callPackage - ({ mkDerivation, base, generics-sop, hspec, QuickCheck, vector }: + ({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck + , vector + }: mkDerivation { pname = "record-encode"; - version = "0.2.2"; - sha256 = "1wdrvj2ilf5kqchfcfd3pnqgprc86fri7ajc5r0xqf6zc61s1fgk"; + version = "0.2.3"; + sha256 = "0xljdy3wfyirs3zwc1ij19w9520bc1n56cdigngfb9hs497d6jh3"; libraryHaskellDepends = [ base generics-sop vector ]; - testHaskellDepends = [ base generics-sop hspec QuickCheck vector ]; + testHaskellDepends = [ + base doctest generics-sop hspec QuickCheck vector + ]; description = "Generic encoding of records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-gl" = callPackage @@ -177135,6 +177784,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "recursion-schemes_5_1_1" = callPackage + ({ mkDerivation, base, base-orphans, comonad, free, HUnit + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "recursion-schemes"; + version = "5.1.1"; + sha256 = "0qw112jkl6jzy3wcyxvv5liv16mxiiqi5v5zyzazl9p8h2wy1rb0"; + libraryHaskellDepends = [ + base base-orphans comonad free template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; + description = "Representing common recursion patterns as higher-order functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq , hspec, lens, recursion-schemes @@ -177185,6 +177852,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "red-black-record" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, profunctors + , sop-core, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "red-black-record"; + version = "1.1.0.0"; + sha256 = "12q3b44qcb8zp5m0zrbj88kigk00rm6ljrnpwd29wv1gdwzd15af"; + libraryHaskellDepends = [ base sop-core ]; + testHaskellDepends = [ + aeson base bytestring doctest profunctors sop-core tasty + tasty-hunit text + ]; + description = "Extensible records and variants indexed by a type-level Red-Black tree"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "red-black-tree" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -177502,6 +178186,8 @@ self: { pname = "ref-tf"; version = "0.4.0.1"; sha256 = "03mywifasfvxlz7hy5bbq3i8zi3i99k5cb0kq38gndx4vk2j5dgw"; + revision = "1"; + editedCabalFile = "042nn6y3rbx9z88bkidy1ilp32grm6a1n0ny1wrzxdp46xi5r7in"; libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using type families"; license = stdenv.lib.licenses.bsd3; @@ -177647,27 +178333,37 @@ self: { }) {}; "reflex" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq - , dependent-map, dependent-sum, exception-transformers - , haskell-src-exts, haskell-src-meta, MemoTrie, mtl, primitive - , ref-tf, semigroups, split, stm, syb, template-haskell, these - , transformers, transformers-compat + ({ mkDerivation, base, bifunctors, comonad, containers, criterion + , data-default, deepseq, dependent-map, dependent-sum, directory + , exception-transformers, filemanip, filepath, haskell-src-exts + , haskell-src-meta, hlint, lens, loch-th, MemoTrie, monad-control + , monoidal-containers, mtl, prim-uniq, primitive, process, random + , ref-tf, reflection, semigroupoids, semigroups, split, stm, syb + , template-haskell, these, time, transformers, transformers-compat + , unbounded-delays }: mkDerivation { pname = "reflex"; - version = "0.4.0.1"; - sha256 = "1v4wwy2qc1gb914w5nqjvf7gibdw9yakmhdg260yjxbv1fkg8gyc"; + version = "0.5"; + sha256 = "0c9idjkbnw822ky7dn374vq43kivdy0znf2k2w43q7yw7snjh09r"; + revision = "1"; + editedCabalFile = "1l5xsinln6wyj726ilqvvg4y0qk645j5ffiyhmda8qi9rmyk2a2x"; libraryHaskellDepends = [ - base containers dependent-map dependent-sum exception-transformers - haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups - syb template-haskell these transformers transformers-compat + base bifunctors comonad containers data-default dependent-map + dependent-sum exception-transformers haskell-src-exts + haskell-src-meta lens MemoTrie monad-control monoidal-containers + mtl prim-uniq primitive random ref-tf reflection semigroupoids + semigroups stm syb template-haskell these time transformers + transformers-compat unbounded-delays ]; testHaskellDepends = [ - base containers dependent-map MemoTrie mtl ref-tf + base bifunctors containers deepseq dependent-map dependent-sum + directory filemanip filepath hlint lens monoidal-containers mtl + ref-tf semigroups split these transformers ]; benchmarkHaskellDepends = [ - base containers criterion deepseq dependent-map dependent-sum mtl - primitive ref-tf split stm transformers + base containers criterion deepseq dependent-map dependent-sum + loch-th mtl primitive process ref-tf split stm time transformers ]; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; @@ -177692,25 +178388,17 @@ self: { }) {}; "reflex-dom" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, containers - , data-default, dependent-map, dependent-sum - , dependent-sum-template, directory, exception-transformers - , ghcjs-dom, glib, gtk3, lens, mtl, raw-strings-qq, ref-tf, reflex - , safe, semigroups, text, these, time, transformers, unix - , webkitgtk3, webkitgtk3-javascriptcore + ({ mkDerivation, base, bytestring, jsaddle-webkit2gtk, reflex + , reflex-dom-core, text }: mkDerivation { pname = "reflex-dom"; - version = "0.3"; - sha256 = "0fldnl2yamn24v0qnfr4hhy4q9nq6kxspiy39yk5kdfvxg8aqax5"; - revision = "2"; - editedCabalFile = "0mb0mi9czwaqp7vinc081j85gbdrmrgbx07nfdqs6wmcinqf4sdm"; + version = "0.4"; + sha256 = "0l559x7w1r1mz8j3ln6x0l2kkl1l494q8zm5gai0rcpz9r1nqn9z"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base bifunctors bytestring containers data-default - dependent-map dependent-sum dependent-sum-template directory - exception-transformers ghcjs-dom glib gtk3 lens mtl raw-strings-qq - ref-tf reflex safe semigroups text these time transformers unix - webkitgtk3 webkitgtk3-javascriptcore + base bytestring jsaddle-webkit2gtk reflex reflex-dom-core text ]; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; @@ -177753,6 +178441,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reflex-dom-core" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder + , bytestring, constraints, containers, contravariant, data-default + , dependent-map, dependent-sum, dependent-sum-template, directory + , exception-transformers, ghcjs-dom, hlint, jsaddle, jsaddle-warp + , keycode, lens, linux-namespaces, monad-control, mtl, network-uri + , primitive, process, ref-tf, reflex, semigroups, stm + , template-haskell, temporary, text, these, transformers, unix + , zenc + }: + mkDerivation { + pname = "reflex-dom-core"; + version = "0.4"; + sha256 = "1p844d99zj3v54cn8ys12hbyan4f0y3nhgi42b03cq10az2pvsdv"; + libraryHaskellDepends = [ + aeson base bifunctors bimap blaze-builder bytestring constraints + containers contravariant data-default dependent-map dependent-sum + dependent-sum-template directory exception-transformers ghcjs-dom + jsaddle keycode lens monad-control mtl network-uri primitive ref-tf + reflex semigroups stm template-haskell text these transformers unix + zenc + ]; + testHaskellDepends = [ + base hlint jsaddle jsaddle-warp linux-namespaces process reflex + temporary unix + ]; + description = "Functional Reactive Web Apps with Reflex"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reflex-dom-fragment-shader-canvas" = callPackage ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens , reflex-dom, text, transformers @@ -178701,25 +179419,54 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, exceptions, hedgehog, hedgehog-corpus - , io-memoize, MonadRandom, mtl, protolude, random, resourcet, tasty + ({ mkDerivation, async, base, containers, exceptions, hashable + , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl + , protolude, random, resourcet, semigroupoids, semigroups, tasty , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base }: mkDerivation { pname = "registry"; - version = "0.1.2.2"; - sha256 = "1knhdrjj5y9p8974am4z31k163yjz3123lvjjk1ml4ba65afqhc7"; + version = "0.1.2.3"; + sha256 = "17jzvbig0zcmhb1vf2g286px35j3kh544rpsap0094lmj9yac7ni"; + libraryHaskellDepends = [ + base containers exceptions hashable mtl protolude resourcet + semigroupoids semigroups text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions hashable hedgehog hedgehog-corpus + io-memoize MonadRandom mtl protolude random resourcet semigroupoids + semigroups tasty tasty-discover tasty-hedgehog tasty-th text + transformers-base + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + }) {}; + + "registry_0_1_2_6" = callPackage + ({ mkDerivation, async, base, containers, exceptions, hashable + , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl + , protolude, random, resourcet, semigroupoids, semigroups, tasty + , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base + }: + mkDerivation { + pname = "registry"; + version = "0.1.2.6"; + sha256 = "0szzmk7rclzisz0ihs7cz6180wsfv6rkrfvvqk1v6das444y1bw3"; libraryHaskellDepends = [ - base exceptions mtl protolude resourcet text transformers-base + base containers exceptions hashable mtl protolude resourcet + semigroupoids semigroups text transformers-base ]; testHaskellDepends = [ - async base exceptions hedgehog hedgehog-corpus io-memoize - MonadRandom mtl protolude random resourcet tasty tasty-discover - tasty-hedgehog tasty-th text transformers-base + async base containers exceptions hashable hedgehog hedgehog-corpus + io-memoize MonadRandom mtl protolude random resourcet semigroupoids + semigroups tasty tasty-discover tasty-hedgehog tasty-th text + transformers-base ]; testToolDepends = [ tasty-discover ]; description = "data structure for assembling components"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regress" = callPackage @@ -179890,8 +180637,8 @@ self: { pname = "req"; version = "1.2.1"; sha256 = "1s8gjifc9jixl4551hay013fwyhlamcyrxjb00qr76wwikqa0g8k"; - revision = "1"; - editedCabalFile = "1ksqfsln8v08ibm89cgn1clxrvhk889421q5h52v1m9kzkh52njq"; + revision = "3"; + editedCabalFile = "1sbm2rk2q56gma2wja47q1rc8a2pizl8487g5z4fy1zynxm5inyj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -179918,8 +180665,8 @@ self: { pname = "req-conduit"; version = "1.0.0"; sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; - revision = "3"; - editedCabalFile = "1gnaq7ya4grjwadz58r9g10dybgg50ch89bhbnhyicdins2aa9b2"; + revision = "4"; + editedCabalFile = "13chmpfq1m1fgmgf7nxgs4dgfkpsv2khp4ma3cqqki76j1s8rq3p"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -180011,8 +180758,8 @@ self: { }: mkDerivation { pname = "require"; - version = "0.4.0"; - sha256 = "1kfi0y46ycjsylzv73lxh721a45qz5ki9m6czv4r53scrpbaywig"; + version = "0.4.2"; + sha256 = "03dhj1j9gp6mmgaxxkd1bf2i6hw78ql2qpi0qrdmx5dinclkidk7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181807,8 +182554,8 @@ self: { }: mkDerivation { pname = "rob"; - version = "0.0.2"; - sha256 = "1bbhv502c9r8d0kmrvl3q7yl12ykjwfvknlm0kmgnsv5lpz2zx59"; + version = "0.0.4"; + sha256 = "0ds0psp28fb5y21ycsxva1jqrbcvia94g3rk1b5p356php7zahsm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182186,6 +182933,7 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "RON, RON-RDT, and RON-Schema"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roots" = callPackage @@ -183917,42 +184665,42 @@ self: { }) {}; "salak" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , filepath, hspec, QuickCheck, scientific, text + ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen + , mtl, QuickCheck, scientific, stm, text, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "salak"; - version = "0.1.4"; - sha256 = "17zlgk85yp6ihfppf0simrvc70sk2a3jkjzxzzsgibyxmsm2jmxr"; + version = "0.1.8"; + sha256 = "1y8vssnp8q9hmhf3jckj8c7pgjmvz4wmvm8m5xwlnn9ll8csxs0q"; libraryHaskellDepends = [ - aeson base directory filepath scientific text unordered-containers - vector yaml + aeson base directory filepath menshen mtl scientific stm text + transformers unordered-containers vector yaml ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hspec - QuickCheck scientific text unordered-containers vector yaml + aeson base directory filepath hspec menshen mtl QuickCheck + scientific stm text transformers unordered-containers vector yaml ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; }) {}; - "salak_0_2_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , filepath, hspec, QuickCheck, scientific, text + "salak_0_2_3" = callPackage + ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen + , mtl, QuickCheck, scientific, stm, text, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "salak"; - version = "0.2.1"; - sha256 = "13hv4fcsb12fzn738jwlzqy70q5srmklrqk7vh3sk17iiwi6jci5"; + version = "0.2.3"; + sha256 = "1ifa4gvwm3sri6nmgqsi7vrl7vafyzraz9v2y3a8k7gmn0izkmb5"; libraryHaskellDepends = [ - aeson base directory filepath scientific text unordered-containers - vector yaml + aeson base directory filepath menshen mtl scientific stm text + transformers unordered-containers vector yaml ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hspec - QuickCheck scientific text unordered-containers vector yaml + aeson base directory filepath hspec menshen mtl QuickCheck + scientific stm text transformers unordered-containers vector yaml ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; @@ -184538,8 +185286,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.4.6"; - sha256 = "1f0smglnxblywzf553xhmzd2jyg67w14ylyc05hj6dx3fr3xls4m"; + version = "2.4.7"; + sha256 = "1ik254jzgazlbjm09nms8imansk8nb7hhghzyqjcgywg45i119i3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184603,6 +185351,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; + "sbv_8_0" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , crackNum, deepseq, directory, doctest, filepath, generic-deriving + , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, time, transformers, z3 + }: + mkDerivation { + pname = "sbv"; + version = "8.0"; + sha256 = "1bv5vf8r892q5ykh4xnzrczay6i423rbyk3rdz3z5ch4fyisvlrj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum deepseq directory filepath + generic-deriving ghc mtl pretty process QuickCheck random syb + template-haskell time transformers + ]; + testHaskellDepends = [ + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + testSystemDepends = [ z3 ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) z3;}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -184610,8 +185386,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "0.10"; - sha256 = "0yvvwkhvdfhy1i09br6ci8m4nchmmvn83glnqxd8s2zdmhmxsr54"; + version = "0.11"; + sha256 = "19gji0aqdi232x3y3vkpblwr6y63n7in92dq48ax67h6bqxwg5g2"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -185321,36 +186097,6 @@ self: { "scotty" = callPackage ({ mkDerivation, aeson, async, base, blaze-builder, bytestring , case-insensitive, data-default-class, directory, exceptions, fail - , hpc-coveralls, hspec, hspec-discover, hspec-wai, http-types - , lifted-base, monad-control, mtl, nats, network, regex-compat - , text, transformers, transformers-base, transformers-compat, wai - , wai-extra, warp - }: - mkDerivation { - pname = "scotty"; - version = "0.11.2"; - sha256 = "18lxgnj05p4hk7pp4a84biz2dn387a5vxwzyh1kslns1bra6zn0x"; - revision = "1"; - editedCabalFile = "1h4fk7q8x7cvlqq4bbmdh465s6a8955bgchm121fvk08x7rm3yz3"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class exceptions fail http-types monad-control mtl - nats network regex-compat text transformers transformers-base - transformers-compat wai wai-extra warp - ]; - testHaskellDepends = [ - async base bytestring data-default-class directory hpc-coveralls - hspec hspec-wai http-types lifted-base network text wai - ]; - testToolDepends = [ hpc-coveralls hspec-discover ]; - description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "scotty_0_11_3" = callPackage - ({ mkDerivation, aeson, async, base, blaze-builder, bytestring - , case-insensitive, data-default-class, directory, exceptions, fail , hspec, hspec-discover, hspec-wai, http-types, lifted-base , monad-control, mtl, nats, network, regex-compat, text , transformers, transformers-base, transformers-compat, wai @@ -185360,6 +186106,8 @@ self: { pname = "scotty"; version = "0.11.3"; sha256 = "14570k1klrlwra58zz7ip3j41nc75gaswrp8m4xwlrjzgpdqm70a"; + revision = "1"; + editedCabalFile = "0pcaw6wr8nqs7pl64pb00zxd359np5x35159lqkqlcziiv0n2g3b"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types monad-control mtl @@ -186932,8 +187680,8 @@ self: { }: mkDerivation { pname = "sendgrid-v3"; - version = "0.1.1.0"; - sha256 = "1f8kxg6v6804qq7kl22ycff26kq6nh5n7kpkvbdx36pf54a6632w"; + version = "0.1.2.0"; + sha256 = "06j07c86560f4w4vpx6gbnmrbyhs9i69jksliifsd9a9flg93vx3"; libraryHaskellDepends = [ aeson base lens semigroups text wreq ]; testHaskellDepends = [ base semigroups tasty tasty-hunit text ]; description = "Sendgrid v3 API library"; @@ -187698,30 +188446,26 @@ self: { "servant-auth-server" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, bytestring-conversion, case-insensitive, cookie - , crypto-api, data-default-class, entropy, hspec, hspec-discover - , http-api-data, http-client, http-types, jose, lens, lens-aeson - , markdown-unlit, monad-time, mtl, QuickCheck, servant - , servant-auth, servant-server, tagged, text, time, transformers - , unordered-containers, wai, warp, wreq + , bytestring, case-insensitive, cookie, data-default-class, entropy + , hspec, hspec-discover, http-client, http-types, jose, lens + , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck + , servant, servant-auth, servant-server, tagged, text, time + , transformers, unordered-containers, wai, warp, wreq }: mkDerivation { pname = "servant-auth-server"; - version = "0.4.2.0"; - sha256 = "000szizds1c8amxm7gl75gpwrlj38gv665bhp59d35wcq03na4ap"; - revision = "3"; - editedCabalFile = "1zjxqlfyw3wwlyq2faiq9gqhfixn2mvfsv8dapalxs9fph7a2nzj"; + version = "0.4.3.0"; + sha256 = "1kzh4j6118qjzhfbxlszwi6ixgg9g4zn903n9qwrb5z8c2y6b9bl"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy http-api-data http-types jose lens - monad-time mtl servant servant-auth servant-server tagged text time - unordered-containers wai + case-insensitive cookie data-default-class entropy http-types jose + lens memory monad-time mtl servant servant-auth servant-server + tagged text time unordered-containers wai ]; testHaskellDepends = [ aeson base bytestring case-insensitive hspec http-client http-types - jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth - servant-server time transformers wai warp wreq + jose lens lens-aeson mtl QuickCheck servant-auth servant-server + time transformers wai warp wreq ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; @@ -188031,6 +188775,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-client-namedargs" = callPackage + ({ mkDerivation, async, base, hspec, http-client, named, QuickCheck + , servant, servant-client, servant-client-core, servant-namedargs + , servant-server, servant-server-namedargs, text, warp + }: + mkDerivation { + pname = "servant-client-namedargs"; + version = "0.1.0.0"; + sha256 = "0smf6ahmzkbsnvgkji5jzj99sy8bgqz0zxx5k1y1ar82pd6m4qnd"; + revision = "1"; + editedCabalFile = "0kfhrikja6rvrn3m4c6w7dg28l17f2jx8rwswxiwzvmg2zmwbc1n"; + libraryHaskellDepends = [ + base named servant servant-client-core servant-namedargs text + ]; + testHaskellDepends = [ + async base hspec http-client named QuickCheck servant + servant-client servant-namedargs servant-server + servant-server-namedargs warp + ]; + description = "Automatically derive API client functions with named and optional parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-conduit" = callPackage ({ mkDerivation, base, base-compat, bytestring, conduit , http-client, http-media, mtl, resourcet, servant, servant-client @@ -188528,8 +189296,8 @@ self: { }: mkDerivation { pname = "servant-kotlin"; - version = "0.1.1.5"; - sha256 = "0wgx3yc6ay84mlwjw28dfrn633lcmpmr0968h4ncl99xa8vz1wnv"; + version = "0.1.1.6"; + sha256 = "0v16y6f956yf64npq8fm1q6j1q8yygci3amsxyvrggs1rdd8hi31"; libraryHaskellDepends = [ base containers directory formatting lens servant servant-foreign text time wl-pprint-text @@ -188690,6 +189458,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-namedargs" = callPackage + ({ mkDerivation, base, hspec, named, QuickCheck, servant, text }: + mkDerivation { + pname = "servant-namedargs"; + version = "0.1.0.1"; + sha256 = "0ylxcl11wmi3il5bpl7qc32qh2s210xfp37vfhhvnlxzgdzj84vh"; + revision = "1"; + editedCabalFile = "0nr11syaq0l04qdwh5ac0gnpfcgi9vakfjgv5i6p6kraag8za5k7"; + libraryHaskellDepends = [ base named servant text ]; + testHaskellDepends = [ base hspec named QuickCheck servant ]; + description = "Combinators for servant providing named parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-nix" = callPackage ({ mkDerivation, base, bytestring, hnix, http-client, http-media , servant, servant-client, servant-server, text, wai, warp @@ -188729,15 +189512,17 @@ self: { "servant-pagination" = callPackage ({ mkDerivation, base, hspec, QuickCheck, safe, servant - , servant-server, text + , servant-server, text, uri-encode }: mkDerivation { pname = "servant-pagination"; - version = "2.1.3"; - sha256 = "152kp27p1zj0h7gm37skb0kghw9db3nbfrfcdsgp98gll81lyd54"; + version = "2.2.0"; + sha256 = "15imbn6iyvbi80yainpi59q2r621r43d6cim3aydf6bbmz9pgnxd"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base safe servant servant-server text ]; + libraryHaskellDepends = [ + base safe servant servant-server text uri-encode + ]; testHaskellDepends = [ base hspec QuickCheck servant-server text ]; description = "Type-safe pagination for Servant APIs"; license = stdenv.lib.licenses.lgpl3; @@ -189064,6 +189849,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-server-namedargs" = callPackage + ({ mkDerivation, base, http-api-data, http-types, named, servant + , servant-namedargs, servant-server, string-conversions, text, wai + }: + mkDerivation { + pname = "servant-server-namedargs"; + version = "0.1.0.0"; + sha256 = "0ncrrl91b8bcih4qf7gwl7m2qqmx6glwgvwcd4rvi1kdjrry8w0y"; + revision = "1"; + editedCabalFile = "1yf69y0w8miwcgdq9f88c2vabmqbn85rqsr8pqhijz24byyxnnl7"; + libraryHaskellDepends = [ + base http-api-data http-types named servant servant-namedargs + servant-server string-conversions text wai + ]; + description = "Automatically derive API server functions with named and optional parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-smsc-ru" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, HUnit, mtl, QuickCheck, quickcheck-text @@ -190086,8 +190890,8 @@ self: { }: mkDerivation { pname = "sets"; - version = "0.0.6"; - sha256 = "0vnh4wy4p4x0jcxlwzj3mpxhkjv3igg2lphjgxj4dqzd2qddj63d"; + version = "0.0.6.1"; + sha256 = "15msfpnifcavbi5dgsrpl2v9b7hyv0c8lqkkcl0mz0rdm69l2p4q"; libraryHaskellDepends = [ base bytestring commutative composition containers contravariant hashable keys mtl QuickCheck semigroupoids semigroups transformers @@ -191145,8 +191949,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.7"; - sha256 = "101ivifq9gcfafj295l773wpv0c0cqmh8zjzg65r1fhblhbd30f7"; + version = "0.6.8"; + sha256 = "0xv28s1b8rd1zd2mr5g6km8gwsy5ynsyji8fd68clq1rx9jjfcsc"; libraryHaskellDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -191273,6 +192077,37 @@ self: { , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib , HUnit, lifted-async, lifted-base, monad-control, mtl, process , system-fileio, system-filepath, text, time, transformers + , transformers-base, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.8.0"; + sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk"; + revision = "1"; + editedCabalFile = "17achybammxg5i7zcmwlfcb7xk77q3lfvck3gqa9ljfb6ksgrxb7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath hspec hspec-contrib HUnit lifted-async + lifted-base monad-control mtl process system-fileio system-filepath + text time transformers transformers-base unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "shelly_1_8_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , system-fileio, system-filepath, text, time, transformers , transformers-base, unix, unix-compat }: mkDerivation { @@ -191297,6 +192132,7 @@ self: { ]; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly-extra" = callPackage @@ -191340,10 +192176,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.1.0.0"; - sha256 = "0ixvfwrz1bsj1c2ln7fhvf6wawf75nzqfb784xgral33hmflm518"; - revision = "1"; - editedCabalFile = "10h2hz3fda9zg6zpkmmjjfxjghs7g0cj3r85vifp0za9ap41ph3k"; + version = "0.2.0.0"; + sha256 = "1r3giir4l1l2pn4kamgmdqsw1j8qz9aaw741lq761yk1s3lciwim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191574,27 +192408,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "show-combinators"; - version = "0.1.0.0"; - sha256 = "11ihjlpa5hgqhcbwcyclldgddppzgdqsz8hx1hqvamchqx3mgi12"; - revision = "2"; - editedCabalFile = "003ry21snn1b9ip5c1z62hzdy24ckbbb5zf637nxcf9qj07z2xsz"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Combinators to write Show instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "show-combinators_0_1_1_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "show-combinators"; version = "0.1.1.0"; sha256 = "02h2fvmw22v1mpxlxn9c6p7as3xspvspdphybxapac4s50mvyfnm"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "show-please" = callPackage @@ -192347,8 +193166,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.10"; - sha256 = "19gznqypfx452xmspvp1my5z39r6sk7g0cj5p245x806krjfi65k"; + version = "0.9.11"; + sha256 = "1mqibcpcnwc0hqbcbvl32vv4458n02f2k2bnparh8ajm5n9h0cjk"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -192554,10 +193373,8 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.27"; - sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn"; - revision = "1"; - editedCabalFile = "040adccwis3yy8af783vjz3a2yb3fcmm49cpzdgikm2293pwyj0p"; + version = "0.2.28"; + sha256 = "0w4qn8dslcky7cq36jjjnlqwl2s46m8q1cwk3hc9cf0wsiwhp059"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -192760,8 +193577,8 @@ self: { }: mkDerivation { pname = "simple-vec3"; - version = "0.4.0.9"; - sha256 = "1rx4nifv75lpxrdgq6x3a61d56qp0ln9rhf2d10l2ds049dlq0pz"; + version = "0.4.0.10"; + sha256 = "0dyr9bg3y8613hd0zz7knkniq7p0hxm7w9pjs0jjhq586g0qh5ql"; libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ base doctest doctest-driver-gen tasty tasty-quickcheck @@ -193803,8 +194620,8 @@ self: { }: mkDerivation { pname = "slate"; - version = "0.12.0.0"; - sha256 = "01qi6k9gcz6y8x8hlvsmm2irfvcsbdqqvzg5kgf2x02idmh9zy1a"; + version = "0.13.0.0"; + sha256 = "0b1mk6d79h4mkh71kgg208i15bik97a29hzs1j57qxipici680rj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196340,6 +197157,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sockets" = callPackage + ({ mkDerivation, async, base, ip, posix-api, primitive, tasty + , tasty-hunit + }: + mkDerivation { + pname = "sockets"; + version = "0.1.0.0"; + sha256 = "000j2bfjsa33l73pg57g4rignl7dy0jl072r3h9wl4d1f4qc3sim"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ip posix-api primitive ]; + testHaskellDepends = [ async base ip primitive tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base ip primitive ]; + description = "High-level network sockets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "socketson" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , crypto-api, data-default, DRBG, either, errors, http-types @@ -196372,6 +197207,8 @@ self: { pname = "socks"; version = "0.5.6"; sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs"; + revision = "1"; + editedCabalFile = "19f6yzalxbvw0zi1z8wi0vz7s21p5anvfaqsaszppnkgk6j6nnvn"; libraryHaskellDepends = [ base bytestring cereal network ]; description = "Socks proxy (ver 5)"; license = stdenv.lib.licenses.bsd3; @@ -197257,8 +198094,8 @@ self: { pname = "species"; version = "0.4.0.1"; sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2"; - revision = "1"; - editedCabalFile = "1pvk34n7lsbpng9b6m6nrhhr44z1pilh292j3lfnx69hvxhvaq93"; + revision = "2"; + editedCabalFile = "03rzc0f11c60h899nxifz4300hlic2nnnya75rx2b5rigy41714r"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -197274,14 +198111,15 @@ self: { }: mkDerivation { pname = "spectral-clustering"; - version = "0.2.1.2"; - sha256 = "11xylsi8gjshcs539y55gh23hf4b031ssnfjhpbajwjrmagynjnn"; + version = "0.2.2.3"; + sha256 = "017pf2sqw2p1ipflamlwsgkqsk83qm0y7sw672nkg4zvyck1arwc"; libraryHaskellDepends = [ base clustering eigen hmatrix hmatrix-svdlibc mwc-random safe sparse-linear-algebra statistics vector ]; description = "Library for spectral clustering"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculate" = callPackage @@ -199050,8 +199888,8 @@ self: { }: mkDerivation { pname = "stack2nix"; - version = "0.2.1"; - sha256 = "0rwl6fzxv2ly20mn0pgv63r0ik4zpjigbkc4771ni7zazkxvx1gy"; + version = "0.2.2"; + sha256 = "0x5dsgq9mdibbbilc0wn86qqkdgjkm606y4ix57vwxpfgrgkd3wm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199066,7 +199904,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Convert stack.yaml files into Nix build instructions."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage" = callPackage @@ -199868,8 +200705,8 @@ self: { }: mkDerivation { pname = "static-text"; - version = "0.2.0.3"; - sha256 = "189x85skhzms3iydzh4gd5hmklx7ps2skzymls514drg8cz7m7ar"; + version = "0.2.0.4"; + sha256 = "19d43v2cp6wg861lc6rvimzqq20via6fvradysapmilq7svs5kq7"; libraryHaskellDepends = [ base bytestring template-haskell text vector ]; @@ -201041,8 +201878,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.29.0"; - sha256 = "0zncpgjklm649fzrjjy0bri0ivybrc7lvys8yq72b4dpb8ksp5zs"; + version = "0.29.1"; + sha256 = "0j3mb09k498xynhc82cnsknzkbjwn9lvvanrz78jpx4fhh73zrlz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201058,15 +201895,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_29_1" = callPackage + "stratosphere_0_30_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.29.1"; - sha256 = "0j3mb09k498xynhc82cnsknzkbjwn9lvvanrz78jpx4fhh73zrlz"; + version = "0.30.1"; + sha256 = "1j2k4z5chi41fjf1shhci8yf6x5fyj1z5wa077n3n3m7hrlf3r76"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202532,8 +203369,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "5.0.7"; - sha256 = "0hxy5znrfcls6bd8hjil97mya3w8zkppfd4jrz0ayz7zidbws5kg"; + version = "5.0.8"; + sha256 = "0wfi3s8hv11xs0wpvbc9z4nsskdpg5q7ivcpci8cnhn20wffb0nn"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -202801,8 +203638,8 @@ self: { }: mkDerivation { pname = "stylish-cabal"; - version = "0.4.0.1"; - sha256 = "00jwq35dr60c9gjwy8hg3i8b39gxknr92mrz21657gazl90cxy4z"; + version = "0.4.1.0"; + sha256 = "0yxxw22n2k4dpcxyzq140vg3l6338549qds1v3ggkwsykmz3469s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203637,10 +204474,8 @@ self: { }: mkDerivation { pname = "sv"; - version = "1.2"; - sha256 = "148d8jircfyrp0y2rqchs1k3kfmis3bdvc6rib39fkbj699pyw2s"; - revision = "3"; - editedCabalFile = "08fzw4v5w48d9x315hvl27pbg8c0dch9ihmw1f74g9pxnxmpfbxi"; + version = "1.3"; + sha256 = "19mf3sf3smza4yk21k98wb39mk3jg0nxr93nl924ivsyv514flgx"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -203667,6 +204502,8 @@ self: { pname = "sv-cassava"; version = "0.3"; sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b"; + revision = "1"; + editedCabalFile = "01xfdl296jcdh7c4yirzf6z0787z941h6p58dn5xhnsr965sncg1"; libraryHaskellDepends = [ attoparsec base bytestring cassava sv-core utf8-string validation vector @@ -203703,6 +204540,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sv-core_0_4" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , containers, contravariant, deepseq, double-conversion, lens, mtl + , parsec, profunctors, QuickCheck, readable, semigroupoids + , semigroups, tasty, tasty-quickcheck, text, transformers, trifecta + , utf8-string, validation, vector, void + }: + mkDerivation { + pname = "sv-core"; + version = "0.4"; + sha256 = "0m87rffkv5716dh6v00p4gc257fdc81fahjafs02kkf8fbiivmkh"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring containers contravariant + deepseq double-conversion lens mtl parsec profunctors readable + semigroupoids semigroups text transformers trifecta utf8-string + validation vector void + ]; + testHaskellDepends = [ + base bytestring profunctors QuickCheck semigroupoids semigroups + tasty tasty-quickcheck text validation vector + ]; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sv-svfactor" = callPackage ({ mkDerivation, base, bytestring, lens, profunctors, sv-core , svfactor, validation @@ -203711,6 +204574,8 @@ self: { pname = "sv-svfactor"; version = "0.2"; sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb"; + revision = "1"; + editedCabalFile = "0g0bswas1y06k1yg9lgzwm36pyxd05s3pji3nsiqff6bhfph3d37"; libraryHaskellDepends = [ base bytestring lens profunctors sv-core svfactor validation ]; @@ -204413,8 +205278,8 @@ self: { ({ mkDerivation, base, containers, hspec, HUnit }: mkDerivation { pname = "symmetric-properties"; - version = "0.1.0.0"; - sha256 = "10q6w071fa9nyrg7kz9zil3jz7xpvp5l8ni4kddra10dp2hnwg80"; + version = "0.1.0.1"; + sha256 = "06gsplc7l3vc5gyqh0c7ih814x826zjamx6ngsjx5pj1jsbia1wm"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base hspec HUnit ]; description = "Monoids for sameness and uniqueness"; @@ -206335,8 +207200,8 @@ self: { }: mkDerivation { pname = "tar-conduit"; - version = "0.3.1"; - sha256 = "15w1qs276x2j13s3dg5a0d8jjcs3rf8hhnfa2m6p8jm7kjirvahm"; + version = "0.3.2"; + sha256 = "0bgn3hyf20g1gfnzy8f41s7nj54kfcyjk2izw99svrw8f3dphi80"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators directory filepath safe-exceptions text unix @@ -206561,8 +207426,8 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.2.0.8"; - sha256 = "0v9939w2vppa3zfgmyzgb4880cx5z9hw5cssg25qg6ymr6rczdr4"; + version = "1.2.1.0"; + sha256 = "0a0iqc9vnrj4a44h77larcprydipwxy9qkh3zb6zk9mpn9fas498"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -207217,8 +208082,8 @@ self: { }: mkDerivation { pname = "tcp-streams"; - version = "1.0.1.0"; - sha256 = "0qa8dvlxg6r7f6qxq46xj1fq5ksbvznjqs624v57ay2nvgji5n3p"; + version = "1.0.1.1"; + sha256 = "1dz21ycm06d9mwc6dbjr8ansl212ril3i5jl73yzkdi9ngj16qqa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class io-streams network pem tls x509 @@ -208168,22 +209033,6 @@ self: { }: mkDerivation { pname = "tensors"; - version = "0.1.1"; - sha256 = "1pqn4vmkdi4r3s2p0rycv8yyarphifl067wdw7bj41dsv65qk8j3"; - libraryHaskellDepends = [ base reflection singletons vector ]; - testHaskellDepends = [ - base hspec QuickCheck reflection singletons vector - ]; - description = "Tensor in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tensors_0_1_2" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, reflection, singletons - , vector - }: - mkDerivation { - pname = "tensors"; version = "0.1.2"; sha256 = "19r1jjpb8vbjmjbcs0sgnn83mniihw2v1dwhpkm6alrxqdai1637"; libraryHaskellDepends = [ base reflection singletons vector ]; @@ -208192,7 +209041,6 @@ self: { ]; description = "Tensor in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "term-rewriting" = callPackage @@ -208272,6 +209120,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "terminal" = callPackage + ({ mkDerivation, async, base, bytestring, exceptions, prettyprinter + , stm, tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "terminal"; + version = "0.1.0.0"; + sha256 = "15km89sb94aqnyjvl1i63nqchqszd9hpa46sxrv2wbbn1dajcfbx"; + libraryHaskellDepends = [ + async base bytestring exceptions prettyprinter stm text + transformers + ]; + testHaskellDepends = [ + async base bytestring exceptions prettyprinter stm tasty + tasty-hunit tasty-quickcheck text transformers + ]; + description = "Portable terminal interaction library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "terminal-progress-bar" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, terminal-size , test-framework, test-framework-hunit, text, time @@ -208291,6 +209159,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "terminal-punch" = callPackage + ({ mkDerivation, ansi-terminal, base, filepath, QuickCheck, text + , time + }: + mkDerivation { + pname = "terminal-punch"; + version = "0.1.1"; + sha256 = "11z6jb130300yjkrl511960anjac9ncc3g1yj6jqpah6j2imsa8s"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base filepath text time + ]; + testHaskellDepends = [ base QuickCheck time ]; + description = "Simple terminal-based time tracker"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "terminal-size" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -208330,12 +209217,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "terminfo_0_4_1_3" = callPackage + "terminfo_0_4_1_4" = callPackage ({ mkDerivation, base, ncurses }: mkDerivation { pname = "terminfo"; - version = "0.4.1.3"; - sha256 = "09hf9wrp2q3k4y9fcp4fzmk34zh7hfmp0mfqxc0v6h5clajdbvai"; + version = "0.4.1.4"; + sha256 = "170pnql6ycpk6gwy9v28mppm0w2n89l0n6fhnzph2za9kwrs9fqh"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; description = "Haskell bindings to the terminfo library"; @@ -210624,26 +211511,6 @@ self: { }: mkDerivation { pname = "th-utilities"; - version = "0.2.0.1"; - sha256 = "1mki2s821b1zpdn5463qz5vl3kvxxam90iax1n6vznf0d7p4rik5"; - libraryHaskellDepends = [ - base bytestring containers directory filepath primitive syb - template-haskell text th-orphans - ]; - testHaskellDepends = [ - base bytestring containers directory filepath hspec primitive syb - template-haskell text th-orphans vector - ]; - description = "Collection of useful functions for use with Template Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "th-utilities_0_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hspec, primitive, syb, template-haskell, text, th-orphans, vector - }: - mkDerivation { - pname = "th-utilities"; version = "0.2.1.0"; sha256 = "1kc3zv43948whv47cpmwnqw90iz68dmi1bmw9b183bnd0yr7wnfb"; libraryHaskellDepends = [ @@ -210656,7 +211523,6 @@ self: { ]; description = "Collection of useful functions for use with Template Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thank-you-stars" = callPackage @@ -210822,6 +211688,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "these_0_7_6" = callPackage + ({ mkDerivation, aeson, base, base-compat, bifunctors, binary + , containers, data-default-class, deepseq, hashable, keys, lens + , mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty + , tasty-quickcheck, transformers, transformers-compat + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "these"; + version = "0.7.6"; + sha256 = "0in77b1g73m224dmpfc9khgcs0ajgsknp0yri853c9p6k0yvhr4l"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors binary containers + data-default-class deepseq hashable keys lens mtl QuickCheck + semigroupoids transformers transformers-compat unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + aeson base base-compat bifunctors binary containers hashable lens + QuickCheck quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "these-skinny" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -211135,24 +212028,24 @@ self: { "thrift" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , bytestring, containers, ghc-prim, hashable, hspec, HTTP, network - , network-uri, QuickCheck, split, text, unordered-containers - , vector + , bytestring, containers, ghc-prim, hashable, hspec, hspec-core + , HTTP, network, network-uri, QuickCheck, split, text + , unordered-containers, vector }: mkDerivation { pname = "thrift"; - version = "0.10.0"; - sha256 = "01vxik64gnsnm0y9mh82dv48f711231dhc4kksdmgs7f352fc1k7"; + version = "0.12.0"; + sha256 = "1yzfq671apw3mjaws16a6agjw3vpm7yz0gdp3kyh8vvbp5d0czyf"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring containers - ghc-prim hashable HTTP network network-uri QuickCheck split text - unordered-containers vector + ghc-prim hashable hspec-core HTTP network network-uri QuickCheck + split text unordered-containers vector ]; testHaskellDepends = [ base bytestring hspec QuickCheck unordered-containers ]; description = "Haskell bindings for the Apache Thrift RPC system"; - license = "unknown"; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -211438,15 +212331,18 @@ self: { "tidal" = callPackage ({ mkDerivation, base, bifunctors, colour, containers, hosc - , microspec, mwc-random, network, parsec, text, vector + , microspec, mwc-random, network, parsec, text, transformers + , vector }: mkDerivation { pname = "tidal"; - version = "1.0.6"; - sha256 = "0hs9ywd6cpsw1cnjr2kw8p1hwrw2fgd3bqqv7hffxn6dlsslbgj2"; + version = "1.0.7"; + sha256 = "1p2h3g9fa3jd3133ryhcdpkb6a3a3994hrbr1ryd0gza8gd3bgv1"; + revision = "1"; + editedCabalFile = "16ingdhhc38zj1gixj3c7b01lr9lbnxkr8pf0x2j8z1jpbl7jg4a"; libraryHaskellDepends = [ base bifunctors colour containers hosc mwc-random network parsec - text vector + text transformers vector ]; testHaskellDepends = [ base containers microspec parsec ]; description = "Pattern language for improvised music"; @@ -212449,8 +213345,8 @@ self: { }: mkDerivation { pname = "tintin"; - version = "1.9.2"; - sha256 = "1pid79ar85ajs6gi5d8smqn9ivfr8y50qys1n5zq68kpx2gmf3lq"; + version = "1.9.5"; + sha256 = "1z7yvp0c10gkxljg6lkn26niigx0wkdmzs7pqjd666lgzk0ji5hy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213099,19 +213995,33 @@ self: { }) {}; "tokenizer-monad" = callPackage - ({ mkDerivation, base, text }: + ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "tokenizer-monad"; - version = "0.1.0.0"; - sha256 = "1n31n3wql93ljjgzfxpl5qd7kdb3dmr00yw0sz0wkkfgh2id1m99"; - revision = "1"; - editedCabalFile = "0ahl0aj1xrpnd8m7aa9bp94lid0ypnmwi4cishrr1ixnwl2bdlnx"; - libraryHaskellDepends = [ base text ]; + version = "0.2.2.0"; + sha256 = "0n8w923m8c803zcphims51q2xm6a0374zzh00d62mg92zbdsh9vn"; + libraryHaskellDepends = [ base bytestring text ]; description = "An efficient and easy-to-use tokenizer monad"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tokenizer-streaming" = callPackage + ({ mkDerivation, base, bytestring, mtl, streaming + , streaming-bytestring, streaming-commons, text, tokenizer-monad + }: + mkDerivation { + pname = "tokenizer-streaming"; + version = "0.1.0.1"; + sha256 = "0ml4fby87z1fgk2v3if3z6bf1h9gsdcjgmq6lr77qsri2yfcscla"; + libraryHaskellDepends = [ + base bytestring mtl streaming streaming-bytestring + streaming-commons text tokenizer-monad + ]; + description = "A variant of tokenizer-monad that supports streaming"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tokstyle" = callPackage ({ mkDerivation, array, base, deepseq, filepath, language-c }: mkDerivation { @@ -213243,6 +214153,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tomland_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , gauge, hashable, hedgehog, hspec-megaparsec, htoml + , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec + , parser-combinators, tasty, tasty-discover, tasty-hedgehog + , tasty-hspec, tasty-silver, text, time, toml-parser, transformers + , unordered-containers + }: + mkDerivation { + pname = "tomland"; + version = "1.0.0"; + sha256 = "0zxal12gn6d2657a14idzzjxymwmnrzkkicf7gqwlgwpn0lnr4p6"; + revision = "1"; + editedCabalFile = "14n2zgnzfdg549pjrj7f8v02wz68mp5lr9gnyx3w1hv96jb9ksx6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable megaparsec mtl + parser-combinators text time transformers unordered-containers + ]; + executableHaskellDepends = [ base text time unordered-containers ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ + base bytestring containers hashable hedgehog hspec-megaparsec + megaparsec tasty tasty-hedgehog tasty-hspec tasty-silver text time + unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + aeson base deepseq gauge htoml htoml-megaparsec parsec text time + toml-parser + ]; + description = "Bidirectional TOML serialization"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec , optparse-applicative, text @@ -213260,6 +214207,141 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tonalude" = callPackage + ({ mkDerivation, base, bytestring, doctest, Glob, rio, unliftio }: + mkDerivation { + pname = "tonalude"; + version = "0.1.1.0"; + sha256 = "060hc1dydlq1zd1fn5scz7xhbflqm4fa86rz6275drymi5gwx82s"; + libraryHaskellDepends = [ base bytestring rio unliftio ]; + testHaskellDepends = [ base bytestring doctest Glob rio unliftio ]; + description = "A standard library for Tonatona framework"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonaparser" = callPackage + ({ mkDerivation, base, doctest, envy, Glob, rio, say, tonatona }: + mkDerivation { + pname = "tonaparser"; + version = "0.1.0.0"; + sha256 = "0v9qfc13lyjclk7pqsld1lzzbdhimz7gziix7w2x6v2rr2nia8j0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base envy rio say ]; + testHaskellDepends = [ base doctest envy Glob rio say tonatona ]; + description = "Scalable way to pass runtime configurations for tonatona"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonatona" = callPackage + ({ mkDerivation, base, doctest, Glob, rio, tonaparser }: + mkDerivation { + pname = "tonatona"; + version = "0.1.0.1"; + sha256 = "0vc2q0j26ig2qhrc8dfy0knsp0gj8p7yda4xaps5v51dsqpj9yfv"; + libraryHaskellDepends = [ base rio tonaparser ]; + testHaskellDepends = [ base doctest Glob rio tonaparser ]; + description = "meta application framework"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonatona-google-server-api" = callPackage + ({ mkDerivation, base, doctest, Glob, google-server-api + , monad-logger, persistent, persistent-sqlite, resource-pool + , servant-client, tonalude, tonaparser, tonatona + }: + mkDerivation { + pname = "tonatona-google-server-api"; + version = "0.1.0.0"; + sha256 = "0mlzw51s4q3q7sf2hbx26g8chmicsv7nchqrq06x6f7ms58aiy27"; + libraryHaskellDepends = [ + base google-server-api monad-logger persistent persistent-sqlite + resource-pool servant-client tonalude tonaparser tonatona + ]; + testHaskellDepends = [ + base doctest Glob google-server-api monad-logger persistent + persistent-sqlite resource-pool servant-client tonalude tonaparser + tonatona + ]; + description = "tonatona plugin for google-server-api"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tonatona-logger" = callPackage + ({ mkDerivation, base, doctest, Glob, rio, tonaparser, tonatona }: + mkDerivation { + pname = "tonatona-logger"; + version = "0.2.0.0"; + sha256 = "14pirmflhyfmw6y7j1af7ryh8iq30prx7xsdjwmliacszhsqvvfa"; + libraryHaskellDepends = [ base rio tonaparser tonatona ]; + testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ]; + description = "tonatona plugin for logging"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonatona-persistent-postgresql" = callPackage + ({ mkDerivation, base, doctest, Glob, monad-logger, persistent + , persistent-postgresql, resource-pool, rio, tonaparser, tonatona + }: + mkDerivation { + pname = "tonatona-persistent-postgresql"; + version = "0.1.0.1"; + sha256 = "1fxf3h024bl02aldcwc9mhjish9l2y57ir9shra6liddk6065g5n"; + libraryHaskellDepends = [ + base monad-logger persistent persistent-postgresql resource-pool + rio tonaparser tonatona + ]; + testHaskellDepends = [ + base doctest Glob monad-logger persistent persistent-postgresql + resource-pool rio tonaparser tonatona + ]; + description = "tonatona plugin for accessing PostgreSQL database"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonatona-persistent-sqlite" = callPackage + ({ mkDerivation, base, doctest, Glob, monad-logger, persistent + , persistent-sqlite, resource-pool, rio, tonaparser, tonatona + }: + mkDerivation { + pname = "tonatona-persistent-sqlite"; + version = "0.1.0.1"; + sha256 = "0a0jgi01pdirr7ay2ah3cvf3nv2pnmvxag34zif04vc6sbs8pryb"; + libraryHaskellDepends = [ + base monad-logger persistent persistent-sqlite resource-pool rio + tonaparser tonatona + ]; + testHaskellDepends = [ + base doctest Glob monad-logger persistent persistent-sqlite + resource-pool rio tonaparser tonatona + ]; + description = "tonatona plugin for accessing Sqlite database"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonatona-servant" = callPackage + ({ mkDerivation, base, doctest, exceptions, Glob, http-types + , monad-logger, rio, servant, servant-server, tonaparser, tonatona + , tonatona-logger, wai, wai-extra, warp + }: + mkDerivation { + pname = "tonatona-servant"; + version = "0.1.0.1"; + sha256 = "1202fxvjkmvj9sgy576y0ghpcqdca1bhagsxrrz3hcdkyvd2lr9s"; + libraryHaskellDepends = [ + base exceptions http-types monad-logger rio servant servant-server + tonaparser tonatona tonatona-logger wai wai-extra warp + ]; + testHaskellDepends = [ + base doctest exceptions Glob http-types monad-logger rio servant + servant-server tonaparser tonatona tonatona-logger wai wai-extra + warp + ]; + description = "tonatona plugin for servant"; + license = stdenv.lib.licenses.mit; + }) {}; + "too-many-cells" = callPackage ({ mkDerivation, aeson, base, birch-beer, bytestring, cassava , colour, containers, deepseq, diagrams, diagrams-cairo @@ -213276,8 +214358,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.0.0"; - sha256 = "18ziyj0d4xfhbwk7z84drhqgngmy71gmdv2jma8ikfjlahs6mf5b"; + version = "0.1.1.0"; + sha256 = "0hilycd6m32jv3gbsq6j182mc3igcxnhsfqzn6sj5zbip0kx17h7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213300,34 +214382,36 @@ self: { ]; description = "Cluster single cells and analyze cell clade relationships"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "toodles" = callPackage - ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory, hspec - , hspec-expectations, megaparsec, MissingH, regex-posix, servant - , servant-blaze, servant-server, strict, text, wai, warp, yaml + ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory, extra + , hspec, hspec-expectations, megaparsec, MissingH, regex-posix + , servant, servant-blaze, servant-server, strict, text, wai, warp + , yaml }: mkDerivation { pname = "toodles"; - version = "1.0.2"; - sha256 = "066nc1xgy9g7w82f0s1lagxjpf5hw9zxpnbcf5lbjdj58ssrkdr5"; + version = "1.0.3"; + sha256 = "1nzrfdbwz5ykiim76jr3v1666acrhh76k4q4gwix9bixcm8al2zf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base blaze-html cmdargs directory hspec hspec-expectations - megaparsec MissingH regex-posix servant servant-blaze - servant-server strict text wai warp yaml + aeson base blaze-html cmdargs directory extra hspec + hspec-expectations megaparsec MissingH regex-posix servant + servant-blaze servant-server strict text wai warp yaml ]; executableHaskellDepends = [ - aeson base blaze-html cmdargs directory hspec hspec-expectations - megaparsec MissingH regex-posix servant servant-blaze - servant-server strict text wai warp yaml + aeson base blaze-html cmdargs directory extra hspec + hspec-expectations megaparsec MissingH regex-posix servant + servant-blaze servant-server strict text wai warp yaml ]; testHaskellDepends = [ - aeson base blaze-html cmdargs directory hspec hspec-expectations - megaparsec MissingH regex-posix servant servant-blaze - servant-server strict text wai warp yaml + aeson base blaze-html cmdargs directory extra hspec + hspec-expectations megaparsec MissingH regex-posix servant + servant-blaze servant-server strict text wai warp yaml ]; description = "Manage the TODO entries in your code"; license = stdenv.lib.licenses.mit; @@ -213810,8 +214894,8 @@ self: { }: mkDerivation { pname = "trackit"; - version = "0.4"; - sha256 = "0dzcmb10imksryr6lpmnq8b7bzqkm9y1dkyx52k1ic5yms3rwxyx"; + version = "0.6"; + sha256 = "0944m0s1r2f53m9cmfw7jzv4xxgrfppy0cnh0a98j129n6xn39sq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -214536,6 +215620,8 @@ self: { pname = "tree-diff"; version = "0.0.2"; sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq"; + revision = "1"; + editedCabalFile = "1rl12a2ydg744s289lna4zb0sj0b16abmrngp6qd1kfkih2ygml0"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -214808,6 +215894,8 @@ self: { pname = "trifecta"; version = "2"; sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk"; + revision = "1"; + editedCabalFile = "1qqkiwy0yvnj4yszsw9jrv83qf5hw87jdqdb34401dskaf81gwrm"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -215222,8 +216310,8 @@ self: { }: mkDerivation { pname = "ttl-hashtables"; - version = "1.1.0.0"; - sha256 = "09pngm18sjv0bd3a79ijbxgz8s7zlpblj6zinxfg6yg5s529q3i4"; + version = "1.3.0.0"; + sha256 = "1qlwwxylj9d2p4jm4bi0a3x60cfzd6g982v6q0crs323zn8q5cj5"; libraryHaskellDepends = [ base clock containers data-default failable hashable hashtables mtl transformers @@ -216868,6 +217956,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-spec_0_4_0_0" = callPackage + ({ mkDerivation, base, pretty }: + mkDerivation { + pname = "type-spec"; + version = "0.4.0.0"; + sha256 = "0z94hgvmnpcv9va7spdkmbxz99ri1skdq3kwxbid77cpyh95xsxq"; + libraryHaskellDepends = [ base pretty ]; + testHaskellDepends = [ base ]; + description = "Type Level Specification by Example"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-spine" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -216981,6 +218082,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typed-admin" = callPackage + ({ mkDerivation, base, blaze-markup, bytestring, data-default-class + , exceptions, generic-lens, HDBC, HDBC-postgresql, HDBC-session + , heterocephalus, http-api-data, http-types, lucid, monad-control + , mtl, persistable-record, relational-query, relational-query-HDBC + , relational-record, template-haskell, text, time, transformers + , transformers-base, unordered-containers, utf8-string, wai + , wai-extra, warp, yaml + }: + mkDerivation { + pname = "typed-admin"; + version = "0.1.0.0"; + sha256 = "146dkmcrq1rsw7mpdyxa9vhnsr8rfgqz88r10f60chn1m7yhlk7q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup bytestring data-default-class exceptions + generic-lens HDBC HDBC-postgresql HDBC-session heterocephalus + http-api-data http-types lucid monad-control mtl persistable-record + relational-query relational-query-HDBC relational-record + template-haskell text time transformers transformers-base + unordered-containers utf8-string wai wai-extra warp yaml + ]; + description = "Admin console framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typed-duration" = callPackage ({ mkDerivation, base, lifted-base, monad-control , transformers-base @@ -217002,8 +218131,8 @@ self: { }: mkDerivation { pname = "typed-process"; - version = "0.2.3.0"; - sha256 = "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0"; + version = "0.2.4.0"; + sha256 = "02xvyaq4sxwjqbmkn29n5x58l4rni6gbqp526r3q7wn6jalgazwr"; libraryHaskellDepends = [ async base bytestring process stm transformers ]; @@ -217231,20 +218360,20 @@ self: { "typerep-map" = callPackage ({ mkDerivation, base, containers, criterion, deepseq , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat - , hedgehog, primitive, tasty, tasty-discover, tasty-hedgehog - , tasty-hspec, vector + , hedgehog, primitive, QuickCheck, tasty, tasty-discover + , tasty-hedgehog, tasty-hspec, vector }: mkDerivation { pname = "typerep-map"; - version = "0.3.0"; - sha256 = "0d5a2zfb75fallp9q8sz1av8ncvsnmqg6dfjqcghz0grfpwmn7bf"; - revision = "1"; - editedCabalFile = "102lwg5rl1628j3v331xj93cgvr9ppmphyjlqli4gm5vxgrkwsfv"; + version = "0.3.1"; + sha256 = "1ycyk47h578vf4kpf1y708zg9cc6i028jv1fdaw3zy59wrbl8y74"; + revision = "2"; + editedCabalFile = "0zcvg2kr3kcnhxdndw6fcjdd1421ncglr34mc8d9sw1hjjcb5w38"; libraryHaskellDepends = [ - base containers ghc-prim primitive vector + base containers deepseq ghc-prim primitive vector ]; testHaskellDepends = [ - base ghc-typelits-knownnat hedgehog tasty tasty-discover + base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover tasty-hedgehog tasty-hspec ]; testToolDepends = [ tasty-discover ]; @@ -217339,8 +218468,8 @@ self: { }: mkDerivation { pname = "typograffiti"; - version = "0.1.0.0"; - sha256 = "0wd7p6hyn0v8rkvcpbqyjarhv47hi1r3fjzmrldfkylfwnhzj0lf"; + version = "0.1.0.3"; + sha256 = "16491jhiw8yvs1491plf5c98rarxk0j2dfy76ggayxypzqdn2rmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217355,7 +218484,7 @@ self: { base bytestring containers freetype2 gl linear mtl pretty-show stm template-haskell vector ]; - description = "Display TTF fonts in OpenGL. Includes caching for fast rendering."; + description = "Just let me draw nice text already"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -217565,8 +218694,8 @@ self: { pname = "ucam-webauth"; version = "0.1.0.0"; sha256 = "14l989aasyqdw1x7aq9ikhcq9p3s1ax4qk53rd5s53wdgbc20n9k"; - revision = "2"; - editedCabalFile = "1myl5nncwmld4hr0b9990dnqn9ydvza5ciqw5b8pjl747g9qky9f"; + revision = "3"; + editedCabalFile = "01j0296a60hpw0n5d50327hnqpkxwzz7pngxq8da5ram0q13cfzw"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers cryptonite errors http-api-data http-types microlens microlens-mtl mtl @@ -217592,8 +218721,8 @@ self: { pname = "ucam-webauth-types"; version = "0.1.0.0"; sha256 = "0jq66amdmrbkg69m0cbbw7xfvsc9iy74khn1k39n7jkq821pzjni"; - revision = "2"; - editedCabalFile = "1pbl2sy17pkc15170h96ard4z155fm45g18jdxjcdx9hacl003rw"; + revision = "3"; + editedCabalFile = "1png0b60pfhx5gfwbmxxq42nfy9yj2zrcw8krq0vm45qgjw4gd8g"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq http-types microlens microlens-mtl mtl text time timerep @@ -218605,8 +219734,8 @@ self: { pname = "uniprot-kb"; version = "0.1.2.0"; sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l"; - revision = "2"; - editedCabalFile = "1kyqbp32a9wys94rxbm5k022crpnm6fnz8w2d3anb7zch17l80qw"; + revision = "3"; + editedCabalFile = "1a532yhvgs7n096f6mjwm7811d2c6xbgr45gscg7d4ys042c0586"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec neat-interpolation QuickCheck text @@ -218665,8 +219794,8 @@ self: { }: mkDerivation { pname = "unique-logic-tf"; - version = "0.5.0.2"; - sha256 = "0rf2z02r4nk5z9f6937g25brvq391qy8a63mawnkk8hidq8af09j"; + version = "0.5.1"; + sha256 = "0a2hjkm7kwfnqyscxxdw2r2cq3gsydv5ny91vpxxd3paknqqr0cb"; libraryHaskellDepends = [ base containers data-ref semigroups transformers utility-ht ]; @@ -219166,18 +220295,18 @@ self: { }) {}; "unix-time" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest - , doctest, hspec, old-locale, old-time, QuickCheck, time + ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover + , old-locale, old-time, QuickCheck, time }: mkDerivation { pname = "unix-time"; - version = "0.4.4"; - sha256 = "1hgh7v2xcscd69hdbnijp0bh0h1gg9y4qygp7bzwapmlckk3cihx"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.4.5"; + sha256 = "1bwg132x2613k93wxka17461fc72wrjy5vmgcyami0nn5b30ay7y"; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ - base bytestring doctest hspec old-locale old-time QuickCheck time + base bytestring hspec old-locale old-time QuickCheck time ]; + testToolDepends = [ hspec-discover ]; description = "Unix time parser/formatter and utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -219363,6 +220492,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_10_0" = callPackage + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit + , mtl, QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.10.0"; + sha256 = "0wy5hfrs880hh8hvp648bl07ws777n3kkmczzdszr7papnyigwb5"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq deepseq-generics + hashable hashmap mtl random + ]; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -222256,6 +223409,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-space_0_16" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.16"; + sha256 = "17676s2f8i45dj5gk370nc8585aylah7m34nbf34al7r1492y2qc"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -223593,8 +224758,8 @@ self: { }: mkDerivation { pname = "wai"; - version = "3.2.1.2"; - sha256 = "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8"; + version = "3.2.2"; + sha256 = "1qbzq4k8b23pg1knw5y99rdvkfywnncwqkfrkp2w7g6p054xar1a"; libraryHaskellDepends = [ base bytestring http-types network text transformers vault ]; @@ -223800,6 +224965,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-enforce-https" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, hspec + , http-types, network, text, wai, wai-extra, warp, warp-tls + }: + mkDerivation { + pname = "wai-enforce-https"; + version = "0.0.1"; + sha256 = "0gm4n57abmbawpij3hsn6ia283b75sn40387dimpp573q5nnnwmv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive http-types network text wai + ]; + executableHaskellDepends = [ base http-types wai warp warp-tls ]; + testHaskellDepends = [ + base bytestring case-insensitive hspec http-types wai wai-extra + ]; + description = "Enforce HTTPS in Wai server app safely"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-eventsource" = callPackage ({ mkDerivation, wai }: mkDerivation { @@ -223822,8 +225008,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.24.3"; - sha256 = "0ff4mzxqj3h5zn27q9pq0q89x087dy072z24bczn4irry0zzks21"; + version = "3.0.25"; + sha256 = "0caz1miwnyjqg6gdfgv7ibyfdyjzlq2i8v07zhan1nniv9pj3w6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225342,8 +226528,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.25"; - sha256 = "0rl59bs99c3wwwyc1ibq0v11mkc7pxpy28r9hdlmjsqmdwn8y2vy"; + version = "3.2.26"; + sha256 = "1s83313cs6w84a8yfwqkixfz4a94aszma4phsqv7x1ivi9b3i8sc"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -225596,6 +226782,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wave_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, hspec + , hspec-discover, QuickCheck, temporary, transformers + }: + mkDerivation { + pname = "wave"; + version = "0.2.0"; + sha256 = "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring cereal containers transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec QuickCheck temporary + ]; + testToolDepends = [ hspec-discover ]; + description = "Work with WAVE and RF64 files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wavefront" = callPackage ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text , transformers, vector @@ -225776,8 +226983,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.2.1"; - sha256 = "0pdbcc9mg2wrc3jm7g2dcsqgqv89dgjcnxs810gzw3d3rh418i5m"; + version = "0.1.2.2"; + sha256 = "0cbf46d1a55y7j2d84crhfdsgy0c2x0rfmvhhwxxh5pigg846cd2"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -226044,47 +227251,13 @@ self: { , hspec-contrib, hspec-discover, hspec-expectations, http-client , http-client-tls, machines, memory, microlens, microlens-aeson , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random - , relapse, secp256k1-haskell, split, stm, tagged, template-haskell - , text, time, transformers, vinyl - }: - mkDerivation { - pname = "web3"; - version = "0.8.2.1"; - sha256 = "1dcv7977r98lrwh12si9vzvm5bcjdyfdivl63r5zwkykapd15z00"; - libraryHaskellDepends = [ - aeson async base basement bytestring cereal cryptonite data-default - exceptions generics-sop http-client http-client-tls machines memory - microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple - parsec relapse secp256k1-haskell tagged template-haskell text - transformers vinyl - ]; - testHaskellDepends = [ - aeson async base basement bytestring cereal cryptonite data-default - exceptions generics-sop hspec hspec-contrib hspec-discover - hspec-expectations http-client http-client-tls machines memory - microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple - parsec random relapse secp256k1-haskell split stm tagged - template-haskell text time transformers vinyl - ]; - testToolDepends = [ hspec-discover ]; - description = "Ethereum API for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "web3_0_8_3_0" = callPackage - ({ mkDerivation, aeson, async, base, basement, bytestring, cereal - , cryptonite, data-default, exceptions, generics-sop, hspec - , hspec-contrib, hspec-discover, hspec-expectations, http-client - , http-client-tls, machines, memory, microlens, microlens-aeson - , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random , relapse, split, stm, tagged, template-haskell, text, time , transformers, uuid-types, vinyl }: mkDerivation { pname = "web3"; - version = "0.8.3.0"; - sha256 = "1g97dv41widcl612zi49mqf9f61zwp23ml0xf5kw9ac51c683s1q"; + version = "0.8.3.1"; + sha256 = "1pvyyvaamxjz2pyxz25sw3f8hv8605qg99qpgx40bhbhrfvg8zpi"; libraryHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default exceptions generics-sop http-client http-client-tls machines memory @@ -226569,13 +227742,13 @@ self: { ({ mkDerivation, base, blaze-html, data-default, lucid, text }: mkDerivation { pname = "webpage"; - version = "0.0.5"; - sha256 = "1b8s7nnzyadla3wl6p58dwhinscajp5p0ajkrfz5hzqxjgzr4gi1"; + version = "0.0.5.1"; + sha256 = "1nbnpqbknfgw9pyj0phgc9g5srwdzzga3vy58yin25xvkzj2grfr"; libraryHaskellDepends = [ base blaze-html data-default lucid text ]; description = "Organized and simple web page scaffold for blaze and lucid"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -228355,6 +229528,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq_0_5_3_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec + , authenticate-oauth, base, base16-bytestring, base64-bytestring + , bytestring, Cabal, cabal-doctest, case-insensitive, containers + , cryptonite, directory, doctest, exceptions, filepath, ghc-prim + , hashable, http-client, http-client-tls, http-types, HUnit, lens + , lens-aeson, memory, mime-types, network-info, psqueues + , QuickCheck, snap-core, snap-server, template-haskell, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, transformers, unix-compat + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "wreq"; + version = "0.5.3.2"; + sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec authenticate-oauth base base16-bytestring + bytestring case-insensitive containers cryptonite exceptions + ghc-prim hashable http-client http-client-tls http-types lens + lens-aeson memory mime-types psqueues template-haskell text time + time-locale-compat unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring + case-insensitive containers directory doctest filepath hashable + http-client http-types HUnit lens lens-aeson network-info + QuickCheck snap-core snap-server temporary test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers unix-compat unordered-containers uuid vector + ]; + description = "An easy-to-use HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wreq-sb" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring @@ -228797,8 +230009,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.11"; - sha256 = "1mlqgi80r5db0j58r0laiwp1044n4insq89bv1v3y26j726yjvp0"; + version = "1.1.12"; + sha256 = "1xnnyavkgf2cdnsm494bl1z275l9rynh9s3djq3mqk6lrr4bvsix"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -229173,7 +230385,7 @@ self: { ]; description = "Haskell extended file attributes interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) attr;}; "xbattbar" = callPackage @@ -230858,6 +232070,24 @@ self: { license = "LGPL"; }) {}; + "xorshift-plus" = callPackage + ({ mkDerivation, base, doctest, gauge, ghc-prim, hspec + , hspec-discover, QuickCheck, random, xorshift, Xorshift128Plus + }: + mkDerivation { + pname = "xorshift-plus"; + version = "0.1.0.0"; + sha256 = "1m0wilg47jv9zsklghcs1h9bf4vykn8r4bwl0ncr7cqrlfa8d94l"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base gauge random xorshift Xorshift128Plus + ]; + description = "Simple implementation of xorshift+ PRNG"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xosd" = callPackage ({ mkDerivation, base, xosd }: mkDerivation { @@ -231326,25 +232556,25 @@ self: { , monad-logger, mtl, mwc-random, QuickCheck, reflection, salak , scientific, servant-client, servant-server, servant-swagger , servant-swagger-ui, swagger2, text, unliftio-core - , unordered-containers, vault, wai, wai-extra, warp + , unordered-containers, vault, vector, wai, warp }: mkDerivation { pname = "yam"; - version = "0.5.7"; - sha256 = "0vswpq0mzc4x6kjyzg0fyq0bb2ywqh0vh2nsvx9qymdd6vg8nx9y"; + version = "0.5.11"; + sha256 = "0k9y8zg1sbdxb6c3fdmlz0dswb8yam5x812avfw6rg3as8sp1pcf"; libraryHaskellDepends = [ base base16-bytestring binary bytestring data-default fast-logger http-client http-types lens monad-logger mtl mwc-random reflection salak scientific servant-client servant-server servant-swagger servant-swagger-ui swagger2 text unliftio-core unordered-containers - vault wai wai-extra warp + vault vector wai warp ]; testHaskellDepends = [ base base16-bytestring binary bytestring data-default fast-logger hspec http-client http-types lens monad-logger mtl mwc-random QuickCheck reflection salak scientific servant-client servant-server servant-swagger servant-swagger-ui swagger2 text - unliftio-core unordered-containers vault wai wai-extra warp + unliftio-core unordered-containers vault vector wai warp ]; description = "Yam Web"; license = stdenv.lib.licenses.bsd3; @@ -231396,13 +232626,14 @@ self: { }: mkDerivation { pname = "yam-datasource"; - version = "0.5.7"; - sha256 = "0sqrc0w5mvjjkih9dcqbiz12n20zvqmc6qhwsn4fxd9air2x8yfc"; + version = "0.5.11"; + sha256 = "170xpd1kw403g9zds795zbxkaz0qy7lfgzppx4q0ri42ky59z8pl"; libraryHaskellDepends = [ base conduit persistent resource-pool resourcet unliftio-core yam ]; description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yam-job" = callPackage @@ -232069,6 +233300,7 @@ self: { ]; description = "Total recursion schemes"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaya-hedgehog" = callPackage @@ -232096,6 +233328,7 @@ self: { testHaskellDepends = [ base hedgehog yaya yaya-hedgehog ]; description = "Non-total extensions to the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ycextra" = callPackage @@ -232691,28 +233924,6 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.0.0"; - sha256 = "12n2af0by708d5g2080y6w1xf8h692v1nxzgmwqfmsqf0c51ad05"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring errors hoauth2 http-client http-conduit - http-types microlens random safe-exceptions text uri-bytestring - yesod-auth yesod-core - ]; - testHaskellDepends = [ base hspec uri-bytestring ]; - description = "OAuth 2.0 authentication plugins"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yesod-auth-oauth2_0_6_1_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, errors, hoauth2, hspec - , http-client, http-conduit, http-types, microlens, random - , safe-exceptions, text, uri-bytestring, yesod-auth, yesod-core - }: - mkDerivation { - pname = "yesod-auth-oauth2"; version = "0.6.1.0"; sha256 = "148w2cn6f0mn6qyymxr2zlw8jnhyjqhzhszhy1faca8ziqsi9mas"; isLibrary = true; @@ -232965,8 +234176,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.9"; - sha256 = "0jwfxcp0hdp1lw63gcqpqbvdrzifyds3x42wk0m5wxy7hj0x0r6a"; + version = "1.6.10.1"; + sha256 = "0xkfzdy1r07w7xqai4r5b96rrk51gr5ndwrf20nhdnjjms4928li"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -233255,8 +234466,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.6.3"; - sha256 = "15wvgrkqp57wrh8xv1ix86navy6llvagwp393w4b6azv758dims0"; + version = "1.6.4"; + sha256 = "0iqcrbmwhgfk78qi2n1n3i39izqr7km4i8fa1zmvplqkcbyi149c"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -234182,8 +235393,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.5.1"; - sha256 = "080m46nbjblna2b9gq8j4ngqsv0r5ww06p1v8cj3ia1qiqgjygsj"; + version = "1.6.6"; + sha256 = "1h82njqkbr6h6saixkzim83srx794s6x6qrcmr0w82z5mfl2nfjf"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html bytestring case-insensitive conduit containers cookie hspec-core html-conduit @@ -234191,8 +235402,8 @@ self: { transformers wai wai-extra xml-conduit xml-types yesod-core ]; testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio wai wai-extra xml-conduit yesod-core yesod-form ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index e36933a81944..b4cd7fee311b 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -176,6 +176,17 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); + # This function does not depend on all-cabal-hashes and therefore will work + # for any version that has been released on hackage as opposed to only + # versions released before whatever version of all-cabal-hashes you happen + # to be currently using. + callHackageDirect = {pkg, ver, sha256}@args: + let pkgver = "${pkg}-${ver}"; + in self.callCabal2nix pkg (pkgs.fetchzip { + url = "http://hackage.haskell.org/package/${pkgver}/${pkgver}.tar.gz"; + inherit sha256; + }); + # Creates a Haskell package from a source package by calling cabal2nix on the source. callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args: let diff --git a/pkgs/development/haskell-modules/patches/git-annex-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/git-annex-fix-ghc-8.6.x-build.patch deleted file mode 100644 index 46d7afada4ad..000000000000 --- a/pkgs/development/haskell-modules/patches/git-annex-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 2e0e557e7512ddd0376f179e82c811d8b4cce401 Mon Sep 17 00:00:00 2001 -From: Joey Hess <joeyh@joeyh.name> -Date: Sat, 5 Jan 2019 11:54:06 -0400 -Subject: [PATCH] Support being built with ghc 8.0.1 (MonadFail) - -Tested on an older ghc by enabling MonadFailDesugaring globally. - -In TransferQueue, the lack of a MonadFail for STM exposed what would -normally be a bug in the pattern matching, although in this case an -earlier check that the queue was not empty avoided a pattern match -failure. ---- - Annex.hs | 2 ++ - Assistant/Monad.hs | 2 ++ - Assistant/TransferQueue.hs | 21 +++++++++++---------- - CHANGELOG | 1 + - 4 files changed, 16 insertions(+), 10 deletions(-) - -diff --git a/Annex.hs b/Annex.hs -index 0a0368d36..af0ede1f4 100644 ---- a/Annex.hs -+++ b/Annex.hs -@@ -74,6 +74,7 @@ import "mtl" Control.Monad.Reader - import Control.Concurrent - import Control.Concurrent.Async - import Control.Concurrent.STM -+import qualified Control.Monad.Fail as Fail - import qualified Control.Concurrent.SSem as SSem - import qualified Data.Map.Strict as M - import qualified Data.Set as S -@@ -93,6 +94,7 @@ newtype Annex a = Annex { runAnnex :: ReaderT (MVar AnnexState) IO a } - MonadCatch, - MonadThrow, - MonadMask, -+ Fail.MonadFail, - Functor, - Applicative - ) -diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs -index 403ee16a8..ef2ee6012 100644 ---- a/Assistant/Monad.hs -+++ b/Assistant/Monad.hs -@@ -27,6 +27,7 @@ module Assistant.Monad ( - - import "mtl" Control.Monad.Reader - import System.Log.Logger -+import qualified Control.Monad.Fail as Fail - - import Annex.Common - import Assistant.Types.ThreadedMonad -@@ -49,6 +50,7 @@ newtype Assistant a = Assistant { mkAssistant :: ReaderT AssistantData IO a } - Monad, - MonadIO, - MonadReader AssistantData, -+ Fail.MonadFail, - Functor, - Applicative - ) -diff --git a/Assistant/TransferQueue.hs b/Assistant/TransferQueue.hs -index 6a4473262..7c0ab80d0 100644 ---- a/Assistant/TransferQueue.hs -+++ b/Assistant/TransferQueue.hs -@@ -191,17 +191,18 @@ getNextTransfer acceptable = do - sz <- readTVar (queuesize q) - if sz < 1 - then retry -- blocks until queuesize changes -- else do -- (r@(t,info):rest) <- readTList (queuelist q) -- void $ modifyTVar' (queuesize q) pred -- setTList (queuelist q) rest -- if acceptable info -- then do -- adjustTransfersSTM dstatus $ -- M.insert t info -- return $ Just r -- else return Nothing -+ else readTList (queuelist q) >>= \case -+ [] -> retry -- blocks until something is queued -+ (r@(t,info):rest) -> do -+ void $ modifyTVar' (queuesize q) pred -+ setTList (queuelist q) rest -+ if acceptable info -+ then do -+ adjustTransfersSTM dstatus $ -+ M.insert t info -+ return $ Just r -+ else return Nothing - - {- Moves transfers matching a condition from the queue, to the - - currentTransfers map. -} - diff --git a/pkgs/development/haskell-modules/stack-hook.sh b/pkgs/development/haskell-modules/stack-hook.sh new file mode 100644 index 000000000000..d942662294c2 --- /dev/null +++ b/pkgs/development/haskell-modules/stack-hook.sh @@ -0,0 +1,11 @@ +addStackArgs () { + if [ -d "$1/lib" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-lib-dirs=$1/lib"* ]]; then + STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$1/lib" + fi + + if [ -d "$1/include" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-include-dirs=$1/include"* ]]; then + STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$1/include" + fi +} + +addEnvHooks "$hostOffset" addStackArgs diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix index 65c008f8ac6b..40136fd22de8 100644 --- a/pkgs/development/interpreters/elixir/1.8.nix +++ b/pkgs/development/interpreters/elixir/1.8.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.8.0-rc.1"; - sha256 = "06k9q46cwn79ic6kw0b0mskf9rqlgm02jb8n1ajz55kmw134kq6m"; + version = "1.8.1"; + sha256 = "1npnrkn21kqqfqrsn06mr78jxs6n5l8c935jpxvnmj7iysp50pf9"; minimumOTPVersion = "20"; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index b4e1cacfe267..844d6eeb4fb9 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -7,7 +7,7 @@ , sha256 ? null , rev ? "v${version}" , src ? fetchFromGitHub { inherit rev sha256; owner = "elixir-lang"; repo = "elixir"; } -}: +} @ args: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -62,6 +62,7 @@ in --replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir" ''; + pos = builtins.unsafeGetAttrPos "sha256" args; meta = with stdenv.lib; { homepage = https://elixir-lang.org/; description = "A functional, meta-programming aware language built on top of the Erlang VM"; diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 09af492490cf..b2948b392d5e 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, readline }: +{ stdenv, fetchurl, readline +, self +, callPackage +, packageOverrides ? (self: super: {}) +}: let dsoPatch = fetchurl { @@ -6,6 +10,7 @@ let sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw"; name = "lua-arch.patch"; }; + luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; in stdenv.mkDerivation rec { name = "lua-${version}"; @@ -17,6 +22,10 @@ stdenv.mkDerivation rec { sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; }; + LuaPathSearchPaths = luaPackages.getLuaPathList luaversion; + LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion; + setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; + buildInputs = [ readline ]; patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ]) @@ -39,6 +48,16 @@ stdenv.mkDerivation rec { rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua ''; + passthru = rec { + buildEnv = callPackage ./wrapper.nix { + lua=self; + inherit (luaPackages) requiredLuaModules; + }; + withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; + pkgs = luaPackages; + interpreter = "${self}/bin/lua"; + }; + meta = { homepage = http://www.lua.org; description = "Powerful, fast, lightweight, embeddable scripting language"; @@ -51,6 +70,7 @@ stdenv.mkDerivation rec { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; + platforms = with stdenv.lib.platforms; linux ++ darwin; hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index a8badf647c0c..e89a2cbece6d 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchurl, readline, compat ? false }: +{ stdenv, fetchurl, readline +# compiles compatibility layer with lua5.1 +, compat ? false +, callPackage +, self +, packageOverrides ? (self: super: {}) +}: let dsoPatch = fetchurl { @@ -6,12 +12,17 @@ let sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9"; name = "lua-arch.patch"; }; + luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; in stdenv.mkDerivation rec { name = "lua-${version}"; luaversion = "5.2"; version = "${luaversion}.4"; + LuaPathSearchPaths = luaPackages.getLuaPathList luaversion; + LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion; + setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; + src = fetchurl { url = "https://www.lua.org/ftp/${name}.tar.gz"; sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; @@ -21,6 +32,19 @@ stdenv.mkDerivation rec { patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch ]; + + passthru = rec { + buildEnv = callPackage ./wrapper.nix { + lua = self; + inherit (luaPackages) requiredLuaModules; + }; + withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; + pkgs = luaPackages; + interpreter = "${self}/bin/lua"; + }; + + enableParallelBuilding = true; + configurePhase = if stdenv.isDarwin then '' diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index eb34391e1993..c1fdc0fd9904 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchurl, readline, compat ? false }: - +{ stdenv, fetchurl, readline, compat ? false +, callPackage +, self +, packageOverrides ? (self: super: {}) +}: +let + luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; +in stdenv.mkDerivation rec { name = "lua-${version}"; luaversion = "5.3"; @@ -10,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"; }; + LuaPathSearchPaths = luaPackages.getLuaPathList luaversion; + LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion; + setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else []; @@ -54,6 +64,16 @@ stdenv.mkDerivation rec { ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc" ''; + passthru = rec { + buildEnv = callPackage ./wrapper.nix { + lua = self; + inherit (luaPackages) requiredLuaModules; + }; + withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; + pkgs = luaPackages; + interpreter = "${self}/bin/lua"; + }; + meta = { homepage = http://www.lua.org; description = "Powerful, fast, lightweight, embeddable scripting language"; diff --git a/pkgs/development/interpreters/lua-5/build-rocks.nix b/pkgs/development/interpreters/lua-5/build-rocks.nix new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/build-rocks.nix diff --git a/pkgs/development/interpreters/lua-5/build-rockspec.nix b/pkgs/development/interpreters/lua-5/build-rockspec.nix new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/build-rockspec.nix diff --git a/pkgs/development/interpreters/lua-5/setup-hook.nix b/pkgs/development/interpreters/lua-5/setup-hook.nix new file mode 100644 index 000000000000..62caffd8d8a0 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/setup-hook.nix @@ -0,0 +1,15 @@ +{ runCommand, lib, }: + +LuaPathSearchPaths: LuaCPathSearchPaths: + +let + hook = ./setup-hook.sh; +in runCommand "lua-setup-hook.sh" { + # hum doesn't seem to like caps !! BUG ? + luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths; + luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths; +} '' + cp ${hook} hook.sh + substituteAllInPlace hook.sh + mv hook.sh $out +'' diff --git a/pkgs/development/interpreters/lua-5/setup-hook.sh b/pkgs/development/interpreters/lua-5/setup-hook.sh new file mode 100644 index 000000000000..5e37bd27f617 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/setup-hook.sh @@ -0,0 +1,47 @@ +# set -e + +nix_print() { + if (( "${NIX_DEBUG:-0}" >= $1 )); then + echo "$2" + fi +} + +nix_debug() { + nix_print 3 "$1" +} + +addToLuaSearchPathWithCustomDelimiter() { + local varName="$1" + local absPattern="$2" + # delete longest match starting from the lua placeholder '?' + local topDir="${absPattern%%\?*}" + + # export only if the folder exists else LUA_PATH grows too big + if [ ! -d "$topDir" ]; then return; fi + + export "${varName}=${!varName:+${!varName};}${absPattern}" +} + +addToLuaPath() { + local dir="$1" + + if [[ ! -d "$dir" ]]; then + nix_debug "$dir not a directory abort" + return 0 + fi + cd "$dir" + for pattern in @luapathsearchpaths@; + do + addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern" + done + + # LUA_CPATH + for pattern in @luacpathsearchpaths@; + do + addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern" + done + cd - >/dev/null +} + +addEnvHooks "$hostOffset" addToLuaPath + diff --git a/pkgs/development/interpreters/lua-5/with-packages.nix b/pkgs/development/interpreters/lua-5/with-packages.nix new file mode 100644 index 000000000000..0e0fbd397358 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/with-packages.nix @@ -0,0 +1,4 @@ +{ buildEnv, luaPackages }: + +# this is a function that returns a function that returns an environment +f: let packages = f luaPackages; in buildEnv.override { extraLibs = packages; } diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix new file mode 100644 index 000000000000..9abbd77d575e --- /dev/null +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -0,0 +1,73 @@ +{ stdenv, lua, buildEnv, makeWrapper +, extraLibs ? [] +, extraOutputsToInstall ? [] +, postBuild ? "" +, ignoreCollisions ? false +, lib +, requiredLuaModules +, makeWrapperArgs ? [] +}: + +# Create a lua executable that knows about additional packages. +let + env = let + paths = requiredLuaModules (extraLibs ++ [ lua ] ); + in buildEnv { + name = "${lua.name}-env"; + + inherit paths; + inherit ignoreCollisions; + extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; + + # we create wrapper for the binaries in the different packages + postBuild = '' + + . "${makeWrapper}/nix-support/setup-hook" + + # get access to lua functions + . ${lua}/nix-support/setup-hook + + if [ -L "$out/bin" ]; then + unlink "$out/bin" + fi + mkdir -p "$out/bin" + + addToLuaPath "$out" + + # take every binary from lua packages and put them into the env + for path in ${stdenv.lib.concatStringsSep " " paths}; do + nix_debug "looking for binaries in path = $path" + if [ -d "$path/bin" ]; then + cd "$path/bin" + for prg in *; do + if [ -f "$prg" ]; then + rm -f "$out/bin/$prg" + if [ -x "$prg" ]; then + nix_debug "Making wrapper $prg" + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + fi + fi + done + fi + done + '' + postBuild; + + inherit (lua) meta; + + passthru = lua.passthru // { + interpreter = "${env}/bin/lua"; + inherit lua; + env = stdenv.mkDerivation { + name = "interactive-${lua.name}-environment"; + nativeBuildInputs = [ env ]; + + buildCommand = '' + echo >&2 "" + echo >&2 "*** lua 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + }; + }; + }; +in env diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix new file mode 100644 index 000000000000..0889b7fefe68 --- /dev/null +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -0,0 +1,10 @@ +{ self, callPackage, lib }: +callPackage ./default.nix { + inherit self; + version = "2.0.5"; + isStable = true; + sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; + extraMeta = { + platforms = lib.filter (p: p != "aarch64-linux") lib.meta.platforms; + }; +} diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix new file mode 100644 index 000000000000..0f223963132e --- /dev/null +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -0,0 +1,7 @@ +{ self, callPackage, lib }: +callPackage ./default.nix { + inherit self; + version = "2.1.0-beta3"; + isStable = false; + sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; +} diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 9ee628f498ee..c95b9e8b8e37 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,71 +1,74 @@ -{ stdenv, lib, fetchurl }: -rec { +{ stdenv, lib, fetchurl +, name ? "luajit-${version}" +, isStable +, sha256 +, version +, extraMeta ? {} +, callPackage +, self +, packageOverrides ? (self: super: {}) +}: +let + luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; +in +stdenv.mkDerivation rec { + inherit name version; + src = fetchurl { + url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; + inherit sha256; + }; - luajit = luajit_2_1; + luaversion = "5.1"; - luajit_2_0 = generic { - version = "2.0.5"; - isStable = true; - sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; - meta = genericMeta // { - platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms; - }; - }; + patchPhase = '' + substituteInPlace Makefile \ + --replace /usr/local "$out" + + substituteInPlace src/Makefile --replace gcc cc + '' + stdenv.lib.optionalString (stdenv.cc.libc != null) + '' + substituteInPlace Makefile \ + --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig + ''; + + configurePhase = false; - luajit_2_1 = generic { - version = "2.1.0-beta3"; - isStable = false; - sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; + buildFlags = [ "amalg" ]; # Build highly optimized version + enableParallelBuilding = true; + + installPhase = '' + make install PREFIX="$out" + ( cd "$out/include"; ln -s luajit-*/* . ) + ln -s "$out"/bin/luajit-* "$out"/bin/lua + '' + + stdenv.lib.optionalString (!isStable) '' + ln -s "$out"/bin/luajit-* "$out"/bin/luajit + ''; + + LuaPathSearchPaths = [ + "lib/lua/${luaversion}/?.lua" "share/lua/${luaversion}/?.lua" + "share/lua/${luaversion}/?/init.lua" "lib/lua/${luaversion}/?/init.lua" + "share/${name}/?.lua" + ]; + LuaCPathSearchPaths = [ "lib/lua/${luaversion}/?.so" "share/lua/${luaversion}/?.so" ]; + setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; + + passthru = rec { + buildEnv = callPackage ../lua-5/wrapper.nix { + lua = self; + inherit (luaPackages) requiredLuaModules; + }; + withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages;}; + pkgs = luaPackages; + interpreter = "${self}/bin/lua"; }; - genericMeta = with stdenv.lib; { + meta = with stdenv.lib; extraMeta // { description = "High-performance JIT compiler for Lua 5.1"; homepage = http://luajit.org; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ]; }; - - generic = - { version, sha256 ? null, isStable - , name ? "luajit-${version}" - , src ? - (fetchurl { - url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - inherit sha256; - }) - , meta ? genericMeta - }: - - stdenv.mkDerivation rec { - inherit name version src meta; - - luaversion = "5.1"; - - patchPhase = '' - substituteInPlace Makefile \ - --replace /usr/local "$out" - - substituteInPlace src/Makefile --replace gcc cc - '' + stdenv.lib.optionalString (stdenv.cc.libc != null) - '' - substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig - ''; - - configurePhase = false; - - buildFlags = [ "amalg" ]; # Build highly optimized version - enableParallelBuilding = true; - - installPhase = '' - make install PREFIX="$out" - ( cd "$out/include"; ln -s luajit-*/* . ) - ln -s "$out"/bin/luajit-* "$out"/bin/lua - '' - + stdenv.lib.optionalString (!isStable) - '' - ln -s "$out"/bin/luajit-* "$out"/bin/luajit - ''; - }; } + diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index fedb9f59f80f..e8e23cee830a 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "metamath-${version}"; - version = "0.171"; + version = "0.172"; buildInputs = [ autoreconfHook ]; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Taneb"; repo = "metamath"; - rev = "1c622a844fbdee43f13a629c73d8b33ff7fc4e44"; - sha256 = "0bkz75saddlwinyqwmxx89nilaar401j63kgqfqiak8iw2nk3wln"; + rev = "43141cd17638f8efb409dc5d46e7de6a6c39ec42"; + sha256 = "07c7df0zl0wsb0pvdgkwikpr8kz7fi3mshxzk61vkamyp68djjb5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 928a55173243..d1f2edce936d 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -35,7 +35,7 @@ let nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = libs; PYTHON = if buildWithPypy - then "${pypy}/pypy-c/.pypy-c-wrapped" + then "${pypy}/pypy-c/pypy-c" else "${python2.interpreter}"; unpackPhase = '' cp -R ${pixie-src} pixie-src diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 15536c6370a3..b834de7356f7 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "7.1"; # always change at once with ./minimal.nix + version = "7.2"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { } )) { inherit name; - sha256 = "180z0z6srzyipi9wfnbh61nbvzxr5d1cls7wxapv6fw92y52jwz9"; + sha256 = "12cq0kiigmf9bxb4rcgxdhwc2fcdwvlyb1q3f8x4hswcpgq1ybg4"; }; FONTCONFIG_FILE = fontsConf; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { mkdir src/build cd src/build - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" $LD_LIBRARY_PATH) + gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) ''; shared = if stdenv.isDarwin then "dylib" else "shared"; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 114023defcd4..c7e2056b7ca3 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "11vcqxdgyarv89ijd46wzrdl2wk7xjirg7ynlz7r0smdcqrcl711"; + sha256 = "01wsiyqfiiwn2n4xxk8d8di92l2ng7yhc4bfmgrvkgaqzy3zfhhx"; }; meta = oldAttrs.meta // { diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 7365cd522734..2a2392011d13 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -223,10 +223,10 @@ in { }; ruby_2_6 = generic { - version = rubyVersion "2" "6" "0" ""; + version = rubyVersion "2" "6" "1" ""; sha256 = { - src = "0wn0gxlx6xhhqrm2caxp0h6cj4nw7knnv5gh27qqzj0i9a95phzk"; - git = "0bwbl4hz18dd5aij2l4s6xy90dc17d03kk577gdl34l9mbd9m7mn"; + src = "1f0w37jz2ryvlx260rw3s3wl0wg7dkzphb54lpvrqg90pfvly0hp"; + git = "07gp7df1izw9rdbp9ciw4q5kq8icx3zd5w1xrhwsw0dfbsmmnsrj"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 8afc64edb3fd..fae76c706121 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -16,6 +16,6 @@ rec { "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.6.0" = ops useRailsExpress [ # no Rails Express patchset yet (2018-12-26) + "2.6.1" = ops useRailsExpress [ # no Rails Express patchset yet (2019-01-30) ]; } diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 011b3a125ef2..11c02acf1de3 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = http://www.tcl.tk/; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ wkennington vrthra ]; + maintainers = with maintainers; [ vrthra ]; }; passthru = rec { diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 811dfc47194a..cff960b29a73 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: let parquet-testing = fetchFromGitHub { @@ -11,27 +11,21 @@ in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0pc5pqr0dbnx8s1ji102dhw9bbrsq3ml4ac3mmi2022yfyizlf0q"; + sha256 = "163s4i2cywq95jgrxbaq48qwmww0ibkq61k1aad4w9z9vpjfgnil"; }; sourceRoot = "apache-arrow-${version}/cpp"; patches = [ - # fix ARROW-3467 - ./double-conversion_cmake.patch - # patch to fix python-test ./darwin.patch - - # facebook/zstd#1385 - ./zstd136.patch ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]; buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ]; preConfigure = '' @@ -58,6 +52,7 @@ stdenv.mkDerivation rec { ZSTD_HOME = zstd; cmakeFlags = [ + "-DARROW_BUILD_TESTS=ON" "-DARROW_PYTHON=ON" "-DARROW_PARQUET=ON" ]; diff --git a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch deleted file mode 100644 index 336fdde9e8fb..000000000000 --- a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/cpp/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -615,7 +615,7 @@ endif(UNIX) - set(ARROW_LINK_LIBS) - - # Libraries to link statically with libarrow.so --set(ARROW_STATIC_LINK_LIBS double-conversion) -+set(ARROW_STATIC_LINK_LIBS ${DOUBLE_CONVERSION_TARGET}) - - if (ARROW_WITH_BROTLI) - SET(ARROW_STATIC_LINK_LIBS -@@ -694,7 +694,7 @@ else () - set(ARROW_MIN_TEST_LIBS - arrow_shared - ${ARROW_LINK_LIBS} -- double-conversion -+ ${DOUBLE_CONVERSION_TARGET} - ${BOOST_SYSTEM_LIBRARY} - ${BOOST_FILESYSTEM_LIBRARY} - ${BOOST_REGEX_LIBRARY} -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -469,14 +469,16 @@ if("${DOUBLE_CONVERSION_HOME}" STREQUAL "") - set(DOUBLE_CONVERSION_VENDORED 1) - else() - find_package(double-conversion REQUIRED) -+ set(DOUBLE_CONVERSION_TARGET double-conversion::double-conversion) - set(DOUBLE_CONVERSION_VENDORED 0) - endif() - - include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR}) --ADD_THIRDPARTY_LIB(double-conversion -- STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) - - if (DOUBLE_CONVERSION_VENDORED) -+ ADD_THIRDPARTY_LIB(double-conversion -+ STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) -+ set(DOUBLE_CONVERSION_TARGET double-conversion) - add_dependencies(arrow_dependencies double-conversion_ep) - endif() - diff --git a/pkgs/development/libraries/arrow-cpp/zstd136.patch b/pkgs/development/libraries/arrow-cpp/zstd136.patch deleted file mode 100644 index 1bdeecaef990..000000000000 --- a/pkgs/development/libraries/arrow-cpp/zstd136.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/arrow/util/compression_zstd.cc -+++ b/src/arrow/util/compression_zstd.cc -@@ -35,8 +35,13 @@ namespace util { - - Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input, int64_t output_len, - uint8_t* output_buffer) { -+ void *safe_output_buffer = static_cast<void*>(output_buffer); -+ int dummy {}; -+ if ((output_len == 0) && (output_buffer == NULL)) { -+ safe_output_buffer = static_cast<void*>(&dummy); -+ } - int64_t decompressed_size = -- ZSTD_decompress(output_buffer, static_cast<size_t>(output_len), input, -+ ZSTD_decompress(safe_output_buffer, static_cast<size_t>(output_len), input, - static_cast<size_t>(input_len)); - if (decompressed_size != output_len) { - return Status::IOError("Corrupt ZSTD compressed data."); diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 3e488acee748..dd383bd01231 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation { platforms = (platforms.unix ++ platforms.windows); badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux"; - maintainers = with maintainers; [ peti wkennington ]; + maintainers = with maintainers; [ peti ]; }; preConfigure = '' diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index ddaf022edfd4..ae8b6ca18df3 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index a4f49dea59af..ac6c9657dde6 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation { homepage = http://ampasctl.sourceforge.net; license = "A.M.P.A.S"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; passthru.source = source; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 27a8b7b1119e..7b130d48928e 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { version = "2.1.27"; src = fetchurl { - url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz"; + urls = + [ "http://www.cyrusimap.org/releases/${name}.tar.gz" + "http://www.cyrusimap.org/releases/old/${name}.tar.gz" + ]; sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"; }; diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix index 9c9d85134224..d418b879d1dd 100644 --- a/pkgs/development/libraries/czmq/3.x.nix +++ b/pkgs/development/libraries/czmq/3.x.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix index 67e005943fa5..32bce3ba4b35 100644 --- a/pkgs/development/libraries/czmq/4.x.nix +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -17,6 +17,5 @@ stdenv.mkDerivation rec { description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index 1f8f9a4e69cc..cd78d6d8a6ab 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://github.com/agl/dclxvi; description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.x86_64; license = licenses.publicDomain; }; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 63adb5afd1ca..de78647dc483 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { homepage = http://www.fastcgi.com/; license = "FastCGI see LICENSE.TERMS"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix deleted file mode 100644 index 4eebad6b307d..000000000000 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.16"; - branch = "0.10"; - sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77"; - patches = [ ./vpxenc-0.10-libvpx-1.5.patch ]; -}) diff --git a/pkgs/development/libraries/ffmpeg/1.2.nix b/pkgs/development/libraries/ffmpeg/1.2.nix deleted file mode 100644 index 312eb70fdf20..000000000000 --- a/pkgs/development/libraries/ffmpeg/1.2.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.12"; - branch = "1.2"; - sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli"; - patches = [ ./vpxenc-1.2-libvpx-1.5.patch ]; -}) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 616394c6a084..5c70df02cdc8 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.110"; + version = "1.00.111"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "1zxgvc9ikw34fsbkn9by7hwqz0p6m3f178zmj2s0qqpi84qq1vw2"; + sha256 = "17vn95bjiib3ia3h64b7akcmgmj6wfjx7w538iylhf9whqvssi4j"; }; buildInputs = [ diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix new file mode 100644 index 000000000000..45a29e15ede8 --- /dev/null +++ b/pkgs/development/libraries/gdl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: + +stdenv.mkDerivation rec { + pname = "gdl"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j"; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ libxml2 gtk3 ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gdl"; + }; + }; + + meta = with stdenv.lib; { + description = "Gnome docking library"; + homepage = https://developer.gnome.org/gdl/; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 002c9bc0748f..0493071ee228 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.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://getdnsapi.net/releases/${pname}-1-5-0/${pname}-${version}.tar.gz"; - sha256 = "577182c3ace919ee70cee5629505581a10dc530bd53fe5c241603ea91c84fa84"; + url = "https://getdnsapi.net/releases/${pname}-1-5-1/${pname}-${version}.tar.gz"; + sha256 = "5686e61100599c309ce03535f9899a5a3d94a82cc08d10718e2cd73ad3dc28af"; }; nativeBuildInputs = [ libtool m4 autoreconfHook automake file ]; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 10d5ee275006..054e6df0e4c9 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3 }: +{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3, darwin }: stdenv.mkDerivation rec { pname = "glibmm"; @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig gnum4 ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + ]); propagatedBuildInputs = [ glib libsigcxx ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index b030eab7c3ad..791588942bab 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "Library for application-level logging"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index eeeff731a6e3..d532e906a510 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -11,14 +11,14 @@ assert idnSupport -> libidn != null; with stdenv.lib; let - version = "1.0.21"; + version = "1.0.22"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw"; + sha256 = "0r69gq8if9yy1amjzl7qrq9lzhhna7qgz905ln4wvkwchha1ppja"; }; buildInputs = [ ] diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index 8249ac5ce3a9..171c6d40fac1 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection }: stdenv.mkDerivation rec { pname = "gnome-menus"; - version = "3.31.3"; + version = "3.31.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11i5m0w15by1k8d94xla54nr4r8nnb63wk6iq0dzki4cv5d55qgw"; + sha256 = "1iihxcibjg22jxsw3s1cxzcq0rhn1rdmx4xg7qjqij981afs8dr7"; }; - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; + makeFlags = [ + "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib gobject-introspection ]; + buildInputs = [ glib gobject-introspection ]; meta = { homepage = https://www.gnome.org; diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 052438241426..7dc45edd6369 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { homepage = https://www.gnu.org/software/gnutls/; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ eelco wkennington fpletz ]; + maintainers = with maintainers; [ eelco fpletz ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index de71704cff85..44339c3dfedd 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; license = licenses.bsd3; - maintainers = with maintainers; [ vcunat wkennington ]; + maintainers = with maintainers; [ vcunat ]; }; } diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 0e4ef72b8aae..fc98af8b2cae 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "fix-key-expiry.patch"; - url = "https://files.gnupg.net/file/data/fehgbjmataj5tc2pnfhj/PHID-FILE-aqck6l4elhw53tjanrie/file"; - sha256 = "1h80m045gy7r0g7dzzlfpql6p065x88p274ij9jnf7d4lwwgrf1a"; + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60"; + sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02"; }) ]; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index e81989c20937..3b4cc86aaaa4 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.17.2"; + version = "1.18.0"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1rq20951h5in3dy0waa60dsqj27kmg6ylp2gdsxyfrq5jarlj89g"; + sha256 = "0pf8q1z3qhlljlj6h7isvqvsxhh4612z780xcbv1h9lj7cdpr77m"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 9f3bb3c7eadf..a9ee776d441c 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = https://www.gnu.org/software/gss/; description = "Generic Security Service"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjg wkennington ]; + maintainers = with maintainers; [ bjg ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix deleted file mode 100644 index 9c9243a1c683..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gst-plugins-base, bzip2, yasm, orc -, useInternalFfmpeg ? false, ffmpeg ? null }: - -stdenv.mkDerivation rec { - name = "gst-ffmpeg-0.10.13"; - - src = fetchurl { - urls = [ - "https://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n"; - }; - - # Upstream strongly recommends against using --with-system-ffmpeg, - # but we do it anyway because we're so hardcore (and we don't want - # multiple copies of ffmpeg). - configureFlags = stdenv.lib.optional (!useInternalFfmpeg) "--with-system-ffmpeg"; - - buildInputs = - [ pkgconfig bzip2 gst-plugins-base orc ] - ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); - - meta = { - homepage = https://gstreamer.freedesktop.org/releases/gst-ffmpeg; - description = "GStreamer's plug-in using FFmpeg"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch b/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch new file mode 100644 index 000000000000..9725cfb84260 --- /dev/null +++ b/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch @@ -0,0 +1,22 @@ +--- a/gdk/x11/gdkapplaunchcontext-x11.c ++++ b/gdk/x11/gdkapplaunchcontext-x11.c +@@ -26,7 +26,6 @@ + #include <unistd.h> + + #include <glib.h> +-#include <gio/gdesktopappinfo.h> + + #include "gdkx.h" + #include "gdkapplaunchcontext.h" +@@ -363,10 +362,7 @@ + else + workspace_str = NULL; + +- if (G_IS_DESKTOP_APP_INFO (info)) +- application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info)); +- else +- application_id = NULL; ++ application_id = NULL; + + startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu", + g_get_prgname (), diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 266abe16c103..c7638ea5fe5f 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -32,10 +32,13 @@ stdenv.mkDerivation rec { patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch - ] ++ optional stdenv.isDarwin (fetchpatch { - url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; - sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; - }); + ] ++ optionals stdenv.isDarwin [ + (fetchpatch { + url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; + sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; + }) + ./2.0-darwin-x11.patch + ]; propagatedBuildInputs = with xorg; [ glib cairo pango gdk_pixbuf atk ] diff --git a/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch b/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch new file mode 100644 index 000000000000..86631634b5bd --- /dev/null +++ b/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch @@ -0,0 +1,28 @@ +--- a/gdk/x11/gdkapplaunchcontext-x11.c ++++ b/gdk/x11/gdkapplaunchcontext-x11.c +@@ -27,7 +27,9 @@ + #include "gdkprivate-x11.h" + + #include <glib.h> ++#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__) + #include <gio/gdesktopappinfo.h> ++#endif + + #include <string.h> + #include <unistd.h> +@@ -352,10 +354,15 @@ + else + workspace_str = NULL; + ++#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__) + if (G_IS_DESKTOP_APP_INFO (info)) + application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info)); + else + application_id = NULL; ++#else ++ application_id = NULL; ++#warning Please add support for creating AppInfo from id for your OS ++#endif + + startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu", + g_get_prgname (), diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 6a1fcf78cb3f..dc0675db2cde 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) + ] ++ optionals stdenv.isDarwin [ + # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin + # let’s drop that dependency in similar way to how other parts of the library do it + # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 + ./3.0-darwin-x11.patch ]; buildInputs = [ libxkbcommon epoxy json-glib isocodes ] diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 51c369f7c2d4..05e180161c0b 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal) license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 0f68d7df2981..13f7c4219069 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "Minimalistic C client for Redis >= 1.2"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index 442da700f345..d4ebb5534d9c 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "Provides functionalities about i18n domain name processing"; license = "idnkit-2 license"; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 98370f52e183..42cf77802625 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { homepage = http://www.openexr.com/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index bdb8f3b76ae6..25b55f00311b 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "C library for encoding, decoding and manipulating JSON data"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 321ebb46e463..2b2f75abfd17 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { description = "A software implementation of the JBIG1 data compression standard"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index 6e83b9637c16..c14ac7c65abd 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -4,8 +4,8 @@ # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. # Causes segfaults with some software (ex. rustc), but defaults to true for backward -# compatibility. Ignored on non OSX. -, stripPrefix ? true +# compatibility. +, stripPrefix ? stdenv.hostPlatform.isDarwin , disableInitExecTls ? false }: @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # see the comment on stripPrefix configureFlags = [] - ++ optional (stdenv.isDarwin && stripPrefix) [ "--with-jemalloc-prefix=" ] - ++ optional disableInitExecTls [ "--disable-initial-exec-tls" ] + ++ optional stripPrefix "--with-jemalloc-prefix=" + ++ optional disableInitExecTls "--disable-initial-exec-tls" ; doCheck = true; @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 5b92458d89e9..fc3a8d64a473 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { postUnpack = '' sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common - sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac + sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac ''; preConfigure = '' @@ -92,7 +92,6 @@ stdenv.mkDerivation rec { description = "An implementation of Kerberos 5 (and some more stuff)"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; passthru.implementation = "heimdal"; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 50a669b053f9..6ff6bb955913 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -76,7 +76,6 @@ stdenv.mkDerivation rec { homepage = http://web.mit.edu/kerberos/; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ wkennington ]; }; passthru.implementation = "krb5"; diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 445f65b9202e..2e4a4d54dd4e 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -54,6 +54,5 @@ stdenv.mkDerivation rec { description = "Code for producing C and C++ kinetic clients"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index d270e2f0678d..d3733ea5f720 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "kmsxx"; - version = "2018-09-10"; + version = "2018-10-23"; name = pname + "-" + version; src = fetchFromGitHub { owner = "tomba"; repo = "kmsxx"; fetchSubmodules = true; - rev = "524176c33ee2b79f78d454fa621e0d32e7e72488"; - sha256 = "0wyg0zv207h5a78cwmbg6fi8gr8blbbkwngjq8hayfbg45ww0jy8"; + rev = "c0093c91f0fa2fd6a5b9d1b206a6f44dcd55bfb5"; + sha256 = "03rv92r938nxb4k4gwcvxy76jnhxdx6x60b58jws83285hd9rgkf"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 5ca68b4361af..897f33953afb 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { description = "A library of routines for managing a database"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 10441b9b871e..5566b1f4f0e2 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { description = "A LDAP-like embedded database"; homepage = https://ldb.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index c459a4048e45..b18af4cf8344 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -38,6 +38,5 @@ stdenv.mkDerivation rec { description = "Fast and lightweight key/value database library by Google"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 85972e67e103..cc6c9464de36 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libamqpcpp-${version}"; - version = "3.0.0"; + version = "4.1.3"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "0n93wy2v2hx9zalpyn8zxsxihh0xpgcd472qwvwsc253y97v8ngv"; + sha256 = "0qk431ra7vcklc67fdaddrj5a7j50znjr79zrwvhkcfy82fd56zw"; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index bafcc5210b38..f7805c9f375f 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "A C library for Linux/Unix for executing name service queries asynchronously"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index a83a3c672c0f..78f5e9d233ca 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation { description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 2a03efd632ff..99cd636b03b8 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -52,12 +52,11 @@ stdenv.mkDerivation rec { # Remove the unneeded var/lib directories rm -rf $out/var ''; - + meta = { homepage = http://libdbi-drivers.sourceforge.net/; description = "Database drivers for libdbi"; platforms = platforms.all; license = licenses.lgpl21; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index 4f6b9dd099dd..b242bd8613ef 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "DB independent interface to DB"; license = licenses.lgpl21; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 0328a2215b48..db5448caa102 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libdeflate-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "1wqxwza6rwmhrsy9sw86pdcd0w742gbzsy9qxnq6kk59m6h1dbsb"; + sha256 = "0kmp38s7vahvbgzzhs5v0bfyjgas1in7jn69gpyh70kl08279ly0"; }; postPatch = '' diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index df67b849cd3f..33d835d69196 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "Some essentials for string handling"; license = licenses.lgpl21; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index d1b4e06dbc18..39d2c29b0127 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -68,6 +68,5 @@ stdenv.mkDerivation rec { homepage = http://libevent.org/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 28e1ad895b45..f4863eb33f26 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { description = "A library for manipulating FlashPIX images"; license = "Flashpix"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index 4139af2eac2a..2ccdd14874a1 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; repositories.git = git://git.gnupg.org/libgcrypt.git; }; } diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 173dc1f722b4..4d8a7eac27c8 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.wkennington maintainers.vrthra ]; + maintainers = with maintainers; [ vrthra ]; repositories.git = git://git.gnupg.org/libgcrypt.git; }; } diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 1d07fe6ca268..1c50a28f0a4d 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -2,11 +2,12 @@ , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk3, gnome3 , dbus, xvfb_run, libxml2 +, hicolor-icon-theme }: let pname = "libhandy"; - version = "0.0.6"; + version = "0.0.7"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -18,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0gmqsxkpi288qjfdczfrbvjqyy9sbn3gligqwgqj27ask95zl1q5"; + sha256 = "1k9v6q2dz9x8lfcyzmsksrkq6md7m9jdkjlfan7nqlcj3mqhd7m9"; }; nativeBuildInputs = [ @@ -26,10 +27,12 @@ in stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ]; - checkInputs = [ dbus xvfb_run ]; + checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ "-Dgtk_doc=true" + "-Dglade_catalog=enabled" + "-Dintrospection=enabled" ]; PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index 970cb8a530f7..00bd7e6eeea7 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -14,6 +14,5 @@ stdenv.mkDerivation rec { homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix index a7950de3aef0..689e9a0be5dd 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -12,6 +12,5 @@ stdenv.mkDerivation rec { homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 9d892069b269..8ca3dd727545 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation rec { description = "An Open Source implementation of the iCalendar protocols"; license = licenses.mpl20; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 2ad59e698d0b..4c0119f473c1 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { homepage = http://www.linux1394.org; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index ca30fe87396f..27eba7f4f488 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { homepage = http://www.freedesktop.org/wiki/Software/libinput; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ codyopel wkennington ]; + maintainers = with maintainers; [ codyopel ]; }; } diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index d48d89235d8d..c83a3e40df27 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { description = "CMS and X.509 access library"; platforms = platforms.all; license = licenses.lgpl3; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index a3c809c3bd6b..92e7d26f5afa 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { description = "Keyless Signature Infrastructure API library"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index dd852e1de85a..d0aaebadbaad 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "Lightweight signal-safe logging library"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index 60a38915630e..b03ab0e3fabb 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; license = licenses.lgpl21; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index d07840977795..17632c678c46 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index 343622e8d5c7..30cb8c9df2ff 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { description = "An alternative C driver for MongoDB"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index f642ad5ccfab..ba116e20177f 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "Portable framework for low-level network packet construction"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix new file mode 100644 index 000000000000..95533696ddf2 --- /dev/null +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libmnl }: + +stdenv.mkDerivation rec { + version = "1.0.3"; + name = "libnetfilter_acct-${version}"; + + src = fetchurl { + url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${name}.tar.bz2"; + sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl ]; + + meta = with stdenv.lib; { + homepage = http://www.netfilter.org/projects/libnetfilter_acct/; + description = "Userspace library providing interface to extended accounting infrastructure."; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index ff729f586f4c..f94af3498421 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://netfilter.org/projects/libnftnl; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 68302acac29f..d53b1dc08308 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 30fa7d749a12..4369169014cc 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; homepage = http://www.opus-codec.org/; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 9be217a800d3..080a19452154 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { repositories.git = git://git.code.sf.net/p/otr/libotr; license = licenses.lgpl21; description = "Library for Off-The-Record Messaging"; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index c19dc73abfa6..25b088f99ec8 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -15,6 +15,5 @@ stdenv.mkDerivation rec{ description = "A library providing high performance logging, tracing, ipc, and poll"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index db9c29469353..160ce9fcabf6 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.4.1"; + version = "0.4.2.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "16hi2xqlb4afspqw31c5w63qp0j4gkd6sl7j637b8cac2yigbbns"; + sha256 = "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 5bfa1427ab65..99383fe6450c 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { description = "Modem protocol helper library"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index 39d5c64f64fc..a99e4d22077e 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 284b95b8a2bd..011de93e668f 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "A reliable logging library"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 631580aa7d18..11ed2eb0044a 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -29,7 +29,7 @@ let homepage = "https://www.libressl.org"; license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ]; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; + maintainers = with maintainers; [ thoughtpolice fpletz globin ]; }; }; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index a592fd86257f..b1e426172538 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "librime-${version}"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "rime"; repo = "librime"; rev = "${version}"; - sha256 = "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r"; + sha256 = "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index afb83051b211..e4e96df86c16 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 6dff8ebc8a1f..b23bff415a25 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { description = "Sample Rate Converter for audio"; homepage = http://www.mega-nerd.com/SRC/index.html; license = licenses.bsd2; - maintainers = with maintainers; [ lovek323 wkennington ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index c8d9e21366df..1f188f98f038 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.linux; badPlatforms = platforms.riscv; - maintainers = with maintainers; [ thoughtpolice wkennington ]; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index f2f8aed065f0..fbff51b5ffb5 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A modern and easy-to-use crypto library"; homepage = http://doc.libsodium.org/; license = licenses.isc; - maintainers = with maintainers; [ raskin wkennington ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index fb7b3be6b698..8896447590ba 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 341e2cd1c778..302400388437 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { portable, and only require an ANSI C89 platform. ''; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index b5ab9d310da3..81bd35ff293c 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = https://www.theora.org/; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; - maintainers = with maintainers; [ spwhitt wkennington ]; + maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 675ca1cd220b..a622f45ca5bf 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "A C library and command-line tool that implements the host-side of the U2F protocol"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 226fe5be536a..07ed1cba8be0 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "C++ wrapper for the libxml2 XML parser library"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ phreedom wkennington ]; + maintainers = with maintainers; [ phreedom ]; }; } diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 671c077b0347..c1f34bd33980 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation { description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index ba179e54fe0c..be493828486c 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { description = "A C library to interact with the CCID-part of the Yubikey NEO"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 5b10e62deee7..010eecb0fa97 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { homepage = http://opensource.yubico.com/yubico-c/; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; license = licenses.bsd2; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix index 5748d3402449..8b8d8cd0be80 100644 --- a/pkgs/development/libraries/mbedtls/1.3.nix +++ b/pkgs/development/libraries/mbedtls/1.3.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Portable cryptographic and SSL/TLS library, aka polarssl"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 9193f0eba1d5..b5bfb4af0bdb 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 5a29a9219fb8..8f0a6317a257 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -2,14 +2,17 @@ stdenv.mkDerivation rec { name = "medfile-${version}"; - version = "3.3.1"; + version = "4.0.0"; src = fetchurl { url = "http://files.salome-platform.org/Salome/other/med-${version}.tar.gz"; - sha256 = "1215sal10xp6xirgggdszay2bmx0sxhn9pgh7x0wg2w32gw1wqyx"; + sha256 = "017h9p0x533fm4gn6pwc8kmp72rvqmcn6vznx72nkkl2b05yjx54"; }; - buildInputs = [ cmake hdf5 ]; + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ hdf5 ]; checkPhase = "make test"; diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index de277329961b..29ec205d7a11 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "MessagePack implementation for C and C++"; homepage = https://msgpack.org; license = licenses.asl20; - maintainers = with maintainers; [ redbaron wkennington ]; + maintainers = with maintainers; [ redbaron ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 0e1327e9e761..e999ea73ae2e 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -16,10 +16,9 @@ stdenv.mkDerivation rec { kernel MT events to the slotted type B protocol. The events put into mtdev may be from any MT device, specifically type A without contact tracking, type A with contact tracking, or type B with contact tracking. - See the kernel documentation for further details. + See the kernel documentation for further details. ''; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index f5995a8f480e..ef3ff13bac6d 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -165,7 +165,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.wkennington ]; }; passthru = { diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 2ef367b6c53a..d78a31d65cd3 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (rec { homepage = http://www.lysator.liu.se/~nisse/nettle/; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index ae9c329775cf..fdc21b26271f 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation rec { description = "A C implementation of HTTP/2"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index f8b993d202ab..57eab750695b 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.41"; + version = "3.42"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz"; - sha256 = "0bbif42fzz5gk451sv3yphdrl7m4p6zgk5jk0307j06xs3sihbmb"; + sha256 = "04rg0yar0plbx1sajrzywprqyhlskczkqxxsgxmcc0qqy64y8g2x"; }; buildInputs = [ perl zlib sqlite ] diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 5fc57a2ef671..e165f037be63 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index a70cba625a89..a310d2f27802 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { description = "The not-so trivial database"; homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index bddb0e1479e2..5ad7eecace1b 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "openct-${version}"; version = "0.6.20"; - + src = fetchFromGitHub { owner = "OpenSC"; repo = "openct"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am ''; - + configureFlags = [ "--enable-api-doc" "--enable-usb" @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/OpenSC/openct/; license = licenses.lgpl21; description = "Drivers for several smart card readers"; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index bb9d163dc4ac..b575fa0ef08c 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { homepage = http://www.openexr.com/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch new file mode 100644 index 000000000000..2c98ccfa7ed0 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h +index 329ef62..9a8df64 100644 +--- a/include/internal/cryptlib.h ++++ b/include/internal/cryptlib.h +@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch new file mode 100644 index 000000000000..67d199681f96 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h +index 329ef62..9a8df64 100644 +--- a/include/internal/cryptlib.h ++++ b/include/internal/cryptlib.h +@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 32fd6e727f7d..0954e1b70bb7 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -134,7 +134,13 @@ in { openssl_1_1 = common { version = "1.1.1a"; sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w"; - patches = [ ./1.1/nix-ssl-cert-file.patch ]; + patches = [ + ./1.1/nix-ssl-cert-file.patch + + (if stdenv.hostPlatform.isDarwin + then ./1.1/use-etc-ssl-certs-darwin.patch + else ./1.1/use-etc-ssl-certs.patch) + ]; withDocs = true; }; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 4150f0f466cd..5a5e8ffaef7c 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -3,7 +3,7 @@ , systemd }: let - version = "2018-11-04"; + version = "2018-11-13"; in stdenv.mkDerivation rec { name = "openzwave-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "home-assistant"; repo = "open-zwave"; - rev = "2cc174ad5c935d2d17828634aca2db5a60c59237"; + rev = "0679daef6aa5a39e2441a68f7b45cfe022c4d961"; sha256 = "1d13maj93i6h792cbvqpx43ffss44dxmvbwj2777vzvvjib8m4n8"; }; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index b4bdd200211c..e70d20dd93da 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://p11-glue.freedesktop.org/; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 6509b04f0113..983523e1f2fb 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root }: +{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: stdenv.mkDerivation rec { name = "apfelgrid-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ apfel applgrid lhapdf root ]; + buildInputs = [ apfel applgrid lhapdf root5 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 1a3334562641..620f227250dd 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "QCDNUM-${version}"; - version = "17-01-14"; + version = "17-01-13"; src = fetchurl { url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz"; - sha256 = "199s6kgmszxgjzd9214mpx3kyplq2q6987sii67s5xkg10ynyv31"; + sha256 = "0568rjviwvjkfihq2ka7g91vmialr31ryn7c69iqf13rcv5vzcw7"; }; nativeBuildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index eee9a813c742..f1b6c002488e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -33,8 +33,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig ]; - # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++14"; + # Workaround #54606 + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt + ''; cmakeFlags = [ (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS" diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix deleted file mode 100644 index be7fc6f8c173..000000000000 --- a/pkgs/development/libraries/postgis/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ fetchurl -, stdenv -, perl -, libxml2 -, postgresql -, geos -, proj -, gdal -, json_c -, pkgconfig -, file -}: - - /* - - ### NixOS - usage: - ================== - - services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_5; }) ]; - - - ### important Postgis implementation details: - ============================================= - - Postgis provides a shared library implementing many operations. They are - exposed to the Postgres SQL interpreter by special SQL queries eg: - - CREATE FUNCTION [...] - AS '[..]liblwgeom', 'lwhistogram2d_in' LANGUAGE 'C' IMMUTABLE STRICT; -- WITH (isstrict); - - where liblwgeom is the shared library. - Postgis < 1.5 used absolute paths, in NixOS $libdir is always used. - - Thus if you want to use postgresql dumps which were created by non NixOS - systems you have to adopt the library path. - - - ### TODO: - ========= - the bin commands to have gtk gui: - */ - - -let - version = "2.5.1"; - sha256 = "14bsh4kflp4bxilypkpmhrpldknc9s9vgiax8yfhxbisyib704zv"; -in stdenv.mkDerivation rec { - name = "postgis-${version}"; - - src = fetchurl { - url = "https://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; - inherit sha256; - }; - - # don't pass these vars to the builder - removeAttrs = ["sql_comments" "sql_srcs"]; - - preInstall = '' - mkdir -p $out/bin - ''; - - # create aliases for all commands adding version information - postInstall = '' - sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) - - for prog in $out/bin/*; do # */ - ln -s $prog $prog-${version} - done - - cp -r doc $out - ''; - - buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; - - sql_comments = "postgis_comments.sql"; - - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - - # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; - - dontDisableStatic = true; - preConfigure = '' - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" - makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" - ''; - postConfigure = '' - sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/scripts/python/Makefile"; - ''; - - meta = with stdenv.lib; { - description = "Geographic Objects for PostgreSQL"; - homepage = http://postgis.refractions.net; - license = licenses.gpl2; - maintainers = [ maintainers.marcweber ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index ce0b2506c572..e0c5d4db9305 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 5fbab32acda8..c6cc393624e6 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -61,6 +61,9 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; + qtwebengine = + optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch + ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch; qtwebkit = [ ./qtwebkit.patch ]; }; diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch new file mode 100644 index 000000000000..8dafd65cd343 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch @@ -0,0 +1,30 @@ +Fix a following build error: + +In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: +../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|." + static_assert( + ^ +../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here + : AssertConstructible<Ns, Args, std::decay_t<Args>, Unwrapped, Params>... { + ^ +../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity<std::__1::integer_sequence<unsigned long, 0, 1>, base::internal::TypeList<base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, const long &>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, NSError *> >' requested here + static_assert(internal::AssertBindArgsValidity< + ^ +../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here + return base::BindRepeating(std::forward<Functor>(functor), + ^ +../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, + ^ + +--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm ++++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm +@@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, +- weak_ptr_factory_.GetWeakPtr(), nil)); ++ weak_ptr_factory_.GetWeakPtr(), nullptr)); + } + } + diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch new file mode 100644 index 000000000000..d43b09b95383 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch @@ -0,0 +1,160 @@ +Fix build against 10.10 SDK + +The SecKey part perhaps could be fixed by implementing a revert to +https://chromium.googlesource.com/chromium/src.git/+/8418e098b9cbedf884878b61dcd3292c515845cf%5E%21/#F0 + +--- a/src/3rdparty/chromium/content/browser/renderer_host/input/web_input_event_builders_mac.mm ++++ b/src/3rdparty/chromium/content/browser/renderer_host/input/web_input_event_builders_mac.mm +@@ -1,3 +1,4 @@ ++#define NSEventTypeScrollWheel 22 + // Copyright 2015 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. +--- a/src/3rdparty/chromium/net/ssl/ssl_platform_key_mac.cc ++++ b/src/3rdparty/chromium/net/ssl/ssl_platform_key_mac.cc +@@ -48,21 +48,6 @@ namespace net { + + namespace { + +-// TODO(davidben): Remove this when we switch to building to the 10.13 +-// SDK. https://crbug.com/780980 +-#if !defined(MAC_OS_X_VERSION_10_13) || \ +- MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13 +-API_AVAILABLE(macosx(10.13)) +-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA256 = +- CFSTR("algid:sign:RSA:digest-PSS:SHA256:SHA256:32"); +-API_AVAILABLE(macosx(10.13)) +-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA384 = +- CFSTR("algid:sign:RSA:digest-PSS:SHA384:SHA384:48"); +-API_AVAILABLE(macosx(10.13)) +-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA512 = +- CFSTR("algid:sign:RSA:digest-PSS:SHA512:SHA512:64"); +-#endif +- + class ScopedCSSM_CC_HANDLE { + public: + ScopedCSSM_CC_HANDLE() : handle_(0) {} +@@ -187,109 +172,6 @@ class SSLPlatformKeyCSSM : public ThreadedSSLPrivateKey::Delegate { + DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyCSSM); + }; + +-// Returns the corresponding SecKeyAlgorithm or nullptr if unrecognized. +-API_AVAILABLE(macosx(10.12)) +-SecKeyAlgorithm GetSecKeyAlgorithm(uint16_t algorithm) { +- switch (algorithm) { +- case SSL_SIGN_RSA_PKCS1_SHA512: +- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA512; +- case SSL_SIGN_RSA_PKCS1_SHA384: +- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA384; +- case SSL_SIGN_RSA_PKCS1_SHA256: +- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA256; +- case SSL_SIGN_RSA_PKCS1_SHA1: +- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA1; +- case SSL_SIGN_RSA_PKCS1_MD5_SHA1: +- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15Raw; +- case SSL_SIGN_ECDSA_SECP521R1_SHA512: +- return kSecKeyAlgorithmECDSASignatureDigestX962SHA512; +- case SSL_SIGN_ECDSA_SECP384R1_SHA384: +- return kSecKeyAlgorithmECDSASignatureDigestX962SHA384; +- case SSL_SIGN_ECDSA_SECP256R1_SHA256: +- return kSecKeyAlgorithmECDSASignatureDigestX962SHA256; +- case SSL_SIGN_ECDSA_SHA1: +- return kSecKeyAlgorithmECDSASignatureDigestX962SHA1; +- } +- +- if (base::mac::IsAtLeastOS10_13()) { +- switch (algorithm) { +- case SSL_SIGN_RSA_PSS_SHA512: +- return kSecKeyAlgorithmRSASignatureDigestPSSSHA512; +- case SSL_SIGN_RSA_PSS_SHA384: +- return kSecKeyAlgorithmRSASignatureDigestPSSSHA384; +- case SSL_SIGN_RSA_PSS_SHA256: +- return kSecKeyAlgorithmRSASignatureDigestPSSSHA256; +- } +- } +- +- return nullptr; +-} +- +-class API_AVAILABLE(macosx(10.12)) SSLPlatformKeySecKey +- : public ThreadedSSLPrivateKey::Delegate { +- public: +- SSLPlatformKeySecKey(int type, size_t max_length, SecKeyRef key) +- : key_(key, base::scoped_policy::RETAIN) { +- // Determine the algorithms supported by the key. +- for (uint16_t algorithm : SSLPrivateKey::DefaultAlgorithmPreferences( +- type, true /* include PSS */)) { +- SecKeyAlgorithm sec_algorithm = GetSecKeyAlgorithm(algorithm); +- if (sec_algorithm && +- SecKeyIsAlgorithmSupported(key_.get(), kSecKeyOperationTypeSign, +- sec_algorithm)) { +- preferences_.push_back(algorithm); +- } +- } +- } +- +- ~SSLPlatformKeySecKey() override {} +- +- std::vector<uint16_t> GetAlgorithmPreferences() override { +- return preferences_; +- } +- +- Error Sign(uint16_t algorithm, +- base::span<const uint8_t> input, +- std::vector<uint8_t>* signature) override { +- SecKeyAlgorithm sec_algorithm = GetSecKeyAlgorithm(algorithm); +- if (!sec_algorithm) { +- NOTREACHED(); +- return ERR_FAILED; +- } +- +- const EVP_MD* md = SSL_get_signature_algorithm_digest(algorithm); +- uint8_t digest[EVP_MAX_MD_SIZE]; +- unsigned digest_len; +- if (!md || !EVP_Digest(input.data(), input.size(), digest, &digest_len, md, +- nullptr)) { +- return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED; +- } +- +- base::ScopedCFTypeRef<CFDataRef> digest_ref(CFDataCreateWithBytesNoCopy( +- kCFAllocatorDefault, digest, base::checked_cast<CFIndex>(digest_len), +- kCFAllocatorNull)); +- +- base::ScopedCFTypeRef<CFErrorRef> error; +- base::ScopedCFTypeRef<CFDataRef> signature_ref(SecKeyCreateSignature( +- key_, sec_algorithm, digest_ref, error.InitializeInto())); +- if (!signature_ref) { +- LOG(ERROR) << error; +- return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED; +- } +- +- signature->assign( +- CFDataGetBytePtr(signature_ref), +- CFDataGetBytePtr(signature_ref) + CFDataGetLength(signature_ref)); +- return OK; +- } +- +- private: +- std::vector<uint16_t> preferences_; +- base::ScopedCFTypeRef<SecKeyRef> key_; +- +- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeySecKey); +-}; +- + scoped_refptr<SSLPrivateKey> CreateSSLPrivateKeyForSecKey( + const X509Certificate* certificate, + SecKeyRef private_key) { +@@ -298,13 +180,6 @@ scoped_refptr<SSLPrivateKey> CreateSSLPrivateKeyForSecKey( + if (!GetClientCertInfo(certificate, &key_type, &max_length)) + return nullptr; + +- if (base::mac::IsAtLeastOS10_12()) { +- return base::MakeRefCounted<ThreadedSSLPrivateKey>( +- std::make_unique<SSLPlatformKeySecKey>(key_type, max_length, +- private_key), +- GetSSLPlatformKeyTaskRunner()); +- } +- + const CSSM_KEY* cssm_key; + OSStatus status = SecKeyGetCSSMKey(private_key, &cssm_key); + if (status != noErr) { diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index 103fa4e09abc..e631d3ae9b00 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch index 1c3a9b05cb24..875fba12e2fb 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch @@ -1,16 +1,3 @@ -diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm -index 66baf16..89794ef 100644 ---- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm -+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm -@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl - - QFixed QCoreTextFontEngine::emSquareSize() const - { -- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); -+ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); - } - - QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 341d3bc..3368234 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix index df7846ca3866..09b6293daebc 100644 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix @@ -3,275 +3,275 @@ { qt3d = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz"; - sha256 = "0gr7wvd3p8i2frj9nkfxffxapwqx6i4wh171ymvcsg2qy0r534lp"; - name = "qt3d-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qt3d-opensource-src-5.9.7.tar.xz"; + sha256 = "0skdp72jlfy97cw9lpa3l2ivs6f5x9w53978sf2xbkl9k1ai268l"; + name = "qt3d-opensource-src-5.9.7.tar.xz"; }; }; qtactiveqt = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtactiveqt-opensource-src-5.9.3.tar.xz"; - sha256 = "16aka3y7a6mhs0yfm7vbq8v5gbh2ifmk4v2hl04iacindq9f5v2r"; - name = "qtactiveqt-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtactiveqt-opensource-src-5.9.7.tar.xz"; + sha256 = "01yp0railyc80ldvpiy36lpsdk26rs8vfp78xca9jy1glm4cmaik"; + name = "qtactiveqt-opensource-src-5.9.7.tar.xz"; }; }; qtandroidextras = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtandroidextras-opensource-src-5.9.3.tar.xz"; - sha256 = "0f653qmzvr3rjjgipjbcxvp5wq9fbaz1b4bvj7g868s2d9gpqp9n"; - name = "qtandroidextras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtandroidextras-opensource-src-5.9.7.tar.xz"; + sha256 = "1bl05hr0zm23z7qig3kxhzyvm440wfrjfgsxvpmlvk9pbb8h2q63"; + name = "qtandroidextras-opensource-src-5.9.7.tar.xz"; }; }; qtbase = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz"; - sha256 = "10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y"; - name = "qtbase-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtbase-opensource-src-5.9.7.tar.xz"; + sha256 = "004gs95ig51jv2wz64kwzl4rvqqzs4rln3kqmzjs3sh6y1s9bp9n"; + name = "qtbase-opensource-src-5.9.7.tar.xz"; }; }; qtcanvas3d = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcanvas3d-opensource-src-5.9.3.tar.xz"; - sha256 = "1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y"; - name = "qtcanvas3d-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtcanvas3d-opensource-src-5.9.7.tar.xz"; + sha256 = "131zwqddjns7cpkdbr33jahqgvnw6f8gdcr1b2hmadi0p2shrcwq"; + name = "qtcanvas3d-opensource-src-5.9.7.tar.xz"; }; }; qtcharts = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz"; - sha256 = "1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc"; - name = "qtcharts-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtcharts-opensource-src-5.9.7.tar.xz"; + sha256 = "1rkj4lkpgdqk4ygxivkj7gc8mlccb5sgi9mfr0xwvq5j85r3dk8n"; + name = "qtcharts-opensource-src-5.9.7.tar.xz"; }; }; qtconnectivity = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz"; - sha256 = "0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2"; - name = "qtconnectivity-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtconnectivity-opensource-src-5.9.7.tar.xz"; + sha256 = "0f7g2lfnfgsjka7y5hdf0lbzpfxlxh8bfhdxix44cwlmwzjizy3l"; + name = "qtconnectivity-opensource-src-5.9.7.tar.xz"; }; }; qtdatavis3d = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz"; - sha256 = "0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh"; - name = "qtdatavis3d-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdatavis3d-opensource-src-5.9.7.tar.xz"; + sha256 = "08anm8byxcym7h1n49j3cbxkh3kh3xjlxd3b8vi8fxyqqhvll4lv"; + name = "qtdatavis3d-opensource-src-5.9.7.tar.xz"; }; }; qtdeclarative = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz"; - sha256 = "01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh"; - name = "qtdeclarative-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdeclarative-opensource-src-5.9.7.tar.xz"; + sha256 = "0p26c96fb33khbf7ws91ha73n72lwmn714v8spg0bla9m1jkfhk8"; + name = "qtdeclarative-opensource-src-5.9.7.tar.xz"; }; }; qtdoc = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdoc-opensource-src-5.9.3.tar.xz"; - sha256 = "0aki592arm3r08y9cq8863jp9zzkvgx7sc48426n30m6q9valsg5"; - name = "qtdoc-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdoc-opensource-src-5.9.7.tar.xz"; + sha256 = "1vs6dy0mdcn65fhpl8nib0pjw9bliqkjnaahqm833ayvxr15vzyj"; + name = "qtdoc-opensource-src-5.9.7.tar.xz"; }; }; qtgamepad = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgamepad-opensource-src-5.9.3.tar.xz"; - sha256 = "14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6"; - name = "qtgamepad-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtgamepad-opensource-src-5.9.7.tar.xz"; + sha256 = "0242683h9jz6b0n11s4m4ii2691dbws0gkj45n6sx6z513blfx9f"; + name = "qtgamepad-opensource-src-5.9.7.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz"; - sha256 = "1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr"; - name = "qtgraphicaleffects-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtgraphicaleffects-opensource-src-5.9.7.tar.xz"; + sha256 = "1yhxa3i3jvfnc9l6a3q3pyk7y702a3pp87ypshb63607xvrxrv2d"; + name = "qtgraphicaleffects-opensource-src-5.9.7.tar.xz"; }; }; qtimageformats = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz"; - sha256 = "1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl"; - name = "qtimageformats-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtimageformats-opensource-src-5.9.7.tar.xz"; + sha256 = "1an0k3rzxjc4x4rscnibdk36zff6g1n41lh5dasys4jc05k3w1b2"; + name = "qtimageformats-opensource-src-5.9.7.tar.xz"; }; }; qtlocation = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz"; - sha256 = "1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0"; - name = "qtlocation-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtlocation-opensource-src-5.9.7.tar.xz"; + sha256 = "0lp6zn630px1lj7623shq47dlv02nr0aj7iqscrk0yzhygbv7dc2"; + name = "qtlocation-opensource-src-5.9.7.tar.xz"; }; }; qtmacextras = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmacextras-opensource-src-5.9.3.tar.xz"; - sha256 = "0piv3q49vhpjxafdicizcw13am49h0ybfhb37vai0x1wbrlvhdiy"; - name = "qtmacextras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtmacextras-opensource-src-5.9.7.tar.xz"; + sha256 = "0b0znccbach41la226cmps9aaigpz8mj940xj890arjf8hn4jd97"; + name = "qtmacextras-opensource-src-5.9.7.tar.xz"; }; }; qtmultimedia = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz"; - sha256 = "19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7"; - name = "qtmultimedia-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtmultimedia-opensource-src-5.9.7.tar.xz"; + sha256 = "060gic3gl27r7k4vw4n550384b4wadqfn3biajbq6lbyj3zhgxxx"; + name = "qtmultimedia-opensource-src-5.9.7.tar.xz"; }; }; qtnetworkauth = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz"; - sha256 = "0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz"; - name = "qtnetworkauth-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtnetworkauth-opensource-src-5.9.7.tar.xz"; + sha256 = "14n8wzsyq7bw67r1k442widfvszawgi5sh0b10h2jcrp5aikqr0p"; + name = "qtnetworkauth-opensource-src-5.9.7.tar.xz"; }; }; qtpurchasing = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtpurchasing-opensource-src-5.9.3.tar.xz"; - sha256 = "00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j"; - name = "qtpurchasing-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtpurchasing-opensource-src-5.9.7.tar.xz"; + sha256 = "1qvxsi0ar04qy0zajbhvwj5blldhfq2mn3laq15g0xxy1xh4m46i"; + name = "qtpurchasing-opensource-src-5.9.7.tar.xz"; }; }; qtquickcontrols = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz"; - sha256 = "09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih"; - name = "qtquickcontrols-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtquickcontrols-opensource-src-5.9.7.tar.xz"; + sha256 = "1jkz2b2wzxzmskvwwb4afqxz0yp0siaf3yhj2i01y865sp6q1wz0"; + name = "qtquickcontrols-opensource-src-5.9.7.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz"; - sha256 = "0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1"; - name = "qtquickcontrols2-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtquickcontrols2-opensource-src-5.9.7.tar.xz"; + sha256 = "0w9rq77a8vc9avhbwbx7swg7zw7jn21wd7si59822rw9ln1p6zb0"; + name = "qtquickcontrols2-opensource-src-5.9.7.tar.xz"; }; }; qtremoteobjects = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtremoteobjects-opensource-src-5.9.3.tar.xz"; - sha256 = "0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk"; - name = "qtremoteobjects-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtremoteobjects-opensource-src-5.9.7.tar.xz"; + sha256 = "1ninscf4jkframv585zzi76fml1lyz0mhb091r2r54lrf66wl3lw"; + name = "qtremoteobjects-opensource-src-5.9.7.tar.xz"; }; }; qtscript = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz"; - sha256 = "0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq"; - name = "qtscript-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtscript-opensource-src-5.9.7.tar.xz"; + sha256 = "0mv33a1mjaahq7ixfasvjasc881bprfbkjhx8pn3z5f0l8213m67"; + name = "qtscript-opensource-src-5.9.7.tar.xz"; }; }; qtscxml = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz"; - sha256 = "06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq"; - name = "qtscxml-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtscxml-opensource-src-5.9.7.tar.xz"; + sha256 = "0xz2q2bl1n43gxx00nrzyc0bsnq4wch0k2rkj3prc9gsgmpq0bih"; + name = "qtscxml-opensource-src-5.9.7.tar.xz"; }; }; qtsensors = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz"; - sha256 = "1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr"; - name = "qtsensors-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtsensors-opensource-src-5.9.7.tar.xz"; + sha256 = "0pfh4lr9zxsh9winzx1lmcgl2hgp9lr45smcvslr4an93z6mbf8r"; + name = "qtsensors-opensource-src-5.9.7.tar.xz"; }; }; qtserialbus = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz"; - sha256 = "0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg"; - name = "qtserialbus-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtserialbus-opensource-src-5.9.7.tar.xz"; + sha256 = "0n6z56axm0gbrxmnwbz8fv40ar9mw1rlfvmpqvpg5xb9031qil1b"; + name = "qtserialbus-opensource-src-5.9.7.tar.xz"; }; }; qtserialport = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz"; - sha256 = "1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac"; - name = "qtserialport-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtserialport-opensource-src-5.9.7.tar.xz"; + sha256 = "05qy4m1p5j5bh6af7d97iblsmgy9kppm5wif3bl63p6yghn319sh"; + name = "qtserialport-opensource-src-5.9.7.tar.xz"; }; }; qtspeech = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz"; - sha256 = "1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1"; - name = "qtspeech-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtspeech-opensource-src-5.9.7.tar.xz"; + sha256 = "0nnbqnh18vw26vphancs38vjr816xha8m6wl389kjqi01kjrcz70"; + name = "qtspeech-opensource-src-5.9.7.tar.xz"; }; }; qtsvg = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz"; - sha256 = "1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz"; - name = "qtsvg-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtsvg-opensource-src-5.9.7.tar.xz"; + sha256 = "0r2mqy6lb2ypmilf83zyp73v5d9ars314jfm6f0fv5if8yw253v2"; + name = "qtsvg-opensource-src-5.9.7.tar.xz"; }; }; qttools = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz"; - sha256 = "1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24"; - name = "qttools-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qttools-opensource-src-5.9.7.tar.xz"; + sha256 = "18b7jg25434p80yr929nfihk0i124bxpd2dv9mqdcicnv5q0ybnn"; + name = "qttools-opensource-src-5.9.7.tar.xz"; }; }; qttranslations = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz"; - sha256 = "1ncvj1qlcgrm0zqdlq2bkb0hc8dyisz8m7bszxyx4kyxg7n5gb20"; - name = "qttranslations-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qttranslations-opensource-src-5.9.7.tar.xz"; + sha256 = "051a3igp1qnd7d7bg2dvjaqwh6f67fvkn19jdfjzrdis7kcsfvdk"; + name = "qttranslations-opensource-src-5.9.7.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz"; - sha256 = "1zrj4pjy98dskzycjswbkm4m2j6k1j4150h0w7vdrw1681s3ycdr"; - name = "qtvirtualkeyboard-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtvirtualkeyboard-opensource-src-5.9.7.tar.xz"; + sha256 = "1qcj6ncg53rv4pg4ijdq7vbkzgzfr9bn40aif7g4dndykj0zwla7"; + name = "qtvirtualkeyboard-opensource-src-5.9.7.tar.xz"; }; }; qtwayland = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz"; - sha256 = "0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih"; - name = "qtwayland-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwayland-opensource-src-5.9.7.tar.xz"; + sha256 = "0y6ky1ipg42gq390ibgr4nns9i4j648yb7bkmx6b7lhsi7mvnp2n"; + name = "qtwayland-opensource-src-5.9.7.tar.xz"; }; }; qtwebchannel = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz"; - sha256 = "0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3"; - name = "qtwebchannel-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebchannel-opensource-src-5.9.7.tar.xz"; + sha256 = "189qkfxixddfblwkaf46yrqjp91vhmw90gpafjryqfmd2141r8qj"; + name = "qtwebchannel-opensource-src-5.9.7.tar.xz"; }; }; qtwebengine = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz"; - sha256 = "0dqxawc9vfffz6ygdn5mdpl79rrqfx18jy2d1w81q9w7zm113bj5"; - name = "qtwebengine-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebengine-opensource-src-5.9.7.tar.xz"; + sha256 = "0kzpgks5h19rm7gbhr688lr5f5d9ykf062kj91q7wf6fk7qd72v2"; + name = "qtwebengine-opensource-src-5.9.7.tar.xz"; }; }; qtwebkit = { @@ -291,43 +291,43 @@ }; }; qtwebsockets = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz"; - sha256 = "1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf"; - name = "qtwebsockets-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebsockets-opensource-src-5.9.7.tar.xz"; + sha256 = "1qqvd6qf7m2xq71mdaidwabj5c03cbbi1hwc7p95fvbnz9crz79x"; + name = "qtwebsockets-opensource-src-5.9.7.tar.xz"; }; }; qtwebview = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz"; - sha256 = "1i99fy86gydpfsfc4my5d9vxjywfrzbqxk66cb3yf2ac57j66mpf"; - name = "qtwebview-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebview-opensource-src-5.9.7.tar.xz"; + sha256 = "1zwqkmzik4f83hdffmw0hz90mzga34hkyz7d0skfbdp25y278r12"; + name = "qtwebview-opensource-src-5.9.7.tar.xz"; }; }; qtwinextras = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwinextras-opensource-src-5.9.3.tar.xz"; - sha256 = "1lj4qa51ymhpvk0bdp6xf6b3n1k39kihns5lvp6xq1w2mljn6phl"; - name = "qtwinextras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwinextras-opensource-src-5.9.7.tar.xz"; + sha256 = "1a57v7krglfdi4gizm402jn9pg7fqpcma7xk6sm68zg1siv11a6x"; + name = "qtwinextras-opensource-src-5.9.7.tar.xz"; }; }; qtx11extras = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz"; - sha256 = "1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74"; - name = "qtx11extras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtx11extras-opensource-src-5.9.7.tar.xz"; + sha256 = "02jdiw94dasnkszi5w1pysfgz8xrr71pzah37nbnqg0knn4dzich"; + name = "qtx11extras-opensource-src-5.9.7.tar.xz"; }; }; qtxmlpatterns = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz"; - sha256 = "1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g"; - name = "qtxmlpatterns-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtxmlpatterns-opensource-src-5.9.7.tar.xz"; + sha256 = "0j0rxkpyww5cgcjhy0332jsyka1d811wf6zmr16d5fdkbryp7d65"; + name = "qtxmlpatterns-opensource-src-5.9.7.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index a80488bad5e1..ddb828323371 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -12,7 +12,8 @@ , pciutils , systemd , enableProprietaryCodecs ? true -, gn, darwin, openbsm +, gn +, cups, darwin, openbsm, runCommand, xcbuild , ffmpeg ? null , lib, stdenv }: @@ -26,7 +27,7 @@ qtModule { qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ bison coreutils flex git gperf ninja pkgconfig python2 which gn - ]; + ] ++ optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -42,7 +43,7 @@ qtModule { ( cd src/3rdparty/chromium; patchShebangs . ) '' # Patch Chromium build files - + optionalString (builtins.compareVersions qtCompatVersion "5.12" < 0) '' + + optionalString (lib.versionOlder qtCompatVersion "5.12") '' substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/toolchain.gypi \ --replace /bin/echo ${coreutils}/bin/echo @@ -65,33 +66,46 @@ qtModule { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' - + optionalString stdenv.isDarwin '' + + optionalString stdenv.isDarwin ('' # Remove annoying xcode check substituteInPlace mkspecs/features/platform.prf \ - --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false + --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false \ + --replace "/usr/bin/xcodebuild" "xcodebuild" + + substituteInPlace src/3rdparty/chromium/build/mac_toolchain.py \ + --replace "/usr/bin/xcode-select" "xcode-select" + substituteInPlace src/core/config/mac_osx.pri \ --replace /usr ${stdenv.cc} \ --replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false - # FIXME Needed with old Apple SDKs - # Abandon all hope ye who try to make sense of this. + '' + # TODO remove when new Apple SDK is in + + (if lib.versionOlder qtCompatVersion "5.11" then '' substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \ --replace "NSArray<NSString*>*" "NSArray*" substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \ --replace "NSDictionary<VNImageOption, id>*" "NSDictionary*" \ --replace "NSArray<VNRequest*>*" "NSArray*" \ --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption" + '' else '' + substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm \ + --replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*" + substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h \ + --replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*" + '') + + '' cat <<EOF > src/3rdparty/chromium/build/mac/find_sdk.py #!/usr/bin/env python +print("${darwin.apple_sdk.sdk}") print("10.10.0") -print("") EOF cat <<EOF > src/3rdparty/chromium/build/config/mac/sdk_info.py #!/usr/bin/env python -print('xcode_version="9.1"') -print('xcode_version_int=9') +print('xcode_version="0910"') +print('xcode_version_int=910') print('xcode_build="9B55"') print('machine_os_build="17E199"') print('sdk_path=""') @@ -100,12 +114,32 @@ print('sdk_platform_path=""') print('sdk_build="17B41"') EOF + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ + --replace '$sysroot/usr' "${darwin.xnu}" + # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - ''; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; + substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \ + --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' + ''); + + NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.isDarwin [ + "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" + "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10" + + # + # Prevent errors like + # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7: + # error: pointer to non-const type 'id' with no explicit ownership + # id** _kvcPropertyAccessors; + # + # TODO remove when new Apple SDK is in + # + "-fno-objc-arc" + ]; preConfigure = '' export NINJAFLAGS=-j$NIX_BUILD_CORES @@ -160,7 +194,10 @@ EOF # frameworks ApplicationServices + AVFoundation Foundation + ForceFeedback + GameController AppKit ImageCaptureCore CoreBluetooth @@ -173,8 +210,28 @@ EOF libunwind ]); + buildInputs = optionals stdenv.isDarwin (with darwin; [ + cups + + # For sandbox.h include + (runCommand "MacOS_SDK_sandbox.h" {} '' + install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h + '') + + # For: + # _NSDefaultRunLoopMode + # _OBJC_CLASS_$_NSDate + # _OBJC_CLASS_$_NSDictionary + # _OBJC_CLASS_$_NSRunLoop + # _OBJC_CLASS_$_NSURL + darwin.cf-private + ]); + + __impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib"; + dontUseNinjaBuild = true; dontUseNinjaInstall = true; + dontUseXcbuild = true; postInstall = lib.optionalString stdenv.isLinux '' cat > $out/libexec/qt.conf <<EOF diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 2b3c88d58860..2e5371e285bc 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -20,13 +20,7 @@ stdenv.mkDerivation rec { patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ]; - cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ] - ++ stdenv.lib.optional stdenv.isDarwin [ - # correctly detect the compiler - # for details see cmake --help-policy CMP0025 - "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" - ] - ; + cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 2a0125de01f1..286c5c868dff 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/alanxz/rabbitmq-c; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 61c52de80b70..d7967d409792 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/edenhill/librdkafka; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ boothead wkennington ]; + maintainers = with maintainers; [ boothead ]; }; } diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index fff1d6498361..e221c82edeca 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 786fce0fb638..4e51051dfe0a 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; platforms = platforms.x86_64; - maintainers = with maintainers; [ adev wkennington ]; + maintainers = with maintainers; [ adev ]; }; } diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index b9830b65ffb7..ce8db3ee9ea9 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { homepage = http://www.bluez.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 3d516fb5d9dd..55fc3f750df3 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -4,6 +4,9 @@ # (for compatibility with reference BLAS). , blas64 ? null , buildPackages +# Select a specific optimization target (other than the default) +# See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt +, target ? null }: with stdenv.lib; @@ -11,39 +14,41 @@ with stdenv.lib; let blas64_ = blas64; in let + setTarget = x: if target == null then x else target; + # To add support for a new platform, add an element to this set. configs = { armv6l-linux = { BINARY = 32; - TARGET = "ARMV6"; + TARGET = setTarget "ARMV6"; DYNAMIC_ARCH = false; USE_OPENMP = true; }; armv7l-linux = { BINARY = 32; - TARGET = "ARMV7"; + TARGET = setTarget "ARMV7"; DYNAMIC_ARCH = false; USE_OPENMP = true; }; aarch64-linux = { BINARY = 64; - TARGET = "ARMV8"; + TARGET = setTarget "ARMV8"; DYNAMIC_ARCH = true; USE_OPENMP = true; }; i686-linux = { BINARY = 32; - TARGET = "P2"; + TARGET = setTarget "P2"; DYNAMIC_ARCH = true; USE_OPENMP = true; }; x86_64-darwin = { BINARY = 64; - TARGET = "ATHLON"; + TARGET = setTarget "ATHLON"; DYNAMIC_ARCH = true; USE_OPENMP = false; MACOSX_DEPLOYMENT_TARGET = "10.7"; @@ -51,7 +56,7 @@ let x86_64-linux = { BINARY = 64; - TARGET = "ATHLON"; + TARGET = setTarget "ATHLON"; DYNAMIC_ARCH = true; USE_OPENMP = true; }; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 7119f76c55fd..35d5075a949a 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; + NIX_LDFLAGS = [ "-lX11" ]; + meta = { homepage = http://icculus.org/smpeg/; description = "MPEG decoding library"; diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 8f37302cec50..32c93b192ef0 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "Compression/decompression library for very high speeds"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 6cb420d9a0bb..4dd09776f343 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { description = "A library passing all socket communications through unix sockets"; homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 1321a558d5ed..7bf3a5faa7d1 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index c7f8787c1fda..16be9fa1e3b1 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index f1ae1ea5db0e..2e6e2d3fbbfd 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "Secure PIN handling using NSS crypto"; license = licenses.mpl11; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 745587609352..1fbbecf71a6b 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { description = "Hierarchical pool based memory allocator with destructors"; homepage = https://tdb.samba.org/; license = licenses.gpl3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index d2ff7c5efd34..21f062998b40 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { ''; homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index e43c62684240..9f94f4f7217d 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { description = "An event system based on the talloc memory management library"; homepage = https://tevent.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 34024b23e270..b3cc2b7506b1 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { homepage = http://www.tcl.tk/; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ lovek323 vrthra wkennington ]; + maintainers = with maintainers; [ lovek323 vrthra ]; }; } diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index 4c052a5c02f6..fe84217d9432 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "totem-pl-parser"; - version = "3.26.1"; + version = "3.26.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka"; + sha256 = "0fhwhrq5p0a8arh3lzk5bfjlkip3rlna9r6ybpi9fid4cpwsr1nk"; }; passthru = { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ]; - buildInputs = [ gmime libxml2 ]; + buildInputs = [ libxml2 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index ccd876dfefbd..bd9fb796247d 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index 750a786c3fca..3fda417d8e1f 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ codyopel wkennington ]; + maintainers = with lib.maintainers; [ codyopel ]; }; passthru.version = version; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index c694cc7b4452..25cbde63129b 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ codyopel wkennington ]; + maintainers = with lib.maintainers; [ codyopel ]; }; passthru.version = version; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 96e7b4c4a20d..b22d339617c2 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 56068c435d80..c45f521dcbb0 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { description = ""; license = licenses.gpl2; platforms = intersectLists platforms.unix platforms.x86_64; - maintainers = with maintainers; [ wkennington ]; broken = true; # Broken by f689a6d1c6796c4a4f116ffec6c4624379e04bc9. }; } diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 009826eef476..2fcf8bd91791 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index ab0482559a43..bc130af4c6ae 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 5769ee94a1be..b0e97038b7b2 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "http://beta.quicklisp.org/dist/quicklisp/2018-08-31/distinfo.txt"; - sha256 = "1im4p6vcxkp5hrim28cdf5isyw8a1v9aqsz2xfsfp3z3qd49dixd"; + url = "https://beta.quicklisp.org/dist/quicklisp/2019-01-07/distinfo.txt"; + sha256 = "1f0giy182p6qlmmqljir92566c8l1g2sv41cbzv86s3kv0j640fd"; }; buildPhase = '' true; ''; postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 9b9486e9758c..48dd57aac54b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''alexandria''; - version = ''20170830-git''; + version = ''20181210-git''; description = ''Alexandria is a collection of portable public domain utilities.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz''; - sha256 = ''0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9''; + url = ''http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz''; + sha256 = ''0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588''; }; packageName = "alexandria"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 - 0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9 URL - http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz - MD5 13ea5af7055094a87dec1e45090f894a NAME alexandria FILENAME alexandria - DEPS NIL DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (alexandria-tests) + 0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588 URL + http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz + MD5 2a7530a412cd94a56b6d4e5864fb8819 NAME alexandria FILENAME alexandria + DEPS NIL DEPENDENCIES NIL VERSION 20181210-git SIBLINGS (alexandria-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index 9daab46784d3..40d5aed49917 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''array-utils''; - version = ''20180831-git''; + version = ''20181018-git''; description = ''A few utilities for working with arrays.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz''; - sha256 = ''1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7''; + url = ''http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz''; + sha256 = ''1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn''; }; packageName = "array-utils"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. - SHA256 1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7 URL - http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz - MD5 fa07e8fac5263d4fed7acb3d53e5855a NAME array-utils FILENAME array-utils - DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS (array-utils-test) + SHA256 1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn URL + http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz + MD5 e32cc0474cf299ad1f5666e2864aa3d8 NAME array-utils FILENAME array-utils + DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS (array-utils-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix index ec4e31013f92..5d7f3f2dd10b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -5,7 +5,7 @@ rec { description = ''Tool for building up an xml dom of an excel spreadsheet nicely.''; - deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; @@ -31,8 +31,6 @@ rec { (NAME closure-common FILENAME closure-common) (NAME closure-html FILENAME closure-html) (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) - (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) - (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate) (NAME named-readtables FILENAME named-readtables) @@ -42,9 +40,9 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop - closure-common closure-html collectors cxml cxml-dom cxml-klacks cxml-test - cxml-xml flexi-streams iterate named-readtables puri split-sequence swank - symbol-munger trivial-features trivial-gray-streams) + closure-common closure-html collectors cxml flexi-streams iterate + named-readtables puri split-sequence swank symbol-munger trivial-features + trivial-gray-streams) VERSION buildnode-20170403-git SIBLINGS (buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix index 86bdb36c8d23..0a2e56a9c9b8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -7,7 +7,7 @@ rec { description = ''Tool for building up an xml dom nicely.''; - deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; @@ -31,8 +31,6 @@ rec { (NAME closure-common FILENAME closure-common) (NAME closure-html FILENAME closure-html) (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) - (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) - (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) (NAME named-readtables FILENAME named-readtables) @@ -42,10 +40,9 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode - closer-mop closure-common closure-html collectors cxml cxml-dom - cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 - named-readtables puri split-sequence swank symbol-munger trivial-features - trivial-gray-streams) + closer-mop closure-common closure-html collectors cxml flexi-streams + iterate lisp-unit2 named-readtables puri split-sequence swank + symbol-munger trivial-features trivial-gray-streams) VERSION 20170403-git SIBLINGS (buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml buildnode-xul) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index f3e64cb965e4..6cf810707343 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''caveman''; - version = ''20180831-git''; + version = ''20181210-git''; description = ''Web Application Framework for Common Lisp''; - deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz''; - sha256 = ''0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s''; + url = ''http://beta.quicklisp.org/archive/caveman/2018-12-10/caveman-20181210-git.tgz''; + sha256 = ''04b5dhmdwcwpdcjk4bk25fmqx786k7g3iqsk1xc35kvsxi9ykldf''; }; packageName = "caveman"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 - 0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s URL - http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz - MD5 b417563f04b2619172127a6abeed786a NAME caveman FILENAME caveman DEPS + 04b5dhmdwcwpdcjk4bk25fmqx786k7g3iqsk1xc35kvsxi9ykldf URL + http://beta.quicklisp.org/archive/caveman/2018-12-10/caveman-20181210-git.tgz + MD5 d3192b79636901bb0676681fc5d05748 NAME caveman FILENAME caveman DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) + (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz) @@ -68,18 +68,18 @@ rec { (NAME trivial-types FILENAME trivial-types) (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria anaphora babel babel-streams bordeaux-threads cffi cffi-grovel - cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text - cl-base64 cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project - cl-reexport cl-syntax cl-syntax-annot cl-utilities clack - clack-handler-hunchentoot clack-socket clack-test clack-v1-compat dexador - do-urlencode fast-http fast-io flexi-streams http-body hunchentoot - ironclad jonathan lack lack-component lack-middleware-backtrace lack-util - let-plus local-time map-set marshal md5 myway named-readtables nibbles - proc-parse prove quri rfc2388 smart-buffer split-sequence static-vectors - trivial-backtrace trivial-features trivial-garbage trivial-gray-streams - trivial-mimes trivial-types usocket xsubseq) - VERSION 20180831-git SIBLINGS + (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain + chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64 + cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project cl-reexport + cl-syntax cl-syntax-annot cl-utilities clack clack-handler-hunchentoot + clack-socket clack-test clack-v1-compat dexador do-urlencode fast-http + fast-io flexi-streams http-body hunchentoot ironclad jonathan lack + lack-component lack-middleware-backtrace lack-util let-plus local-time + map-set marshal md5 myway named-readtables nibbles proc-parse prove quri + rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace + trivial-features trivial-garbage trivial-gray-streams trivial-mimes + trivial-types usocket xsubseq) + VERSION 20181210-git SIBLINGS (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index 07b062b51978..1af0947627f5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-grovel''; - version = ''cffi_0.19.0''; + version = ''cffi_0.20.0''; description = ''The CFFI Groveller''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz''; - sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; + url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; + sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; }; packageName = "cffi-grovel"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 - 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL - http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5 - 7589b6437fec19fdabc65892536c3dc3 NAME cffi-grovel FILENAME cffi-grovel DEPS + 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL + http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 + 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-grovel FILENAME cffi-grovel DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features) - VERSION cffi_0.19.0 SIBLINGS + VERSION cffi_0.20.0 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index f1d7e117655b..c440c72788fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-toolchain''; - version = ''cffi_0.19.0''; + version = ''cffi_0.20.0''; description = ''The CFFI toolchain''; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz''; - sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; + url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; + sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; }; packageName = "cffi-toolchain"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 - 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL - http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5 - 7589b6437fec19fdabc65892536c3dc3 NAME cffi-toolchain FILENAME + 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL + http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 + 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-toolchain FILENAME cffi-toolchain DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.19.0 + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index 8568d9a3dfab..001c7d9a5450 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi''; - version = ''cffi_0.19.0''; + version = ''cffi_0.20.0''; parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz''; - sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; + url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; + sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; }; packageName = "cffi"; @@ -20,15 +20,15 @@ rec { overrides = x: x; } /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 - 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL - http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5 - 7589b6437fec19fdabc65892536c3dc3 NAME cffi FILENAME cffi DEPS + 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL + http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 + 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi FILENAME cffi DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre) (NAME trivial-features FILENAME trivial-features) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop) - VERSION cffi_0.19.0 SIBLINGS + VERSION cffi_0.20.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat) PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index 377c8c2209bc..d678fd8e9424 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-repl''; - version = ''cl-async-20180711-git''; + version = ''cl-async-20190107-git''; description = ''REPL integration for CL-ASYNC.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz''; - sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; + sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; }; packageName = "cl-async-repl"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 - 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL - http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz - MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-repl FILENAME + 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL + http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz + MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-repl FILENAME cl-async-repl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -39,5 +39,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20180711-git SIBLINGS + VERSION cl-async-20190107-git SIBLINGS (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 2129c7f83f7a..722e05ed09c2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-ssl''; - version = ''cl-async-20180711-git''; + version = ''cl-async-20190107-git''; description = ''SSL Wrapper around cl-async socket implementation.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz''; - sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; + sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; }; packageName = "cl-async-ssl"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 - 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL - http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz - MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-ssl FILENAME + 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL + http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz + MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-ssl FILENAME cl-async-ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -40,5 +40,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20180711-git SIBLINGS + VERSION cl-async-20190107-git SIBLINGS (cl-async-repl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index e5a2a0bc7fd3..edb4b01b0d1d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async''; - version = ''20180711-git''; + version = ''20190107-git''; parasites = [ "cl-async-base" "cl-async-util" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz''; - sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; + sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; }; packageName = "cl-async"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 - 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL - http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz - MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async FILENAME cl-async DEPS + 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL + http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz + MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async FILENAME cl-async DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -37,5 +37,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop vom) - VERSION 20180711-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) + VERSION 20190107-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) PARASITES (cl-async-base cl-async-util)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index 40c1ac7d6a9a..a1da44a6b896 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-dbi''; - version = ''20180831-git''; + version = ''20190107-git''; description = ''''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz''; - sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; + sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; }; packageName = "cl-dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 - 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL - http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz - MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME cl-dbi FILENAME cl-dbi DEPS + 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL + http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz + MD5 349829f5d0bf363b828827ad6728c54e NAME cl-dbi FILENAME cl-dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-types) - VERSION 20180831-git SIBLINGS + VERSION 20190107-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix index b5ede76f8178..f37e653bc564 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -7,7 +7,7 @@ rec { description = ''Portable CL Locale Support''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz''; @@ -28,8 +28,6 @@ rec { (NAME cl-fad FILENAME cl-fad) (NAME cl-l10n-cldr FILENAME cl-l10n-cldr) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) - (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) (NAME flexi-streams FILENAME flexi-streams) (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil) (NAME iterate FILENAME iterate) (NAME local-time FILENAME local-time) @@ -39,7 +37,6 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel bordeaux-threads cl-fad cl-l10n-cldr cl-ppcre closer-mop - closure-common cxml cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams - hu.dwim.stefil iterate local-time metabang-bind parse-number puri - trivial-features trivial-gray-streams) + closure-common cxml flexi-streams hu.dwim.stefil iterate local-time + metabang-bind parse-number puri trivial-features trivial-gray-streams) VERSION 20161204-darcs SIBLINGS NIL PARASITES (cl-l10n/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index c950fa292a8b..36d15673427c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-libuv''; - version = ''20180831-git''; + version = ''20190107-git''; description = ''Low-level libuv bindings for Common Lisp.''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz''; - sha256 = ''1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f''; + url = ''http://beta.quicklisp.org/archive/cl-libuv/2019-01-07/cl-libuv-20190107-git.tgz''; + sha256 = ''1cfr29i5j78qy7ax2fs1z4nqyz3kx9121rlpdika12n1zvnhrcm8''; }; packageName = "cl-libuv"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. - SHA256 1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f URL - http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz - MD5 d755a060faac0d50a4500ae1628401ce NAME cl-libuv FILENAME cl-libuv DEPS + SHA256 1cfr29i5j78qy7ax2fs1z4nqyz3kx9121rlpdika12n1zvnhrcm8 URL + http://beta.quicklisp.org/archive/cl-libuv/2019-01-07/cl-libuv-20190107-git.tgz + MD5 c09c505dc45812cc773454ffc6fdbd38 NAME cl-libuv FILENAME cl-libuv DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-grovel cffi-toolchain trivial-features) VERSION - 20180831-git SIBLINGS NIL PARASITES NIL) */ + 20190107-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index a0443cb5af08..08b6a492e766 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-postgres''; - version = ''postmodern-20180831-git''; + version = ''postmodern-20190107-git''; - parasites = [ "cl-postgres/tests" ]; + parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; description = ''Low-level client library for PostgreSQL''; - deps = [ args."fiveam" args."md5" args."split-sequence" args."usocket" ]; + deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz''; - sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx''; + url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz''; + sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5''; }; packageName = "cl-postgres"; @@ -20,13 +20,14 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL - http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz - MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME cl-postgres FILENAME cl-postgres + SHA256 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL + http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz + MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME cl-postgres FILENAME cl-postgres DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) + (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) (NAME split-sequence FILENAME split-sequence) (NAME usocket FILENAME usocket)) - DEPENDENCIES (fiveam md5 split-sequence usocket) VERSION - postmodern-20180831-git SIBLINGS (postmodern s-sql simple-date) PARASITES - (cl-postgres/tests)) */ + DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket) + VERSION postmodern-20190107-git SIBLINGS (postmodern s-sql simple-date) + PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index d2b3de9cae18..4c97f03870fa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-template''; - version = ''cl-unification-20171227-git''; + version = ''cl-unification-20190107-git''; description = ''A system used to conditionally load the CL-PPCRE Template. @@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.''; deps = [ args."cl-ppcre" args."cl-unification" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz''; - sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz''; + sha256 = ''0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv''; }; packageName = "cl-ppcre-template"; @@ -27,12 +27,12 @@ REGULAR-EXPRESSION-TEMPLATE.''; This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the REGULAR-EXPRESSION-TEMPLATE. - SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL - http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz - MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-ppcre-template FILENAME + SHA256 0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv URL + http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz + MD5 a7a12789cc48e571b0871d55cef11b7f NAME cl-ppcre-template FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unification FILENAME cl-unification)) - DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20171227-git + DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20190107-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 6d284b7b0120..dbdd53a93469 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unification''; - version = ''20171227-git''; + version = ''20190107-git''; description = ''The CL-UNIFICATION system. @@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz''; - sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz''; + sha256 = ''0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv''; }; packageName = "cl-unification"; @@ -22,8 +22,8 @@ The system contains the definitions for the 'unification' machinery.''; /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system. The system contains the definitions for the 'unification' machinery. - SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL - http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz - MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-unification FILENAME - cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20171227-git SIBLINGS + SHA256 0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv URL + http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz + MD5 a7a12789cc48e571b0871d55cef11b7f NAME cl-unification FILENAME + cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS (cl-unification-lib cl-unification-test cl-ppcre-template) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index af0e917425a1..f329437a75af 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl_plus_ssl''; - version = ''cl+ssl-20180831-git''; + version = ''cl+ssl-20181018-git''; parasites = [ "openssl-1.1.0" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz''; - sha256 = ''1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r''; + url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz''; + sha256 = ''1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm''; }; packageName = "cl+ssl"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r URL - http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz - MD5 56cd0b42cd9f7b8645db330ebc98600c NAME cl+ssl FILENAME cl_plus_ssl DEPS + 1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm URL + http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz + MD5 45d92813cc134bf04725ee6a1f0c24a7 NAME cl+ssl FILENAME cl_plus_ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) @@ -33,5 +33,5 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi flexi-streams trivial-features trivial-garbage trivial-gray-streams uiop) - VERSION cl+ssl-20180831-git SIBLINGS (cl+ssl.test) PARASITES + VERSION cl+ssl-20181018-git SIBLINGS (cl+ssl.test) PARASITES (openssl-1.1.0)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index 252f9794e769..6de9d3f8fc9e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-handler-hunchentoot''; - version = ''clack-20180831-git''; + version = ''clack-20181018-git''; description = ''Clack handler for Hunchentoot.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; - sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; + url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; + sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; }; packageName = "clack-handler-hunchentoot"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot. - SHA256 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL - http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz - MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-handler-hunchentoot + SHA256 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL + http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz + MD5 16121d921667ee8d0d70324da7281849 NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -42,7 +42,7 @@ rec { cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence trivial-backtrace trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION clack-20180831-git SIBLINGS + VERSION clack-20181018-git SIBLINGS (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index d5163cabe045..745b87a65764 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-socket''; - version = ''clack-20180831-git''; + version = ''clack-20181018-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; - sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; + url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; + sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; }; packageName = "clack-socket"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM clack-socket DESCRIPTION NIL SHA256 - 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL - http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz - MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-socket FILENAME - clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180831-git SIBLINGS + 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL + http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz + MD5 16121d921667ee8d0d70324da7281849 NAME clack-socket FILENAME + clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20181018-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index 1d081fbef581..c1c80e48cbdb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-test''; - version = ''clack-20180831-git''; + version = ''clack-20181018-git''; description = ''Testing Clack Applications.''; deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; - sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; + url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; + sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; }; packageName = "clack-test"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256 - 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL - http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz - MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-test FILENAME clack-test + 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL + http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz + MD5 16121d921667ee8d0d70324da7281849 NAME clack-test FILENAME clack-test DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) @@ -71,7 +71,7 @@ rec { split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket xsubseq) - VERSION clack-20180831-git SIBLINGS + VERSION clack-20181018-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index 8b2e2c70453a..5477fc5cd027 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-v1-compat''; - version = ''clack-20180831-git''; + version = ''clack-20181018-git''; description = ''''; deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; - sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; + url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; + sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; }; packageName = "clack-v1-compat"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 - 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL - http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz - MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-v1-compat FILENAME + 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL + http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz + MD5 16121d921667ee8d0d70324da7281849 NAME clack-v1-compat FILENAME clack-v1-compat DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) @@ -73,7 +73,7 @@ rec { rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types uiop usocket xsubseq) - VERSION clack-20180831-git SIBLINGS + VERSION clack-20181018-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 0b2828d06dfc..612e6b5c066e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack''; - version = ''20180831-git''; + version = ''20181018-git''; description = ''Web application environment for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; - sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; + url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; + sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; }; packageName = "clack"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 - 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL - http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz - MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack FILENAME clack DEPS + 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL + http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz + MD5 16121d921667ee8d0d70324da7281849 NAME clack FILENAME clack DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack) @@ -31,7 +31,7 @@ rec { DEPENDENCIES (alexandria bordeaux-threads ironclad lack lack-component lack-middleware-backtrace lack-util nibbles uiop) - VERSION 20180831-git SIBLINGS + VERSION 20181018-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index a13537d7e90f..ce078c3196af 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20180831-git''; + version = ''20190107-git''; description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz''; - sha256 = ''01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz''; + sha256 = ''0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw''; }; packageName = "closer-mop"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg URL - http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz - MD5 968426b07f9792f95fe3c9b83d68d756 NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */ + SHA256 0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw URL + http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz + MD5 6aa5a1e9901b579eb50e2fb46035bc50 NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index fb808164aa29..3866dd6f4594 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closure-common''; - version = ''20101107-git''; + version = ''20181018-git''; description = ''''; deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz''; - sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4''; + url = ''http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz''; + sha256 = ''18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn''; }; packageName = "closure-common"; @@ -18,12 +18,12 @@ rec { overrides = x: x; } /* (SYSTEM closure-common DESCRIPTION NIL SHA256 - 1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL - http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz - MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common FILENAME + 18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn URL + http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz + MD5 b09ee60c258a29f0c107960ec4c04ada NAME closure-common FILENAME closure-common DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams) - VERSION 20101107-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20181018-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 685e81283688..6f570ce5c8f0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20180711-git''; + version = ''20181210-git''; parasites = [ "clx/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz''; - sha256 = ''0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h''; + url = ''http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz''; + sha256 = ''1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6''; }; packageName = "clx"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 - 0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h URL - http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz MD5 - 27d5e904d2b7e4cdf4e8492839d15bad NAME clx FILENAME clx DEPS - ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180711-git + 1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6 URL + http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz MD5 + d6d0edd1594e6bc420b1e2ba0c453636 NAME clx FILENAME clx DEPS + ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20181210-git SIBLINGS NIL PARASITES (clx/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix index c83b29939687..98c565648dcb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix @@ -5,7 +5,7 @@ rec { description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree''; - deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; + deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; @@ -33,8 +33,6 @@ rec { (NAME closure-html FILENAME closure-html) (NAME collectors FILENAME collectors) (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml) - (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) - (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate) (NAME named-readtables FILENAME named-readtables) @@ -47,8 +45,7 @@ rec { DEPENDENCIES (alexandria babel buildnode cl-html5-parser cl-interpol cl-ppcre cl-unicode closer-mop closure-common closure-html collectors css-selectors cxml - cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate - named-readtables puri split-sequence string-case swank symbol-munger - trivial-features trivial-gray-streams yacc) + flexi-streams iterate named-readtables puri split-sequence string-case + swank symbol-munger trivial-features trivial-gray-streams yacc) VERSION css-selectors-20160628-git SIBLINGS (css-selectors-stp css-selectors) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix index 69ada2ce80a3..fcdb69f3c351 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix @@ -5,7 +5,7 @@ rec { description = ''An implementation of css selectors that interacts with cxml-stp''; - deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; + deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-stp" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; @@ -32,9 +32,7 @@ rec { (NAME closure-html FILENAME closure-html) (NAME collectors FILENAME collectors) (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml) - (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) - (NAME cxml-stp FILENAME cxml-stp) (NAME cxml-test FILENAME cxml-test) - (NAME cxml-xml FILENAME cxml-xml) + (NAME cxml-stp FILENAME cxml-stp) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate) (NAME named-readtables FILENAME named-readtables) @@ -46,9 +44,8 @@ rec { (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc)) DEPENDENCIES (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop - closure-common closure-html collectors css-selectors cxml cxml-dom - cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate - named-readtables parse-number puri split-sequence swank symbol-munger - trivial-features trivial-gray-streams xpath yacc) + closure-common closure-html collectors css-selectors cxml cxml-stp + flexi-streams iterate named-readtables parse-number puri split-sequence + swank symbol-munger trivial-features trivial-gray-streams xpath yacc) VERSION css-selectors-20160628-git SIBLINGS (css-selectors-simple-tree css-selectors) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix index 3316f59447d7..aa523d6f838b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -7,7 +7,7 @@ rec { description = ''An implementation of css selectors''; - deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; + deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; @@ -33,8 +33,6 @@ rec { (NAME closure-common FILENAME closure-common) (NAME closure-html FILENAME closure-html) (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) - (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) - (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) (NAME named-readtables FILENAME named-readtables) @@ -45,9 +43,8 @@ rec { (NAME yacc FILENAME yacc)) DEPENDENCIES (alexandria babel buildnode buildnode-xhtml cl-interpol cl-ppcre cl-unicode - closer-mop closure-common closure-html collectors cxml cxml-dom - cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 - named-readtables puri split-sequence swank symbol-munger trivial-features - trivial-gray-streams yacc) + closer-mop closure-common closure-html collectors cxml flexi-streams + iterate lisp-unit2 named-readtables puri split-sequence swank + symbol-munger trivial-features trivial-gray-streams yacc) VERSION 20160628-git SIBLINGS (css-selectors-simple-tree css-selectors-stp) PARASITES (css-selectors-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index 8fe30fa73a5e..74648ba66a8c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cxml-stp''; - version = ''20120520-git''; + version = ''20181018-git''; parasites = [ "cxml-stp-test" ]; description = ''''; - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; + deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml-stp/2012-05-20/cxml-stp-20120520-git.tgz''; - sha256 = ''1pmh7wvkncbwwp30d445mhj21j210swq03f6hm44x1231s8r8azv''; + url = ''http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz''; + sha256 = ''0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77''; }; packageName = "cxml-stp"; @@ -20,20 +20,18 @@ rec { overrides = x: x; } /* (SYSTEM cxml-stp DESCRIPTION NIL SHA256 - 1pmh7wvkncbwwp30d445mhj21j210swq03f6hm44x1231s8r8azv URL - http://beta.quicklisp.org/archive/cxml-stp/2012-05-20/cxml-stp-20120520-git.tgz - MD5 7bc57586a91cd4d4864b8cbad3689d85 NAME cxml-stp FILENAME cxml-stp DEPS + 0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77 URL + http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz + MD5 38d39fce85b270145d5a5bd4668d953f NAME cxml-stp FILENAME cxml-stp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) - (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri) (NAME rt FILENAME rt) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc)) + (NAME xpath FILENAME xpath) (NAME xpath/test FILENAME xpath_slash_test) + (NAME yacc FILENAME yacc)) DEPENDENCIES - (alexandria babel cl-ppcre closure-common cxml cxml-dom cxml-klacks - cxml-test cxml-xml parse-number puri rt trivial-features - trivial-gray-streams xpath yacc) - VERSION 20120520-git SIBLINGS NIL PARASITES (cxml-stp-test)) */ + (alexandria babel cl-ppcre closure-common cxml parse-number puri rt + trivial-features trivial-gray-streams xpath xpath/test yacc) + VERSION 20181018-git SIBLINGS NIL PARASITES (cxml-stp-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 56b2645c7ee2..68a019fa027d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cxml''; - version = ''20110619-git''; + version = ''20181018-git''; - parasites = [ "cxml-dom" "cxml-klacks" "cxml-test" "cxml-xml" ]; + parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ]; - description = ''''; + description = ''Closure XML - a Common Lisp XML parser''; deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; - sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + url = ''http://beta.quicklisp.org/archive/cxml/2018-10-18/cxml-20181018-git.tgz''; + sha256 = ''1s7nfq5zfpxsrayhn0gg3x8fj47mld00qm3cpv5whdqj3wd3krmn''; }; packageName = "cxml"; @@ -19,10 +19,10 @@ rec { asdFilesToKeep = ["cxml.asd"]; overrides = x: x; } -/* (SYSTEM cxml DESCRIPTION NIL SHA256 - 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL - http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 - 587755dff60416d4f716f4e785cf747e NAME cxml FILENAME cxml DEPS +/* (SYSTEM cxml DESCRIPTION Closure XML - a Common Lisp XML parser SHA256 + 1s7nfq5zfpxsrayhn0gg3x8fj47mld00qm3cpv5whdqj3wd3krmn URL + http://beta.quicklisp.org/archive/cxml/2018-10-18/cxml-20181018-git.tgz MD5 + 33c5546de7099d65fdb2fbb716fd3de8 NAME cxml FILENAME cxml DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME closure-common FILENAME closure-common) (NAME puri FILENAME puri) (NAME trivial-features FILENAME trivial-features) @@ -30,5 +30,5 @@ rec { DEPENDENCIES (alexandria babel closure-common puri trivial-features trivial-gray-streams) - VERSION 20110619-git SIBLINGS NIL PARASITES - (cxml-dom cxml-klacks cxml-test cxml-xml)) */ + VERSION 20181018-git SIBLINGS (cxml-dom cxml-klacks cxml-test) PARASITES + (cxml/dom cxml/klacks cxml/test cxml/xml)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 218107e95d6a..2f863a627bbc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-mysql''; - version = ''cl-dbi-20180831-git''; + version = ''cl-dbi-20190107-git''; description = ''Database driver for MySQL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz''; - sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; + sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; }; packageName = "dbd-mysql"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL - http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz - MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-mysql FILENAME dbd-mysql DEPS + 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL + http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz + MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-mysql FILENAME dbd-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot) @@ -35,5 +35,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-features trivial-types) - VERSION cl-dbi-20180831-git SIBLINGS + VERSION cl-dbi-20190107-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 9387806255ac..f76f5e7e561d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-postgres''; - version = ''cl-dbi-20180831-git''; + version = ''cl-dbi-20190107-git''; description = ''Database driver for PostgreSQL.''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz''; - sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; + sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; }; packageName = "dbd-postgres"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL - http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz - MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-postgres FILENAME + 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL + http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz + MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-postgres FILENAME dbd-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -37,5 +37,5 @@ rec { (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot closer-mop dbi md5 named-readtables split-sequence trivial-garbage trivial-types usocket) - VERSION cl-dbi-20180831-git SIBLINGS + VERSION cl-dbi-20190107-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 808914068a35..01acb76767ea 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20180831-git''; + version = ''cl-dbi-20190107-git''; description = ''Database driver for SQLite3.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz''; - sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; + sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; }; packageName = "dbd-sqlite3"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL - http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz - MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-sqlite3 FILENAME dbd-sqlite3 + 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL + http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz + MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-sqlite3 FILENAME dbd-sqlite3 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -38,5 +38,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot closer-mop dbi iterate named-readtables split-sequence sqlite trivial-features trivial-types uiop) - VERSION cl-dbi-20180831-git SIBLINGS + VERSION cl-dbi-20190107-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 2de381f44b8e..382143eb8fb3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbi''; - version = ''cl-20180831-git''; + version = ''cl-20190107-git''; description = ''Database independent interface for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz''; - sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; + sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; }; packageName = "dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - SHA256 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL - http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz - MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbi FILENAME dbi DEPS + SHA256 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL + http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz + MD5 349829f5d0bf363b828827ad6728c54e NAME dbi FILENAME dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop named-readtables split-sequence trivial-types) - VERSION cl-20180831-git SIBLINGS + VERSION cl-20190107-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 2e392928f495..c47d9f1a1aad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20180831-git''; + version = ''20181018-git''; description = ''Yet another HTTP client for Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz''; - sha256 = ''1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs''; + url = ''http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz''; + sha256 = ''1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc''; }; packageName = "dexador"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs URL - http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz - MD5 f2859026d90e63e79e8e4728168fab13 NAME dexador FILENAME dexador DEPS + 1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc URL + http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz + MD5 268ea459fac563834490247de52a6ce1 NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -48,4 +48,4 @@ rec { fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-garbage trivial-gray-streams trivial-mimes usocket xsubseq) - VERSION 20180831-git SIBLINGS (dexador-test) PARASITES NIL) */ + VERSION 20181018-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 95d335493b7d..3dbacdf0f81a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''do-urlencode''; - version = ''20170830-git''; + version = ''20181018-git''; description = ''Percent Encoding (aka URL Encoding) library''; - deps = [ args."alexandria" args."babel" args."babel-streams" args."trivial-features" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz''; - sha256 = ''1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n''; + url = ''http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz''; + sha256 = ''1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2''; }; packageName = "do-urlencode"; @@ -18,14 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library - SHA256 1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n URL - http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz - MD5 071a18bb58ed5c7d5184b34e672b5d91 NAME do-urlencode FILENAME + SHA256 1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2 URL + http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz + MD5 cb6ab78689fe52680ee1b94cd7738b94 NAME do-urlencode FILENAME do-urlencode DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME babel-streams FILENAME babel-streams) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel babel-streams trivial-features trivial-gray-streams) - VERSION 20170830-git SIBLINGS NIL PARASITES NIL) */ + (NAME trivial-features FILENAME trivial-features)) + DEPENDENCIES (alexandria babel trivial-features) VERSION 20181018-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 36411ca05753..3b2d0225ff92 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20180430-git''; + version = ''20190107-git''; parasites = [ "esrap/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2018-04-30/esrap-20180430-git.tgz''; - sha256 = ''1wv33nzsm6hinr4blfih9napd0gqx8jf8dnnp224h95lhn9fxaav''; + url = ''http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz''; + sha256 = ''0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs''; }; packageName = "esrap"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 - 1wv33nzsm6hinr4blfih9napd0gqx8jf8dnnp224h95lhn9fxaav URL - http://beta.quicklisp.org/archive/esrap/2018-04-30/esrap-20180430-git.tgz - MD5 51efcf9b228ebfe63831db8ba797b0e8 NAME esrap FILENAME esrap DEPS + 0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs URL + http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz + MD5 b8c98e84e3c63e4e3ce2f6c8b4d4bab7 NAME esrap FILENAME esrap DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20180430-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20190107-git SIBLINGS NIL PARASITES (esrap/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 29fd1efe2f5e..87d9fe983ec3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''fiasco''; - version = ''20180228-git''; + version = ''20181210-git''; parasites = [ "fiasco-self-tests" ]; description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.''; - deps = [ args."alexandria" ]; + deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiasco/2018-02-28/fiasco-20180228-git.tgz''; - sha256 = ''0a67wvi5whmlw7kiv3b3rzy9kxn9m3135j9cnn92vads66adpxpy''; + url = ''http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz''; + sha256 = ''0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y''; }; packageName = "fiasco"; @@ -21,8 +21,10 @@ rec { } /* (SYSTEM fiasco DESCRIPTION A Common Lisp test framework that treasures your failures, logical continuation of Stefil. - SHA256 0a67wvi5whmlw7kiv3b3rzy9kxn9m3135j9cnn92vads66adpxpy URL - http://beta.quicklisp.org/archive/fiasco/2018-02-28/fiasco-20180228-git.tgz - MD5 a924e43c335836d2e44731dee6a1b8e6 NAME fiasco FILENAME fiasco DEPS - ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION - 20180228-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */ + SHA256 0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y URL + http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz + MD5 9d3c0ec30c7f73490188f27eaec00fd8 NAME fiasco FILENAME fiasco DEPS + ((NAME alexandria FILENAME alexandria) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20181210-git + SIBLINGS NIL PARASITES (fiasco-self-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index 08b6d35a1fb9..d9b25bebddc3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''flexi-streams''; - version = ''20180711-git''; + version = ''20190107-git''; parasites = [ "flexi-streams-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz''; - sha256 = ''1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2''; + url = ''http://beta.quicklisp.org/archive/flexi-streams/2019-01-07/flexi-streams-20190107-git.tgz''; + sha256 = ''1fqkkvspsdzvrr2rkp6i631m7bwx06j68s19cjzpmnhr9zn696i5''; }; packageName = "flexi-streams"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp - SHA256 1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2 URL - http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz - MD5 1e5bc255540dcbd71f9cba56573cfb4c NAME flexi-streams FILENAME + SHA256 1fqkkvspsdzvrr2rkp6i631m7bwx06j68s19cjzpmnhr9zn696i5 URL + http://beta.quicklisp.org/archive/flexi-streams/2019-01-07/flexi-streams-20190107-git.tgz + MD5 b59014f9f9f0d1b94f161e36e64a35c2 NAME flexi-streams FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 20180711-git SIBLINGS NIL PARASITES + (trivial-gray-streams) VERSION 20190107-git SIBLINGS NIL PARASITES (flexi-streams-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 433a31be0d8b..3754829ac37b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''http-body''; - version = ''20161204-git''; + version = ''20181210-git''; description = ''HTTP POST data parser for Common Lisp''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz''; - sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi''; + url = ''http://beta.quicklisp.org/archive/http-body/2018-12-10/http-body-20181210-git.tgz''; + sha256 = ''170w8rcabf72yq2w9a8134n1sgy7mgirkdj9fzwbr29gqv93plcz''; }; packageName = "http-body"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256 - 1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL - http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz - MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body FILENAME http-body DEPS + 170w8rcabf72yq2w9a8134n1sgy7mgirkdj9fzwbr29gqv93plcz URL + http://beta.quicklisp.org/archive/http-body/2018-12-10/http-body-20181210-git.tgz + MD5 9699bbb11386c6e4d5cf35bea30dbf7f NAME http-body FILENAME http-body DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) @@ -46,4 +46,4 @@ rec { jonathan named-readtables proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-gray-streams trivial-types xsubseq) - VERSION 20161204-git SIBLINGS (http-body-test) PARASITES NIL) */ + VERSION 20181210-git SIBLINGS (http-body-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 3d259fc5b6c5..4c3bcbb42b06 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''ironclad''; - version = ''v0.42''; + version = ''v0.44''; parasites = [ "ironclad/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."nibbles" args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz''; - sha256 = ''1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr''; + url = ''http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz''; + sha256 = ''0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y''; }; packageName = "ironclad"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr URL - http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz - MD5 18f2dbc9dbff97de9ea44af5344485b5 NAME ironclad FILENAME ironclad DEPS + 0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y URL + http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz + MD5 ebce1cbac421a5d7ad461cdaed4ac863 NAME ironclad FILENAME ironclad DEPS ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES - (nibbles rt) VERSION v0.42 SIBLINGS (ironclad-text) PARASITES + (nibbles rt) VERSION v0.44 SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index ae323790ba06..81493865b864 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''jonathan''; - version = ''20180430-git''; + version = ''20181210-git''; description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2018-04-30/jonathan-20180430-git.tgz''; - sha256 = ''0kv6jwd5rimfgydwfgn87wa9m4w4cnsmsx2n284jx9z7frqspdz0''; + url = ''http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz''; + sha256 = ''1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh''; }; packageName = "jonathan"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. - SHA256 0kv6jwd5rimfgydwfgn87wa9m4w4cnsmsx2n284jx9z7frqspdz0 URL - http://beta.quicklisp.org/archive/jonathan/2018-04-30/jonathan-20180430-git.tgz - MD5 7dc695be1b571f19aa9cd2b13aa231bb NAME jonathan FILENAME jonathan DEPS + SHA256 1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh URL + http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz + MD5 eb76f293df02d1b85faf92b92cb24d53 NAME jonathan FILENAME jonathan DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) @@ -39,4 +39,4 @@ rec { (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre cl-syntax cl-syntax-annot fast-io named-readtables proc-parse static-vectors trivial-features trivial-gray-streams trivial-types) - VERSION 20180430-git SIBLINGS (jonathan-test) PARASITES NIL) */ + VERSION 20181210-git SIBLINGS (jonathan-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 94edb06e6aee..b99f7867a7ac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-component''; - version = ''lack-20180831-git''; + version = ''lack-20181210-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; - sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; + url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; + sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; }; packageName = "lack-component"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM lack-component DESCRIPTION NIL SHA256 - 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL - http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 - fd57a7185997a1a5f37bbd9d6899118d NAME lack-component FILENAME - lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180831-git SIBLINGS + 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL + http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 + b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-component FILENAME + lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20181210-git SIBLINGS (lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index a98028e0c060..7cce4b212941 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-middleware-backtrace''; - version = ''lack-20180831-git''; + version = ''lack-20181210-git''; description = ''''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; - sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; + url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; + sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; }; packageName = "lack-middleware-backtrace"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 - 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL - http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 - fd57a7185997a1a5f37bbd9d6899118d NAME lack-middleware-backtrace FILENAME + 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL + http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 + b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20180831-git SIBLINGS + (uiop) VERSION lack-20181210-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 3478ac8488b4..6da62f22f65f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-util''; - version = ''lack-20180831-git''; + version = ''lack-20181210-git''; description = ''''; deps = [ args."ironclad" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; - sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; + url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; + sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; }; packageName = "lack-util"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-util DESCRIPTION NIL SHA256 - 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL - http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 - fd57a7185997a1a5f37bbd9d6899118d NAME lack-util FILENAME lack-util DEPS + 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL + http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 + b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-util FILENAME lack-util DEPS ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad nibbles) VERSION lack-20180831-git SIBLINGS + DEPENDENCIES (ironclad nibbles) VERSION lack-20181210-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index fdcda10a275f..c8ef9a7f6708 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack''; - version = ''20180831-git''; + version = ''20181210-git''; description = ''A minimal Clack''; deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; - sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; + url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; + sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; }; packageName = "lack"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL - http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 - fd57a7185997a1a5f37bbd9d6899118d NAME lack FILENAME lack DEPS + 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL + http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 + b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack FILENAME lack DEPS ((NAME ironclad FILENAME ironclad) (NAME lack-component FILENAME lack-component) (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles)) DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION - 20180831-git SIBLINGS + 20181210-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index a123b7ed3c02..1a94c643d8af 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20180228-git''; + version = ''20181210-git''; parasites = [ "local-time/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2018-02-28/local-time-20180228-git.tgz''; - sha256 = ''0s38rm8rjr4m34ibrvd42y0qgchfqs1pvfm0yv46wbhgg24jgbm1''; + url = ''http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz''; + sha256 = ''0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s''; }; packageName = "local-time"; @@ -21,12 +21,12 @@ rec { } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum - SHA256 0s38rm8rjr4m34ibrvd42y0qgchfqs1pvfm0yv46wbhgg24jgbm1 URL - http://beta.quicklisp.org/archive/local-time/2018-02-28/local-time-20180228-git.tgz - MD5 6bb475cb979c4ba004ef4f4c970dec47 NAME local-time FILENAME local-time + SHA256 0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s URL + http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz + MD5 161762ecff2ffbe4dc68c8dc28472515 NAME local-time FILENAME local-time DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil)) DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION - 20180228-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ + 20181210-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index ad335774cbb5..19382889315a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lquery''; - version = ''20180831-git''; + version = ''20190107-git''; description = ''A library to allow jQuery-like HTML/DOM manipulation.''; deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz''; - sha256 = ''1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v''; + url = ''http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz''; + sha256 = ''023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r''; }; packageName = "lquery"; @@ -19,13 +19,13 @@ rec { } /* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 - 1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v URL - http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz - MD5 d0d3efa47f151afeb754c4bc0c059acf NAME lquery FILENAME lquery DEPS + 023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r URL + http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz + MD5 295245984aa471d2709dcf926abd82e2 NAME lquery FILENAME lquery DEPS ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss) (NAME documentation-utils FILENAME documentation-utils) (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils clss documentation-utils form-fiddle plump trivial-indent) - VERSION 20180831-git SIBLINGS (lquery-test) PARASITES NIL) */ + VERSION 20190107-git SIBLINGS (lquery-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index fe2fc42a18b9..068d0eba69dd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''myway''; - version = ''20150302-git''; + version = ''20181018-git''; description = ''Sinatra-compatible routing library.''; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz''; - sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh''; + url = ''http://beta.quicklisp.org/archive/myway/2018-10-18/myway-20181018-git.tgz''; + sha256 = ''0ffd92mmir2k6i4771ppqvb3xhqlk2yh5znx7i391vq5ji3k5jij''; }; packageName = "myway"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 - 1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL - http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz - MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway FILENAME myway DEPS + 0ffd92mmir2k6i4771ppqvb3xhqlk2yh5znx7i391vq5ji3k5jij URL + http://beta.quicklisp.org/archive/myway/2018-10-18/myway-20181018-git.tgz + MD5 88adecdaec89ceb262559d443512e545 NAME myway FILENAME myway DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-utilities FILENAME cl-utilities) (NAME map-set FILENAME map-set) @@ -29,4 +29,4 @@ rec { DEPENDENCIES (alexandria babel cl-ppcre cl-utilities map-set quri split-sequence trivial-features) - VERSION 20150302-git SIBLINGS (myway-test) PARASITES NIL) */ + VERSION 20181018-git SIBLINGS (myway-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix index bb5121667ac6..bf6216dcaddc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''parenscript''; - version = ''Parenscript-2.6''; + version = ''Parenscript-2.7.1''; description = ''Lisp to JavaScript transpiler''; deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz''; - sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li''; + url = ''http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz''; + sha256 = ''1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f''; }; packageName = "parenscript"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256 - 1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL - http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz - MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript FILENAME parenscript + 1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f URL + http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz + MD5 047c9a72bd36f1b4a5ec67af9453a0b9 NAME parenscript FILENAME parenscript DEPS ((NAME anaphora FILENAME anaphora) (NAME cl-ppcre FILENAME cl-ppcre) (NAME named-readtables FILENAME named-readtables)) - DEPENDENCIES (anaphora cl-ppcre named-readtables) VERSION Parenscript-2.6 - SIBLINGS (parenscript.test) PARASITES NIL) */ + DEPENDENCIES (anaphora cl-ppcre named-readtables) VERSION Parenscript-2.7.1 + SIBLINGS (parenscript.tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 0a1591d7c424..9f36a6717659 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20180831-git''; + version = ''20190107-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz''; - sha256 = ''0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf''; + url = ''http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz''; + sha256 = ''0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3''; }; packageName = "plump"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf URL - http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz - MD5 5a899a19906fd22fb0cb1c65eb584891 NAME plump FILENAME plump DEPS + 0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3 URL + http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz + MD5 5b1a46b83536d5bf1a082a1ef191d3aa NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION - 20180831-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + 20190107-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index da8cb466b412..589f69178991 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''query-fs''; - version = ''20160531-git''; + version = ''20190107-git''; description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz''; - sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a''; + url = ''http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz''; + sha256 = ''1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4''; }; packageName = "query-fs"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries - SHA256 0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL - http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz - MD5 dfbb3d0e7b5d990488a17b184771d049 NAME query-fs FILENAME query-fs DEPS + SHA256 1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4 URL + http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz + MD5 3abd1f0a2f82d10d919bb5b4aa5485be NAME query-fs FILENAME query-fs DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -40,4 +40,4 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall pcall-queue trivial-backtrace trivial-features trivial-utf-8) - VERSION 20160531-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 75eade4d3171..2f30db52448c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''quri''; - version = ''20161204-git''; + version = ''20181210-git''; description = ''Yet another URI library for Common Lisp''; deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz''; - sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv''; + url = ''http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz''; + sha256 = ''0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4''; }; packageName = "quri"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 - 14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL - http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5 - 8c87e99d4f7308d83aab361a6e36508a NAME quri FILENAME quri DEPS + 0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4 URL + http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz MD5 + 94f607540ccc8a15a4439527e41bf7ac NAME quri FILENAME quri DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) (NAME split-sequence FILENAME split-sequence) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cl-utilities split-sequence trivial-features) VERSION - 20161204-git SIBLINGS (quri-test) PARASITES NIL) */ + 20181210-git SIBLINGS (quri-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index b1e89b3eef8a..86890d60dc5e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''simple-date''; - version = ''postmodern-20180831-git''; + version = ''postmodern-20190107-git''; - parasites = [ "simple-date/postgres-glue" ]; + parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; description = ''''; - deps = [ args."cl-postgres" args."md5" args."usocket" ]; + deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz''; - sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx''; + url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz''; + sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5''; }; packageName = "simple-date"; @@ -20,12 +20,12 @@ rec { overrides = x: x; } /* (SYSTEM simple-date DESCRIPTION NIL SHA256 - 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL - http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz - MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME simple-date FILENAME simple-date + 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL + http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz + MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME simple-date FILENAME simple-date DEPS - ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5) - (NAME usocket FILENAME usocket)) - DEPENDENCIES (cl-postgres md5 usocket) VERSION postmodern-20180831-git - SIBLINGS (cl-postgres postmodern s-sql) PARASITES - (simple-date/postgres-glue)) */ + ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam) + (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket)) + DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION + postmodern-20190107-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + (simple-date/postgres-glue simple-date/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index 4db468081da8..f0a21983f16f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''split-sequence''; - version = ''v1.4.1''; + version = ''v1.5.0''; parasites = [ "split-sequence/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/split-sequence/2018-02-28/split-sequence-v1.4.1.tgz''; - sha256 = ''04ag6cdllqhc45psjp7bcwkhnqdhpidi8grn15c7pnaf86apgq3q''; + url = ''http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz''; + sha256 = ''0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g''; }; packageName = "split-sequence"; @@ -23,8 +23,8 @@ rec { /* (SYSTEM split-sequence DESCRIPTION Splits a sequence into a list of subsequences delimited by objects satisfying a test. - SHA256 04ag6cdllqhc45psjp7bcwkhnqdhpidi8grn15c7pnaf86apgq3q URL - http://beta.quicklisp.org/archive/split-sequence/2018-02-28/split-sequence-v1.4.1.tgz - MD5 b85e3ef2bc2cb2ce8a2c101759539ba7 NAME split-sequence FILENAME + SHA256 0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g URL + http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz + MD5 67844853787187d993e6d530306eb2b4 NAME split-sequence FILENAME split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) - VERSION v1.4.1 SIBLINGS NIL PARASITES (split-sequence/tests)) */ + VERSION v1.5.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix index 0dca605c1fdf..df63a5c9836a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''stefil''; - version = ''20101107-darcs''; + version = ''20181210-git''; parasites = [ "stefil-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz''; - sha256 = ''0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3''; + url = ''http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz''; + sha256 = ''10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g''; }; packageName = "stefil"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM stefil DESCRIPTION Stefil - Simple Test Framework In Lisp SHA256 - 0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3 URL - http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz - MD5 8c56bc03e7679e4d42bb3bb3b101de80 NAME stefil FILENAME stefil DEPS + 10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g URL + http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz + MD5 3418bf358366748593f65e4b6e1bb8cf NAME stefil FILENAME stefil DEPS ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate) (NAME metabang-bind FILENAME metabang-bind) (NAME swank FILENAME swank)) - DEPENDENCIES (alexandria iterate metabang-bind swank) VERSION - 20101107-darcs SIBLINGS NIL PARASITES (stefil-test)) */ + DEPENDENCIES (alexandria iterate metabang-bind swank) VERSION 20181210-git + SIBLINGS NIL PARASITES (stefil-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index bb39c74c9625..e75cb087f38d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20180831-git''; + version = ''20190107-git''; description = ''A tiling, keyboard driven window manager''; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz''; - sha256 = ''1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz''; + sha256 = ''1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar''; }; packageName = "stumpwm"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w URL - http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz - MD5 a523654c5f7ffdfe6c6c4f37e9499851 NAME stumpwm FILENAME stumpwm DEPS + 1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar URL + http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz + MD5 5634a308f5b40d9bab1f7c066aa6b9df NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180831-git SIBLINGS + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190107-git SIBLINGS (stumpwm-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 9734118526c6..301b12a8998e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''swank''; - version = ''slime-v2.22''; + version = ''slime-v2.23''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz''; - sha256 = ''0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk''; + url = ''http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz''; + sha256 = ''1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky''; }; packageName = "swank"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM swank DESCRIPTION NIL SHA256 - 0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk URL - http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz MD5 - edf090905d4f3a54ef62f8c13972bba5 NAME swank FILENAME swank DEPS NIL - DEPENDENCIES NIL VERSION slime-v2.22 SIBLINGS NIL PARASITES NIL) */ + 1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky URL + http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz MD5 + 726724480d861d97e8b58bc8f9f27697 NAME swank FILENAME swank DEPS NIL + DEPENDENCIES NIL VERSION slime-v2.23 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index 7c3a01f5d111..5c3c486fb0ff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-garbage''; - version = ''20150113-git''; + version = ''20181018-git''; parasites = [ "trivial-garbage-tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz''; - sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08''; + url = ''http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz''; + sha256 = ''0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl''; }; packageName = "trivial-garbage"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM trivial-garbage DESCRIPTION Portable finalizers, weak hash-tables and weak pointers. SHA256 - 1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08 URL - http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz - MD5 59153568703eed631e53092ab67f935e NAME trivial-garbage FILENAME + 0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl URL + http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz + MD5 4d1d1ab0518b375da21b9a6eeaa498e3 NAME trivial-garbage FILENAME trivial-garbage DEPS ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION - 20150113-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */ + 20181018-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index edb01bd2fc52..2aee236ac0ca 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-gray-streams''; - version = ''20180831-git''; + version = ''20181018-git''; description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz''; - sha256 = ''0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170''; + url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-10-18/trivial-gray-streams-20181018-git.tgz''; + sha256 = ''0a1dmf7m9zbv3p6f5mzb413cy4fz9ahaykqp3ik1a98ivy0i74iv''; }; packageName = "trivial-gray-streams"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-gray-streams DESCRIPTION Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams). - SHA256 0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170 URL - http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz - MD5 070733919aa016a508b2ecb443e37c80 NAME trivial-gray-streams FILENAME - trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180831-git + SHA256 0a1dmf7m9zbv3p6f5mzb413cy4fz9ahaykqp3ik1a98ivy0i74iv URL + http://beta.quicklisp.org/archive/trivial-gray-streams/2018-10-18/trivial-gray-streams-20181018-git.tgz + MD5 0a9f564079dc41ce10d7869d82cc0952 NAME trivial-gray-streams FILENAME + trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index 4214779af320..d34913b1656c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-indent''; - version = ''20180831-git''; + version = ''20181018-git''; description = ''A very simple library to allow indentation hints for SWANK.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz''; - sha256 = ''017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m''; + url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz''; + sha256 = ''0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g''; }; packageName = "trivial-indent"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 - 017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m URL - http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz - MD5 0cc411500f5aa677cd771d45f4cd21b8 NAME trivial-indent FILENAME - trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL + 0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g URL + http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz + MD5 87679f984544027ac939c22e288b09c5 NAME trivial-indent FILENAME + trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 4a36b6563534..0d8822c2f4fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''woo''; - version = ''20180831-git''; + version = ''20181210-git''; description = ''An asynchronous HTTP server written in Common Lisp''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz''; - sha256 = ''142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8''; + url = ''http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz''; + sha256 = ''1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms''; }; packageName = "woo"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp - SHA256 142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8 URL - http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz MD5 - 93dfbc504ebd4fa7ed5f444fcc5444e7 NAME woo FILENAME woo DEPS + SHA256 1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms URL + http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz MD5 + ecc4d7c194b3a941e381d9e6392d51c9 NAME woo FILENAME woo DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -36,11 +36,11 @@ rec { (NAME swap-bytes FILENAME swap-bytes) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop) - (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq)) + (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME vom FILENAME vom) + (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse quri smart-buffer split-sequence static-vectors swap-bytes - trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq) - VERSION 20180831-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ + trivial-features trivial-gray-streams trivial-utf-8 vom xsubseq) + VERSION 20181210-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index 6db21bf9005e..f717441068b6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''wookie''; - version = ''20180831-git''; + version = ''20181018-git''; description = ''An evented webserver for Common Lisp.''; - deps = [ args."alexandria" args."babel" args."babel-streams" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz''; - sha256 = ''1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx''; + url = ''http://beta.quicklisp.org/archive/wookie/2018-10-18/wookie-20181018-git.tgz''; + sha256 = ''0z7v7fg9dm6g4kdvfi588vnfh0dv2knb0z3rf5a9fw8yrvckifdq''; }; packageName = "wookie"; @@ -18,11 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 - 1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx URL - http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz - MD5 c825760241580a95c68b1ac6f428e07e NAME wookie FILENAME wookie DEPS + 0z7v7fg9dm6g4kdvfi588vnfh0dv2knb0z3rf5a9fw8yrvckifdq URL + http://beta.quicklisp.org/archive/wookie/2018-10-18/wookie-20181018-git.tgz + MD5 91e350e5aca3c3a5c56371bff8f754ae NAME wookie FILENAME wookie DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME babel-streams FILENAME babel-streams) (NAME blackbird FILENAME blackbird) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -44,9 +43,9 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel babel-streams blackbird bordeaux-threads cffi cffi-grovel + (alexandria babel blackbird bordeaux-threads cffi cffi-grovel cffi-toolchain chunga cl-async cl-async-base cl-async-ssl cl-async-util cl-fad cl-libuv cl-ppcre cl-utilities do-urlencode fast-http fast-io flexi-streams proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-gray-streams vom xsubseq) - VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20181018-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index 63b8e21b4a30..ad90b8552181 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''xpath''; - version = ''plexippus-20120909-darcs''; + version = ''plexippus-20181210-git''; - description = ''''; + parasites = [ "xpath/test" ]; - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; + description = ''An implementation of the XML Path Language (XPath) Version 1.0''; + + deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2012-09-09/plexippus-xpath-20120909-darcs.tgz''; - sha256 = ''1zlkr7ck60gr5rxfiq22prnbblih14ywr0s5g2kss2a842zvkxn6''; + url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz''; + sha256 = ''1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn''; }; packageName = "xpath"; @@ -17,21 +19,19 @@ rec { asdFilesToKeep = ["xpath.asd"]; overrides = x: x; } -/* (SYSTEM xpath DESCRIPTION NIL SHA256 - 1zlkr7ck60gr5rxfiq22prnbblih14ywr0s5g2kss2a842zvkxn6 URL - http://beta.quicklisp.org/archive/plexippus-xpath/2012-09-09/plexippus-xpath-20120909-darcs.tgz - MD5 1d7457bffe7c4f6e1631c59bc00723d4 NAME xpath FILENAME xpath DEPS +/* (SYSTEM xpath DESCRIPTION + An implementation of the XML Path Language (XPath) Version 1.0 SHA256 + 1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn URL + http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz + MD5 106060a6e90dd35c80385ad5a1e8554d NAME xpath FILENAME xpath DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) - (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME yacc FILENAME yacc)) DEPENDENCIES - (alexandria babel cl-ppcre closure-common cxml cxml-dom cxml-klacks - cxml-test cxml-xml parse-number puri trivial-features trivial-gray-streams - yacc) - VERSION plexippus-20120909-darcs SIBLINGS NIL PARASITES NIL) */ + (alexandria babel cl-ppcre closure-common cxml parse-number puri + trivial-features trivial-gray-streams yacc) + VERSION plexippus-20181210-git SIBLINGS NIL PARASITES (xpath/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index e904f0041d13..df3700827820 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,6 +6,12 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; + + + "xpath_slash_test" = quicklisp-to-nix-packages."xpath"; + + "unit-test" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."unit-test" or (x: {})) @@ -123,6 +129,7 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -138,10 +145,6 @@ let quicklisp-to-nix-packages = rec { "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "closure-common" = quicklisp-to-nix-packages."closure-common"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "parse-number" = quicklisp-to-nix-packages."parse-number"; "puri" = quicklisp-to-nix-packages."puri"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; @@ -160,16 +163,13 @@ let quicklisp-to-nix-packages = rec { "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "closure-common" = quicklisp-to-nix-packages."closure-common"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "parse-number" = quicklisp-to-nix-packages."parse-number"; "puri" = quicklisp-to-nix-packages."puri"; "rt" = quicklisp-to-nix-packages."rt"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "xpath" = quicklisp-to-nix-packages."xpath"; + "xpath_slash_test" = quicklisp-to-nix-packages."xpath_slash_test"; "yacc" = quicklisp-to-nix-packages."yacc"; })); @@ -229,10 +229,6 @@ let quicklisp-to-nix-packages = rec { "closure-html" = quicklisp-to-nix-packages."closure-html"; "collectors" = quicklisp-to-nix-packages."collectors"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; @@ -261,10 +257,6 @@ let quicklisp-to-nix-packages = rec { "closure-html" = quicklisp-to-nix-packages."closure-html"; "collectors" = quicklisp-to-nix-packages."collectors"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; @@ -303,6 +295,7 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/fiasco.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -394,18 +387,6 @@ let quicklisp-to-nix-packages = rec { })); - "cxml-xml" = quicklisp-to-nix-packages."cxml"; - - - "cxml-test" = quicklisp-to-nix-packages."cxml"; - - - "cxml-klacks" = quicklisp-to-nix-packages."cxml"; - - - "cxml-dom" = quicklisp-to-nix-packages."cxml"; - - "closure-common" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."closure-common" or (x: {})) @@ -647,9 +628,7 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; - "babel-streams" = quicklisp-to-nix-packages."babel-streams"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -825,18 +804,6 @@ let quicklisp-to-nix-packages = rec { })); - "babel-streams" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."babel-streams" or (x: {})) - (import ./quicklisp-to-nix-output/babel-streams.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - "anaphora" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."anaphora" or (x: {})) @@ -907,7 +874,6 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; - "babel-streams" = quicklisp-to-nix-packages."babel-streams"; "blackbird" = quicklisp-to-nix-packages."blackbird"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; @@ -964,7 +930,6 @@ let quicklisp-to-nix-packages = rec { "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; - "uiop" = quicklisp-to-nix-packages."uiop"; "vom" = quicklisp-to-nix-packages."vom"; "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -1090,6 +1055,7 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/simple-date.nix { inherit fetchurl; "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -1718,11 +1684,7 @@ let quicklisp-to-nix-packages = rec { "collectors" = quicklisp-to-nix-packages."collectors"; "css-selectors" = quicklisp-to-nix-packages."css-selectors"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; "cxml-stp" = quicklisp-to-nix-packages."cxml-stp"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; @@ -1756,10 +1718,6 @@ let quicklisp-to-nix-packages = rec { "collectors" = quicklisp-to-nix-packages."collectors"; "css-selectors" = quicklisp-to-nix-packages."css-selectors"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; @@ -1791,10 +1749,6 @@ let quicklisp-to-nix-packages = rec { "closure-html" = quicklisp-to-nix-packages."closure-html"; "collectors" = quicklisp-to-nix-packages."collectors"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; @@ -2187,10 +2141,6 @@ let quicklisp-to-nix-packages = rec { "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "closure-common" = quicklisp-to-nix-packages."closure-common"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "hu_dot_dwim_dot_stefil" = quicklisp-to-nix-packages."hu_dot_dwim_dot_stefil"; "iterate" = quicklisp-to-nix-packages."iterate"; @@ -2604,7 +2554,6 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "anaphora" = quicklisp-to-nix-packages."anaphora"; "babel" = quicklisp-to-nix-packages."babel"; - "babel-streams" = quicklisp-to-nix-packages."babel-streams"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix new file mode 100644 index 000000000000..c20d4d02c65f --- /dev/null +++ b/pkgs/development/lua-modules/default.nix @@ -0,0 +1,17 @@ +# inspired by pkgs/development/haskell-modules/default.nix +{ pkgs, stdenv, lib +, lua +, overrides ? (self: super: {}) +}: + +let + + inherit (lib) extends makeExtensible; + + initialPackages = (pkgs.callPackage ../../top-level/lua-packages.nix { + inherit lua; + }); + + extensible-self = makeExtensible initialPackages; +in + extensible-self diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 5669eae96c5e..3dae32b5e15d 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -1,11 +1,11 @@ -{ lua, writeText }: +{ lua, writeText, toLuaModule }: { buildInputs ? [], disabled ? false, ... } @ attrs: if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" else - lua.stdenv.mkDerivation ( + toLuaModule( lua.stdenv.mkDerivation ( { makeFlags = [ "PREFIX=$(out)" @@ -51,4 +51,4 @@ else addEnvHooks "$hostOffset" addLuaLibCPath ''; } - ) + ) ) diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 690f9712a10c..935a4a4f2fbb 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -20,20 +20,13 @@ , includeExtras ? [] }: -if !licenseAccepted then throw '' - You must accept the Android Software Development Kit License Agreement at - https://developer.android.com/studio/terms - by setting nixpkgs config option 'android_sdk.accept_license = true;' - '' -else assert licenseAccepted; - let inherit (pkgs) stdenv fetchurl makeWrapper unzip; # Determine the Android os identifier from Nix's system identifier os = if stdenv.system == "x86_64-linux" then "linux" else if stdenv.system == "x86_64-darwin" then "macosx" - else "No tarballs found for system architecture: ${stdenv.system}"; + else throw "No tarballs found for system architecture: ${stdenv.system}"; # Generated Nix packages packages = import ./generated/packages.nix { @@ -196,7 +189,11 @@ rec { # This derivation deploys the tools package and symlinks all the desired # plugins that we want to use. - androidsdk = import ./tools.nix { + androidsdk = if !licenseAccepted then throw '' + You must accept the Android Software Development Kit License Agreement at + https://developer.android.com/studio/terms + by setting nixpkgs config option 'android_sdk.accept_license = true;' + '' else import ./tools.nix { inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686; inherit (stdenv) lib; diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch deleted file mode 100644 index 1f6bfac5b80d..000000000000 --- a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py -index b8172b28..95daa6a6 100755 ---- a/build/tools/make_standalone_toolchain.py -+++ b/build/tools/make_standalone_toolchain.py -@@ -353,7 +353,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - platforms_path, host_tag): - """Create a standalone toolchain.""" - copy_directory_contents(gcc_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_directory_contents(clang_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - triple = get_triple(arch) - make_clang_scripts( - install_path, triple, api, host_tag.startswith('windows')) -@@ -365,9 +367,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - install_headers = os.path.join(install_sysroot, 'usr/include') - os.makedirs(os.path.dirname(install_headers)) - shutil.copytree(headers, install_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - arch_headers = os.path.join(sysroot, 'usr/include', triple) - copy_directory_contents(arch_headers, os.path.join(install_headers)) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - for lib_suffix in ('', '64'): - lib_path = os.path.join(platforms_path, 'usr/lib{}'.format(lib_suffix)) -@@ -375,20 +379,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - install_sysroot, 'usr/lib{}'.format(lib_suffix)) - if os.path.exists(lib_path): - shutil.copytree(lib_path, lib_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - static_lib_path = os.path.join(sysroot, 'usr/lib', triple) - static_lib_install = os.path.join(install_sysroot, 'usr/lib') - if arch == 'x86_64': - static_lib_install += '64' - copy_directory_contents(static_lib_path, static_lib_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag) - copy_directory_contents(prebuilt_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - gdbserver_path = os.path.join( - NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver') - gdbserver_install = os.path.join(install_path, 'share', 'gdbserver') - shutil.copytree(gdbserver_path, gdbserver_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) - dirs = os.listdir(toolchain_lib_dir) -@@ -401,6 +409,7 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi') - support_dir = os.path.join(NDK_DIR, 'sources/android/support') - copy_directory_contents(os.path.join(libcxx_dir, 'include'), cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - if api < 21: - # For any libc header that is in libandroid_support, we actually have -@@ -412,11 +421,13 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - copy_directory_contents( - os.path.join(support_dir, 'include'), - os.path.join(install_path, 'sysroot/usr/local/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # I have no idea why we need this, but the old one does it too. - copy_directory_contents( - os.path.join(libcxxabi_dir, 'include'), - os.path.join(install_path, 'include/llvm-libc++abi/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - headers = [ - 'cxxabi.h', -@@ -426,20 +437,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - shutil.copy2( - os.path.join(libcxxabi_dir, 'include', header), - os.path.join(cxx_headers, header)) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - for abi in get_abis(arch): - src_libdir = get_src_libdir(libcxx_dir, abi) - dest_libdir = get_dest_libdir(install_path, triple, abi) - copy_libcxx_libs(src_libdir, dest_libdir, abi, api) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - thumb_libdir = os.path.join(dest_libdir, 'thumb') - copy_libcxx_libs(src_libdir, thumb_libdir, abi, api) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # Not needed for every STL, but the old one does this. Keep it for the sake - # of diff. Done at the end so copytree works. - cxx_target_headers = os.path.join(cxx_headers, triple) - if not os.path.exists(cxx_target_headers): - os.makedirs(cxx_target_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - - def parse_args(): diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix index ed1dfe3d2630..0234c9f3d04b 100644 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ b/pkgs/development/mobile/androidenv/tools/26.nix @@ -4,7 +4,7 @@ deployAndroidPackage { name = "androidsdk"; inherit os package; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 64122a435273..56312f198e09 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -70,6 +70,11 @@ nodePackages // { pnpm = nodePackages.pnpm.override { nativeBuildInputs = [ pkgs.makeWrapper ]; + + preRebuild = '' + sed 's/"link:/"file:/g' --in-place package.json + ''; + postInstall = let pnpmLibPath = stdenv.lib.makeBinPath [ nodejs.passthru.python diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index aef59ba2ab91..24fe4a2458d6 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }: +{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { version = "2.1.11"; @@ -9,12 +9,15 @@ buildPythonPackage rec { sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8"; }; - checkInputs = [ mock nose ddt ]; - propagatedBuildInputs = [ gitdb2 ]; + patches = [ + (substituteAll { + src = ./hardcode-git-path.patch; + inherit git; + }) + ]; - postPatch = '' - sed -i "s|^refresh()$|refresh(path='${git}/bin/git')|" git/__init__.py - ''; + checkInputs = [ nose ] ++ lib.optional isPy27 mock; + propagatedBuildInputs = [ gitdb2 ddt ]; # Tests require a git repo doCheck = false; diff --git a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch new file mode 100644 index 000000000000..937479959926 --- /dev/null +++ b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch @@ -0,0 +1,13 @@ +diff --git a/git/cmd.py b/git/cmd.py +index a4faefe..51ad442 100644 +--- a/git/cmd.py ++++ b/git/cmd.py +@@ -175,7 +175,7 @@ class Git(LazyMixin): + + # CONFIGURATION + +- git_exec_name = "git" # default that should work on linux and windows ++ git_exec_name = "@git@/bin/git" + + # Enables debugging of GitPython's git commands + GIT_PYTHON_TRACE = os.environ.get("GIT_PYTHON_TRACE", False) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 8108914814af..a884b9eb7fbe 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -1,46 +1,33 @@ { stdenv , buildPythonPackage , fetchPypi -, imagemagick -, pytest -, psutil -, memory_profiler -, pytest_xdist +, imagemagick7Big }: -let - soext = stdenv.hostPlatform.extensions.sharedLibrary; - magick_wand_library = "${imagemagick}/lib/libMagickWand-6.Q16${soext}"; - imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}"; -in buildPythonPackage rec { +buildPythonPackage rec { pname = "Wand"; - version = "0.4.5"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b40a2215545e8c7193b3fccd6e7251dc556ec9b878a4f67d992b056ff396bc65"; + sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj"; }; - checkInputs = [ pytest pytest_xdist memory_profiler psutil ]; - - buildInputs = [ imagemagick ]; - - inherit magick_wand_library imagemagick_library; - postPatch = '' - substituteAllInPlace wand/api.py + substituteInPlace wand/api.py --replace \ + "magick_home = os.environ.get('MAGICK_HOME')" \ + "magick_home = '${imagemagick7Big}'" ''; # tests not included with pypi release doCheck = false; + passthru.imagemagick = imagemagick7Big; + meta = with stdenv.lib; { description = "Ctypes-based simple MagickWand API binding for Python"; homepage = http://wand-py.org/; license = [ licenses.mit ]; - }; - - passthru = { - inherit imagemagick; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix new file mode 100644 index 000000000000..f898c9313e1f --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: + +buildPythonPackage rec { + pname = "aiohttp-socks"; + version = "0.2.2"; + + src = fetchPypi { + inherit version; + pname = "aiohttp_socks"; + sha256 = "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Checks needs internet access + doCheck = false; + + disabled = pythonOlder "3.5.3"; + + meta = { + description = "SOCKS proxy connector for aiohttp"; + license = lib.licenses.asl20; + homepage = https://github.com/romis2012/aiohttp-socks; + }; +} diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix new file mode 100644 index 000000000000..1c5d651264e0 --- /dev/null +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, pythonOlder, attrs }: + +buildPythonPackage rec { + pname = "aiorpcx"; + version = "0.10.2"; + + src = fetchPypi { + inherit version; + pname = "aiorpcX"; + sha256 = "1p88k15jh0d2a18pnnbfcamsqi2bxvmmhpizmdlxfdxf8vy5ggyj"; + }; + + propagatedBuildInputs = [ attrs ]; + + disabled = pythonOlder "3.6"; + + # Checks needs internet access + doCheck = false; + + meta = { + description = "Transport, protocol and framing-independent async RPC client and server implementation"; + license = lib.licenses.mit; + homepage = https://github.com/kyuupichan/aiorpcX; + }; +} diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix new file mode 100644 index 000000000000..686d6a2a75e1 --- /dev/null +++ b/pkgs/development/python-modules/androguard/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi, future, networkx, pygments, lxml, colorama, matplotlib, + asn1crypto, click, pydot, ipython, pyqt5, pyperclip }: + +buildPythonPackage rec { + version = "3.3.3"; + pname = "androguard"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zlmn3byh2whg7k2xmcd7yy43lcawhryjnzcxr9bhn54709b6iyd"; + }; + + propagatedBuildInputs = [ + future + networkx + pygments + lxml + colorama + matplotlib + asn1crypto + click + pydot + ipython + pyqt5 + pyperclip + ]; + + # Tests are not shipped on PyPI. + doCheck = false; + + meta = { + description = "Tool and python library to interact with Android Files"; + homepage = https://github.com/androguard/androguard; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.pmiddend ]; + }; +} diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix new file mode 100644 index 000000000000..d83e2fdbf443 --- /dev/null +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pyfiglet +, pillow +, wcwidth +, future +, mock +, nose +}: + +buildPythonPackage rec { + pname = "asciimatics"; + version = "1.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9101b0b6885542f324980bbe13a772475cd6a12678f601228eaaea412db919ab"; + }; + + nativeBuildInputs = [ + setuptools_scm + ]; + + propagatedBuildInputs = [ + pyfiglet + pillow + wcwidth + future + ]; + + checkInputs = [ + mock + nose + ]; + + # tests require a pty emulator + # which is too complicated to setup here + doCheck = false; + + meta = with lib; { + description = "Helps to create full-screen text UIs (from interactive forms to ASCII animations) on any platform"; + homepage = https://github.com/peterbrittain/asciimatics; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 577a92eb8910..3c5839267bde 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "astral"; - version = "1.7.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "01raz1c29v08f05l395v1hxllad35m5ld1jj51knb53c0396y248"; + sha256 = "179f72a086cee96487e60514bab81e821966953fc2e2f7091500d3d2c314e38b"; }; propagatedBuildInputs = [ pytz requests ]; checkInputs = [ pytest ]; checkPhase = '' - # https://github.com/sffjunkie/astral/pull/13 + # https://github.com/sffjunkie/astral/pull/26 touch src/test/.api_key py.test -m "not webtest" ''; diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix new file mode 100644 index 000000000000..9a84a7326850 --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-storage-common +, isPy3k +, futures +}: + +buildPythonPackage rec { + pname = "azure-storage-blob"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "65ebe2e54460566c2077c6b3773a2a0623eabc7b95602010cb51b84077087fda"; + }; + + propagatedBuildInputs = [ + azure-common + azure-storage-common + ] ++ lib.optional (!isPy3k) futures; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Client library for Microsoft Azure Storage services containing the blob service APIs"; + homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-blob; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-common/default.nix b/pkgs/development/python-modules/azure-storage-common/default.nix new file mode 100644 index 000000000000..6561163c3a2b --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-common/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, cryptography +, python-dateutil +, requests +, isPy3k +, azure-storage-nspkg +}: + +buildPythonPackage rec { + pname = "azure-storage-common"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7ab607f9b8fd27b817482194b1e7d43484c65dcf2605aae21ad8706c6891934d"; + }; + + propagatedBuildInputs = [ + azure-common + cryptography + python-dateutil + requests + ] ++ lib.optional (!isPy3k) azure-storage-nspkg; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Client library for Microsoft Azure Storage services containing common code shared by blob, file and queue"; + homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-common; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-file/default.nix b/pkgs/development/python-modules/azure-storage-file/default.nix new file mode 100644 index 000000000000..ffdb2f656c1d --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-file/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-storage-common +, isPy3k +, futures +}: + +buildPythonPackage rec { + pname = "azure-storage-file"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "5217b0441b671246a8d5f506a459fa3af084eeb9297c5be3bbe95d75d23bac2f"; + }; + + propagatedBuildInputs = [ + azure-common + azure-storage-common + ] ++ lib.optional (!isPy3k) futures; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Client library for Microsoft Azure Storage services containing the file service APIs"; + homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-file; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-nspkg/default.nix b/pkgs/development/python-modules/azure-storage-nspkg/default.nix new file mode 100644 index 000000000000..5efef893a756 --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-nspkg/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-nspkg +}: + +buildPythonPackage rec { + pname = "azure-storage-nspkg"; + version = "3.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f3bbe8652d5f542767d8433e7f96b8df7f518774055ac7c92ed7ca85f653811"; + }; + + propagatedBuildInputs = [ + azure-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Client library for Microsoft Azure Storage services owning the azure.storage namespace, user should not use this directly"; + homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-nspkg; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix new file mode 100644 index 000000000000..1ca1288e9b44 --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-storage-common +}: + +buildPythonPackage rec { + pname = "azure-storage-queue"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bafe9e61c0ce7b3f3ecadea21e931dab3248bd4989dc327a8666c5deae7f7ed"; + }; + + propagatedBuildInputs = [ + azure-common + azure-storage-common + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Client library for Microsoft Azure Storage services containing the queue service APIs"; + homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-queue; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix new file mode 100644 index 000000000000..5bd545db51cc --- /dev/null +++ b/pkgs/development/python-modules/braintree/default.nix @@ -0,0 +1,27 @@ +{ lib, + fetchPypi, + requests, + buildPythonPackage +}: + +buildPythonPackage rec { + pname = "braintree"; + version = "3.50.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "d1d7a6854b623f2c616451fa474113ac7fb8a2cbeb7dfad36dd3312113484030"; + }; + + propagatedBuildInputs = [ requests ]; + + # pypi release does not include tests + doCheck = false; + + meta = with lib; { + description = "Python library for integration with Braintree"; + homepage = https://github.com/braintree/braintree_python; + license = licenses.mit; + maintainers = [ maintainers.ivegotasthma ]; + }; +} diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 844aebbbb965..b2b10671f2b9 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi , mock, unittest2, nose , twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six -, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future15 }: +, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future }: buildPythonPackage rec { pname = "bugwarrior"; @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ mock unittest2 nose /* jira megaplan */ ]; propagatedBuildInputs = [ twiggy requests offtrac bugzilla taskw dateutil pytz keyring six - jinja2 pycurl dogpile_cache lockfile click pyxdg future15 + jinja2 pycurl dogpile_cache lockfile click pyxdg future ]; # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix deleted file mode 100644 index 05f3afe758a6..000000000000 --- a/pkgs/development/python-modules/cachetools/1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy }: - -buildPythonPackage rec { - pname = "cachetools"; - version = "2.1.0"; - disabled = isPyPy; # a test fails - - src = fetchPypi { - inherit pname version; - sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/tkem/cachetools"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 8cfc14a2beef..a58591f4b05f 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -66,4 +66,18 @@ buildPythonPackage rec { # IOKit's dependencies are inconsistent between OSX versions, so this is the best we # can do until nix 1.11's release __impureHostDeps = [ "/usr/lib" ]; + + meta = with stdenv.lib; { + description = "A package which provides cryptographic recipes and primitives"; + longDescription = '' + Cryptography includes both high level recipes and low level interfaces to + common cryptographic algorithms such as symmetric ciphers, message + digests, and key derivation functions. + Our goal is for it to be your "cryptographic standard library". It + supports Python 2.7, Python 3.4+, and PyPy 5.3+. + ''; + homepage = https://github.com/pyca/cryptography; + license = with licenses; [ asl20 bsd3 psfl ]; + maintainers = with maintainers; [ primeos ]; + }; } diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index d979f03c54df..00c726cee899 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -1,6 +1,4 @@ -{ buildPythonPackage -, fetchPypi -}: +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { # also bump cryptography @@ -14,4 +12,12 @@ buildPythonPackage rec { # No tests included doCheck = false; + + meta = with lib; { + description = "Test vectors for the cryptography package"; + homepage = https://cryptography.io/en/latest/development/test-vectors/; + # Source: https://github.com/pyca/cryptography/tree/master/vectors; + license = with licenses; [ asl20 bsd3 ]; + maintainers = with maintainers; [ primeos ]; + }; } diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix index 7fbdaa8909d6..48f932086cc6 100644 --- a/pkgs/development/python-modules/csvkit/default.nix +++ b/pkgs/development/python-modules/csvkit/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi, buildPythonPackage, isPy3k , agate, agate-excel, agate-dbf, agate-sql, six -, argparse, ordereddict, simplejson +, ordereddict, simplejson , glibcLocales, nose, mock, unittest2 }: @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate agate-excel agate-dbf agate-sql six ] ++ lib.optionals (!isPy3k) [ - argparse ordereddict simplejson + ordereddict simplejson ]; checkInputs = [ diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix new file mode 100644 index 000000000000..21f5b841adb8 --- /dev/null +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -0,0 +1,27 @@ +{ lib, + fetchPypi, + django, + buildPythonPackage +}: + +buildPythonPackage rec { + pname = "django-cors-headers"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qfa9awsj3f0nwygb0vdh4ilcsfi6zinzng73cd5864x2fbyxhn4"; + }; + + propagatedBuildInputs = [ django ]; + + # pypi release does not include tests + doCheck = false; + + meta = with lib; { + description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; + homepage = https://github.com/OttoYiu/django-cors-headers; + license = licenses.mit; + maintainers = [ maintainers.ivegotasthma ]; + }; +} diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix new file mode 100644 index 000000000000..696376b3e4bd --- /dev/null +++ b/pkgs/development/python-modules/django-rest-auth/default.nix @@ -0,0 +1,29 @@ +{ lib, + fetchPypi, + django, + djangorestframework, + six, + buildPythonPackage +}: + +buildPythonPackage rec { + pname = "django-rest-auth"; + version = "0.9.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "ad155a0ed1061b32e3e46c9b25686e397644fd6acfd35d5c03bc6b9d2fc6c82a"; + }; + + propagatedBuildInputs = [ django djangorestframework six ]; + + # pypi release does not include tests + doCheck = false; + + meta = with lib; { + description = "Django app that makes registration and authentication easy"; + homepage = https://github.com/Tivix/django-rest-auth; + license = licenses.mit; + maintainers = [ maintainers.ivegotasthma ]; + }; +} diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix new file mode 100644 index 000000000000..9887580b0fdd --- /dev/null +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi +, django }: + +buildPythonPackage rec { + pname = "django-sesame"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "081q3vd9waiajiipg99flw0vlzk920sz07067v3n5774gx0qhbaa"; + }; + + checkInputs = [ django ]; + + checkPhase = '' + PYTHONPATH="$(pwd):$PYTHONPATH" \ + DJANGO_SETTINGS_MODULE=sesame.test_settings \ + django-admin test sesame + ''; + + meta = with lib; { + description = "URLs with authentication tokens for automatic login"; + homepage = http://github.com/aaugustin/django-sesame; + license = licenses.bsd3; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 131c6b3ef1bf..6e2bbd9fd5d3 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,13 +6,11 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.17"; - - disabled = pythonOlder "2.7"; + version = "1.11.18"; src = fetchurl { url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "10xlpm21ll8mgz5py41sz9vrd603qv7an736agbqxkxlyikfx1x7"; + sha256 = "19b6f020als9hr4q1im5282yn2b1hzf586n9kjrlkrslq7da3k3k"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix index 30d75e73c68d..ee2408f73405 100644 --- a/pkgs/development/python-modules/django/1_8.nix +++ b/pkgs/development/python-modules/django/1_8.nix @@ -25,6 +25,11 @@ buildPythonPackage rec { description = "A high-level Python Web framework"; homepage = https://www.djangoproject.com/; license = licenses.bsd0; + knownVulnerabilities = [ + # The patches were not backported due to Django 1.8 having reached EOL + https://www.djangoproject.com/weblog/2018/aug/01/security-releases/ + https://www.djangoproject.com/weblog/2019/jan/04/security-releases/ + ]; }; } diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 18fbbe2da311..35879a7bfb49 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -13,6 +13,9 @@ buildPythonPackage rec { sha256 = "9b8a245917e1bae131d3210c9ca7efbc066e60f32efa436e391c9803c3f4b61b"; }; + # tests assume the availability of a mysql/postgresql database + doCheck = false; + propagatedBuildInputs = [ django ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/djangorestframework-jwt/default.nix b/pkgs/development/python-modules/djangorestframework-jwt/default.nix new file mode 100644 index 000000000000..f50fd3ff9b61 --- /dev/null +++ b/pkgs/development/python-modules/djangorestframework-jwt/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchPypi +, django +, pyjwt +, djangorestframework +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "djangorestframework-jwt"; + version = "1.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "19rng6v1sw14mbjp5cplnrgxjnhlj8faalfw02iihi9s5w1k7zjy"; + }; + + propagatedBuildInputs = [ pyjwt django djangorestframework ]; + + # ./runtests.py fails because the project must be tested against a django + # installation, there are missing database tables for User, that don't exist. + doCheck = false; + + meta = with lib; { + description = "JSON Web Token Authentication support for Django REST Framework"; + homepage = https://github.com/GetBlimp/django-rest-framework-jwt; + license = licenses.mit; + maintainers = [ maintainers.ivegotasthma ]; + }; +} diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix new file mode 100644 index 000000000000..84dba75e404a --- /dev/null +++ b/pkgs/development/python-modules/docker-py/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }: + +buildPythonPackage rec { + version = "1.10.6"; + pname = "docker-py"; + + src = fetchPypi { + inherit pname version; + sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"; + }; + + # The tests access the network. + doCheck = false; + + propagatedBuildInputs = [ + six + requests + websocket_client + docker_pycreds + ]; + + meta = { + description = "Python library for the Docker Remote API"; + homepage = https://github.com/docker/docker-py/; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.pmiddend ]; + }; +} diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 20f4bc7e0c33..09faabb98cc6 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -2,12 +2,13 @@ buildPythonPackage rec { pname = "dugong"; - version = "3.5"; + version = "3.7.4"; disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 src = fetchPypi { inherit pname version; - sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24"; + extension = "tar.bz2"; + sha256 = "1fb9kwib6jsd09bxiz70av6g0blscygkx7xzaz1b7ibd28ms77zd"; }; } diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 94d47073764e..805bacbd716a 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "6.2.1"; + version = "6.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0f0w23kzyym0fkzisdkcl4xpnm8fsi97v1kskyvfrhj3mxy179fh"; + sha256 = "1gh8a0shqi105k325hgwb9avrpdjh0mc6mxwfg9ba7g6lssb702z"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index 7c071a5cee6b..6b3909a5b458 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "eradicate"; - version = "0.2.1"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "092zmck919bn6sl31ixrzhn88g9nvhwzmwzpq8dzgn6c8k2h3bzr"; + sha256 = "06nhs8wml5f5k96gbq7jl417bmsqnxy8aykpzbzrvm3gmqmaizag"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 9a46d9611e08..548c7a59bc6f 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "067mdy9p1vbkypr3vazmrb0sga6maqbk542hr7hmzcb5lp3dr8sj"; + sha256 = "0v1pjzn9z20ckgv3kji7c8nwcsm7670z4i43ic9skjrdbcqylwfq"; }; buildInputs = [ pytestrunner ]; @@ -30,6 +30,7 @@ buildPythonPackage rec { ] ++ lib.optional (pythonOlder "3.3") ipaddress; postPatch = '' + find tests -type d -name "__pycache__" | xargs rm -r substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest" ''; diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix new file mode 100644 index 000000000000..e4675274c09f --- /dev/null +++ b/pkgs/development/python-modules/favicon/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock, + pytestrunner }: + +buildPythonPackage rec { + pname = "favicon"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "01jhb66nrqbf22z6ybpi8ndw6zifgysdmnh547027g96nz51669y"; + }; + + buildInputs = [ pytestrunner ]; + checkInputs = [ pytest requests-mock ]; + propagatedBuildInputs = [ requests beautifulsoup4 ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Find a website's favicon"; + homepage = http://github.com/scottwernervt/favicon; + license = licenses.mit; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/development/python-modules/fdroidserver/default.nix b/pkgs/development/python-modules/fdroidserver/default.nix deleted file mode 100644 index b9b936ae83e8..000000000000 --- a/pkgs/development/python-modules/fdroidserver/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitLab -, libcloud -, pyyaml -, paramiko -, pyasn1 -, pyasn1-modules -, pillow -, mwclient -, GitPython -, isPy3k -}: - -buildPythonPackage rec { - version = "2016-05-31"; - pname = "fdroidserver-git"; - disabled = ! isPy3k; - - src = fetchFromGitLab { - owner = "fdroid"; - repo = "fdroidserver"; - rev = "401649e0365e6e365fc48ae8a3af94768af865f3"; - sha256 = "1mmi2ffpym1qw694yj938kc7b4xhq0blri7wkjaqddcyykjyr94d"; - }; - - propagatedBuildInputs = [ libcloud pyyaml paramiko pyasn1 pyasn1-modules pillow mwclient GitPython ]; - - meta = with stdenv.lib; { - homepage = https://f-droid.org; - description = "Server and tools for F-Droid, the Free Software repository system for Android"; - license = licenses.agpl3; - }; - -} diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 4fd2db014bab..58df04c17c80 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.34.2"; + version = "3.37.0"; src = fetchPypi { inherit pname version; - sha256 = "1ahs82jnc8f7gksh51asg9dcifhslyfdz9dry9sxq424q1p5k9lz"; + sha256 = "1bf7k6qdvi2ycw87g8iqy0rwl3ms25k3zz6ix1fpsk8qx36gk9x1"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 38457caabbf5..f6fa41e33f83 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -4,13 +4,13 @@ , fetchPypi , html5lib , wcwidth -, nose +, pytest }: buildPythonPackage rec { pname = "ftfy"; - version = "5.5.0"; + version = "5.5.1"; # ftfy v5 only supports python3. Since at the moment the only # packages that use ftfy are spacy and textacy which both support # python 2 and 3, they have pinned ftfy to the v4 branch. @@ -20,26 +20,26 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "525ea45a871f52ddb170e66b01f35f1b3022995016c81efa305e628937b85443"; + sha256 = "1ci6xrj4g01a97nymxpv9nj820nlmgzc4ybaz9k46i6bnxzpax7s"; }; - propagatedBuildInputs = [ html5lib wcwidth ]; + propagatedBuildInputs = [ + html5lib + wcwidth + ]; checkInputs = [ - nose + pytest ]; + # We suffix PATH like this because the tests want the ftfy executable checkPhase = '' - nosetests -v tests + PATH=$out/bin:$PATH pytest ''; - # Several tests fail with - # FileNotFoundError: [Errno 2] No such file or directory: 'ftfy' - doCheck = false; - meta = with stdenv.lib; { - description = "Given Unicode text, make its representation consistent and possibly less broken."; - homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests; + description = "Given Unicode text, make its representation consistent and possibly less broken"; + homepage = https://github.com/LuminosoInsight/python-ftfy; license = licenses.mit; maintainers = with maintainers; [ sdll aborsu ]; }; diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix new file mode 100644 index 000000000000..7df148df09c9 --- /dev/null +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "future-fstrings"; + version = "0.4.5"; + + src = fetchPypi { + inherit version; + pname = "future_fstrings"; + sha256 = "891c5d5f073b3e3ff686bebde0a4c45c479065f45c8cbd6de19323d5a50738a8"; + }; + + # No tests included in Pypi archive + doCheck = false; + + meta = with lib; { + homepage = https://github.com/asottile/future-fstrings; + description = "A backport of fstrings to python<3.6"; + license = licenses.mit; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix new file mode 100644 index 000000000000..7091799decab --- /dev/null +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: + +buildPythonPackage rec { + pname = "fuzzywuzzy"; + version = "0.17.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f49de47db00e1c71d40ad16da42284ac357936fa9b66bea1df63fed07122d62"; + }; + + propagatedBuildInputs = [ python-Levenshtein ]; + checkInputs = [ pycodestyle hypothesis pytest ]; + + meta = with stdenv.lib; { + description = "Fuzzy string matching for Python"; + homepage = https://github.com/seatgeek/fuzzywuzzy; + license = licenses.gpl2; + maintainers = with maintainers; [ earvstedt ]; + }; +} diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 1a335ad6bb1c..89c7c6b8df80 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.7.7"; + version = "1.7.8"; #disabled = !isPy3k; # TODO: Python 2.7 was deprecated but weboob still depends on it. src = fetchPypi { inherit pname version; - sha256 = "1nlsp8cll6v9w4649j98xw545bfnqa2xs7m9faa9mxc0kp8ff1li"; + sha256 = "0n18frf0ghmwf5lxmkyski4b5h1rsx93ibq3iw0k3s2wxl371406"; }; # No tests included in archive @@ -20,5 +20,6 @@ buildPythonPackage rec { description = "The core Python library for accessing Google APIs"; homepage = https://github.com/google/google-api-python-client; license = licenses.asl20; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/tools/profiling/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix index 2f0b03ab7e37..ed48842496c0 100644 --- a/pkgs/development/tools/profiling/gprof2dot/default.nix +++ b/pkgs/development/python-modules/gprof2dot/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, buildPythonApplication }: -pythonPackages.buildPythonApplication { - name = "gprof2dot-2015-04-27"; +buildPythonApplication { + name = "gprof2dot-2017-09-19"; src = fetchFromGitHub { owner = "jrfonseca"; repo = "gprof2dot"; - rev = "6fbb81559609c12e7c64ae5dce7d102a414a7514"; - sha256 = "1fff7w6dm6lld11hp2ij97f85ma1154h62dvchq19c5jja3zjw3c"; + rev = "2017.09.19"; + sha256 = "1b5wvjv5ykbhz7aix7l3y7mg1hxi0vgak4a49gr92sdlz8blj51v"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/jrfonseca/gprof2dot; description = "Python script to convert the output from many profilers into a dot graph"; license = licenses.lgpl3Plus; platforms = platforms.linux; + maintainers = [ maintainers.pmiddend ]; }; } diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix new file mode 100644 index 000000000000..79413b26544f --- /dev/null +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyparsing +, future +, pytest +, pytestrunner +}: + +buildPythonPackage rec { + pname = "grandalf"; + version = "0.6"; + + # fetch from github to acquire tests + src = fetchFromGitHub { + owner = "bdcht"; + repo = "grandalf"; + rev = "v${version}"; + sha256 = "1f1l288sqna0bca7dwwvyw7wzg9b2613g6vc0g0vfngm7k75b2jg"; + }; + + propagatedBuildInputs = [ + pyparsing + future + ]; + + checkInputs = [ pytest pytestrunner ]; + + patches = [ ./no-setup-requires-pytestrunner.patch ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "A python package made for experimentations with graphs and drawing algorithms"; + homepage = https://github.com/bdcht/grandalf; + license = licenses.gpl2; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/grandalf/no-setup-requires-pytestrunner.patch b/pkgs/development/python-modules/grandalf/no-setup-requires-pytestrunner.patch new file mode 100644 index 000000000000..80e12e246ebb --- /dev/null +++ b/pkgs/development/python-modules/grandalf/no-setup-requires-pytestrunner.patch @@ -0,0 +1,15 @@ +diff --git a/setup.py b/setup.py +index 0470622..d574ceb 100755 +--- a/setup.py ++++ b/setup.py +@@ -75,8 +75,8 @@ setup( + # your project is installed. For an analysis of "install_requires" vs pip's + # requirements files see: + # https://packaging.python.org/en/latest/requirements.html +- setup_requires=['pytest-runner',], +- tests_require=['pytest',], ++ setup_requires=[], ++ tests_require=['pytest','pytest-runner',], + + install_requires=['pyparsing','future'], + diff --git a/pkgs/development/python-modules/httpsig/default.nix b/pkgs/development/python-modules/httpsig/default.nix index cff72de36077..24ba9be13822 100644 --- a/pkgs/development/python-modules/httpsig/default.nix +++ b/pkgs/development/python-modules/httpsig/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "httpsig"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "19ng7y7blp13z081z5a6dxng1p8xlih7g6frmsg3q5ri8lvpybc7"; + sha256 = "1rkc3zwsq53rjsmc47335m4viljiwdbmw3y2zry4z70j8q1dbmki"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index 64fc707b8fd8..5662f8896cc3 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "immutables"; - version = "0.6"; + version = "0.9"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "63023fa0cceedc62e0d1535cd4ca7a1f6df3120a6d8e5c34e89037402a6fd809"; + sha256 = "1h7i00x6sdbw62rdipp0kaw1mcrvfipxv0054x1n2r4q4j11q7fp"; }; meta = { diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index c18b6c5cac47..5daa3c214964 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -1,17 +1,20 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k , pytest , unicodecsv }: buildPythonPackage rec { pname = "jellyfish"; - version = "0.6.1"; + version = "0.7.1"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5104e45a2b804b48a46a92a5e6d6e86830fe60ae83b1da32c867402c8f4c2094"; + sha256 = "1hd1xzw22g1cp2dpf5bbpg8a7iac2v9hw0xrj5n5j83inh5n99br"; }; checkInputs = [ pytest unicodecsv ]; diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 89f2c1ecacaf..455f90a01644 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -15,11 +15,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml ]; + # No tests in archive + doCheck = false; + meta = with stdenv.lib; { description = "Configuration manager for python applications"; - homepage = https://emre.github.io/kaptan/; + homepage = https://kaptan.readthedocs.io/; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 3b639ee2afb9..785d9f1aa3ae 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "latexcodec"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "0zdd1gf24i83ykadx0y30n3001j43scqr2saql3vckk5c39dj1wn"; + sha256 = "0s4wdbg0w2l8pj3i0y4510i0s04p8nhxcsa2z41bjsv0k66npb81"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 417baed95603..43b75b30f5a4 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { description = "Scripting library for tmux"; homepage = https://libtmux.readthedocs.io/; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; } - diff --git a/pkgs/development/python-modules/limitlessled/default.nix b/pkgs/development/python-modules/limitlessled/default.nix new file mode 100644 index 000000000000..c2029aa6d6bd --- /dev/null +++ b/pkgs/development/python-modules/limitlessled/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "limitlessled"; + version = "1.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pd71wxqjvznx10brsj1sgy3420bz7awbzk9jlj422rrdxql754j"; + }; + + meta = with lib; { + description = "Control LimitlessLED products"; + homepage = https://github.com/happyleavesaoc/python-limitlessled/; + license = licenses.mit; + maintainers = with maintainers; [ sephalon ]; + }; +} diff --git a/pkgs/development/python-modules/mautrix-appservice/default.nix b/pkgs/development/python-modules/mautrix-appservice/default.nix new file mode 100644 index 000000000000..1420f1880a31 --- /dev/null +++ b/pkgs/development/python-modules/mautrix-appservice/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, aiohttp, future-fstrings, pythonOlder }: + +buildPythonPackage rec { + pname = "mautrix-appservice"; + version = "0.3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1615220f5bb75e2093ad1e30f4c2e1243499b0b20caef014fd73faadd3bfea6c"; + }; + + propagatedBuildInputs = [ + aiohttp + future-fstrings + ]; + + # No tests available + doCheck = false; + + disabled = pythonOlder "3.5"; + + meta = with lib; { + homepage = https://github.com/tulir/mautrix-appservice-python; + description = "A Python 3 asyncio-based Matrix application service framework"; + license = licenses.mit; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 63a255c941c8..fa6ea72129f3 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.3.7"; + version = "0.4.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1licf3wiy21pncg8hkx58r7xj4ylrqa8jcfh9n4rh23rmykf2rpf"; + sha256 = "15g58z3hy1pgi5sygpif28jyqj79iz4vw2mh5nxdydl4w20micvf"; }; propagatedBuildInputs = [ html5lib ]; diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix index b7fed9e6ad98..a7b3984b912e 100644 --- a/pkgs/development/python-modules/mozsvc/default.nix +++ b/pkgs/development/python-modules/mozsvc/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage -, fetchgit -, fetchurl +, fetchFromGitHub , pyramid , simplejson , konfig @@ -9,26 +8,22 @@ buildPythonPackage rec { pname = "mozsvc"; - version = "0.8"; + version = "0.10"; - src = fetchgit { - url = https://github.com/mozilla-services/mozservices.git; - rev = "refs/tags/${version}"; - sha256 = "1zci2ikk83mf7va88c83dr6snfh4ddjqw0lsg3y29qk5nxf80vx2"; + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = "mozservices"; + rev = version; + sha256 = "0a0558g8j55pd1nnhnnf3k377jv6cah8lxb24v98rq8kxr5960cg"; }; - patches = stdenv.lib.singleton (fetchurl { - url = https://github.com/nbp/mozservices/commit/f86c0b0b870cd8f80ce90accde9e16ecb2e88863.diff; - sha256 = "1lnghx821f6dqp3pa382ka07cncdz7hq0mkrh44d0q3grvrlrp9n"; - }); - - doCheck = false; # lazy packager + doCheck = false; # too many dependencies and conflicting versions; I (nadrieril) gave up propagatedBuildInputs = [ pyramid simplejson konfig ]; meta = with stdenv.lib; { homepage = https://github.com/mozilla-services/mozservices; description = "Various utilities for Mozilla apps"; license = licenses.mpl20; + maintainers = with maintainers; [ nadrieril ]; }; - } diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 6dbfa1fae603..388e0148d0a0 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six +{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six , fetchPypi }: @@ -18,7 +18,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" nosetests ''; - propagatedBuildInputs = [ argparse jinja2 six ]; + propagatedBuildInputs = [ jinja2 six ]; meta = with stdenv.lib; { homepage = https://github.com/domenkozar/mr.bob; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 579fc4631f66..2c0a83c62e3e 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.13"; + version = "8.0.14"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1qb6m3cp6zxmr49bp6g5g5b75yszgac1h26i2hza61mrvd235688"; + sha256 = "1cf0ic2mx339j62579xjlaw5q5sz61dac379c7lsy3ln3krsw3y9"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix new file mode 100644 index 000000000000..b6e323ff9c69 --- /dev/null +++ b/pkgs/development/python-modules/nanomsg-python/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }: + +buildPythonPackage rec { + pname = "nanomsg-python"; + version = "1.0.20190114"; + + src = fetchFromGitHub { + owner = "tonysimpson"; + repo = "nanomsg-python"; + rev = "3acd9160f90f91034d4a43ce603aaa19fbaf1f2e"; + sha256 = "1qgybcpmm9xxrn39alcgdcpvwphgm1glkbnwx0ljpz4nd1jsnyrl"; + }; + + buildInputs = [ nanomsg ]; + + # Tests requires network connections + doCheck = false; + + meta = with stdenv.lib; { + description = "Bindings for nanomsg"; + homepage = https://github.com/tonysimpson/nanomsg-python; + license = licenses.mit; + maintainers = with maintainers; [ bgamari ]; + }; +} diff --git a/pkgs/development/python-modules/nanotime/default.nix b/pkgs/development/python-modules/nanotime/default.nix new file mode 100644 index 000000000000..8dd520a04e9a --- /dev/null +++ b/pkgs/development/python-modules/nanotime/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "nanotime"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "c7cc231fc5f6db401b448d7ab51c96d0a4733f4b69fabe569a576f89ffdf966b"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + # tests currently fail + doCheck = false; + + meta = with lib; { + description = "Provides a time object that keeps time as the number of nanoseconds since the UNIX epoch"; + homepage = https://github.com/jbenet/nanotime/tree/master/python; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 888e1de6aa57..5da8257ac81e 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,7 +2,7 @@ let pname = "nbxmpp"; - version = "0.6.8"; + version = "0.6.9"; name = "${pname}-${version}"; in buildPythonPackage rec { inherit pname version; @@ -11,7 +11,7 @@ in buildPythonPackage rec { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "09zrqz01j45kvayfscd66avkrnn237lbjg9li5hjhyw92h6hkkc4"; + sha256 = "14xrq0r5k1dk7rwj4cxyxfapi6gbnqg70mz94g6hn9ij06284mi7"; }; propagatedBuildInputs = [ pyopenssl ]; diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix index a8962bcecc22..6d9d98f27abd 100644 --- a/pkgs/development/python-modules/nose_progressive/default.nix +++ b/pkgs/development/python-modules/nose_progressive/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3a6e2833e613c1c239baf05a19f66b5920915e62c07251d3ab3f3acb017ef5d7"; + sha256 = "1mzmgq0wnfizmg9m2wn0c9g9282rdgv1jnphp8ww5h8kwqrjhvis"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 1b14657d5061..7d7f7da753e1 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.0.6"; + version = "0.6.1"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "1i5p4ia4qcqmfb9k90g3ssbr090q555fdpc32sl4x6rgqfw5ddj4"; + sha256 = "0ncclbj9qdd88fs26mvgf217m7kgfcy1zgsyzi1j65b6z2wywl9a"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index c183442e0e9e..41aa7f7a0c8a 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -7,7 +7,6 @@ , isPy3k , numpy , llvmlite -, argparse , funcsigs , singledispatch , libcxx @@ -24,7 +23,7 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - propagatedBuildInputs = [numpy llvmlite argparse] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; + propagatedBuildInputs = [numpy llvmlite] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; # Copy test script into $out and run the test suite. checkPhase = '' diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 2f435201d21d..8abd3f22ea3d 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchgit , pyptlib -, argparse , twisted , pycrypto , pyyaml @@ -23,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "argparse" "" ''; - propagatedBuildInputs = [ pyptlib argparse twisted pycrypto pyyaml ]; + propagatedBuildInputs = [ pyptlib twisted pycrypto pyyaml ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 024c3b4c8ee7..22b9360a56a0 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b2e7fd694d3cffcee79317bad492d60c0aa887aea6916517c051c3247b33b5a5"; + sha256 = "19dm6dxj9hsiq0bnb4d6ms3sh2hcss9d9fhpjgkwxzrw9mlzvrxj"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix deleted file mode 100644 index c481aa0dfea7..000000000000 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, stdenv -, pytest -, glibcLocales -, cython -, dateutil -, scipy -, numexpr -, pytz -, xlrd -, bottleneck -, sqlalchemy -, lxml -, html5lib -, beautifulsoup4 -, openpyxl -, tables -, xlwt -, libcxx ? null -}: - -let - inherit (stdenv.lib) optional optionalString; - inherit (stdenv) isDarwin; -in buildPythonPackage rec { - pname = "pandas"; - version = "0.17.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx; - propagatedBuildInputs = [ - cython - dateutil - scipy - numexpr - pytz - xlrd - bottleneck - sqlalchemy - lxml - html5lib - beautifulsoup4 - openpyxl - tables - xlwt - ]; - - doCheck = false; - - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - postPatch = optionalString isDarwin '' - cpp_sdk="${libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - ''; - - meta = { - # https://github.com/pandas-dev/pandas/issues/14866 - # pandas devs are no longer testing i686 so safer to assume it's broken - broken = stdenv.isi686; - homepage = http://pandas.pydata.org/; - description = "Python Data Analysis Library"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ shlevy ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index 3507729ee94e..ac85b4be1200 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -6,7 +6,6 @@ , paste , PasteDeploy , cheetah -, argparse }: buildPythonPackage rec { @@ -19,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ six paste PasteDeploy cheetah argparse ]; + propagatedBuildInputs = [ six paste PasteDeploy cheetah ]; doCheck = false; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index abaed3cbffe4..461cd480c9f0 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.8.1"; + version = "3.8.2"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "0z6fdihmvqfg0ysa94g4w2w7146fsi2gnrgh90b4i1s3wj8iaxqy"; + sha256 = "0h6wr7yq4cpnh2ypm83asvs2y54346f5j9xbg4lwb0w3rgr9zndq"; }; diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index 4cd86b56c202..ec00a2e400ae 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pika"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "306145b8683e016d81aea996bcaefee648483fc5a9eb4694bb488f54df54a751"; + sha256 = "1104b0jm7qs9b211hw6siddflvf56ag4lfsjy6yfbczds4lxhf2k"; }; # Tests require twisted which is only availalble for python-2.x diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix new file mode 100644 index 000000000000..4c50aaee706a --- /dev/null +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "precis-i18n"; + version = "1.0.0"; + + disabled = !isPy3k; + + src = fetchPypi { + pname = "precis_i18n"; + inherit version; + sha256 = "0gjhvwd8aifx94rl1ag08vlmndyx2q3fkyqb0c4i46x3p2bc2yi2"; + }; + + meta = { + homepage = https://github.com/byllyfish/precis_i18n; + description = "Internationalized usernames and passwords"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 18fb14c3aa9a..362e73c0d71e 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -1,39 +1,38 @@ { stdenv , python , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pytest , python-utils , sphinx -, coverage -, execnet , flake8 , pytestpep8 , pytestflakes , pytestcov , pytestcache -, pep8 , pytestrunner +, freezegun }: buildPythonPackage rec { pname = "progressbar2"; - version = "3.12.0"; + version = "3.39.2"; - # Use source from GitHub, PyPI is missing tests - # https://github.com/WoLpH/python-progressbar/issues/151 - src = fetchFromGitHub { - owner = "WoLpH"; - repo = "python-progressbar"; - rev = "v${version}"; - sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f"; + src = fetchPypi { + inherit pname version; + sha256 = "6eb5135b987caca4212d2c7abc2923d4ad5ba18bb34ccbe7044b3628f52efc2c"; }; + postPatch = '' + rm -r tests/__pycache__ + rm tests/*.pyc + ''; + propagatedBuildInputs = [ python-utils ]; nativeBuildInputs = [ pytestrunner ]; checkInputs = [ - pytest sphinx coverage execnet flake8 pytestpep8 pytestflakes pytestcov - pytestcache pep8 + pytest sphinx flake8 pytestpep8 pytestflakes pytestcov + pytestcache freezegun ]; # ignore tests on the nix wrapped setup.py and don't flake .eggs directory checkPhase = '' diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index d588ebb12e47..899b18eecbed 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; @@ -13,10 +13,16 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ pandas pytest ]; + checkInputs = [ hypothesis pandas pytest ]; PYARROW_BUILD_TYPE = "release"; - PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"; + PYARROW_CMAKE_OPTIONS = [ + "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" + + # This doesn't use setup hook to call cmake so we need to workaround #54606 + # ourselves + "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" + ]; preCheck = '' rm pyarrow/tests/test_jvm.py diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 2494407766c7..bda05a58e150 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -1,19 +1,20 @@ -{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf, casttube }: +{ lib, fetchPypi, buildPythonPackage, requests, zeroconf, protobuf, casttube, isPy3k }: buildPythonPackage rec { pname = "PyChromecast"; - version = "2.3.0"; - name = pname + "-" + version; + version = "2.4.0"; - src = fetchurl { - url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "f385168e34d2ef47f976c8e41bad2f58f5ca004634c0ccb1a12623d8beb2fa38"; + src = fetchPypi { + inherit pname version; + sha256 = "0q012ghssk2xhm17v28sc2lv62vk7wd5p7zzdbgxk6kywfx8yvm2"; }; - propagatedBuildInputs = [ requests six zeroconf protobuf casttube ]; + disabled = !isPy3k; + + propagatedBuildInputs = [ requests zeroconf protobuf casttube ]; meta = with lib; { - description = "Library for Python 2 and 3 to communicate with the Google Chromecast"; + description = "Library for Python 3.4+ to communicate with the Google Chromecast"; homepage = https://github.com/balloob/pychromecast; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index cbadd5188977..669d798312b4 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pydub"; - version = "0.23.0"; + version = "0.23.1"; # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; repo = pname; rev = "v${version}"; - sha256 = "1ijp9hlxi2d0f1ah9yj9j8cz18i9ny9jwrf2irvz58bgyv29m8bn"; + sha256 = "1v0bghy4j2nnkgf1r8rbz4s7war872asyy08pc0x1iy1qs275i7s"; }; diff --git a/pkgs/development/python-modules/pygame/git.nix b/pkgs/development/python-modules/pygame/git.nix deleted file mode 100644 index 1d8ba697f38b..000000000000 --- a/pkgs/development/python-modules/pygame/git.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, lib, fetchFromBitbucket, buildPythonPackage, python, smpeg, libX11 -, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi -}: - -buildPythonPackage rec { - pname = "pygame"; - version = "2016-05-17"; - name = pname + "-" + version; - - src = fetchFromBitbucket { - owner = "pygame"; - repo = "pygame"; - rev = "575c7a74d85a37db7c645421c02cf0b6b78a889f"; - sha256 = "1i5xqmw93kfidcji2wacgkm5y4mcnbksy8iimih0729k19rbhznc"; - }; - - buildInputs = [ - SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg - smpeg portmidi libX11 - ]; - - # Tests fail because of no audio device and display. - doCheck = false; - - preConfigure = '' - sed \ - -e "s/^origincdirs = .*/origincdirs = []/" \ - -e "s/^origlibdirs = .*/origlibdirs = []/" \ - -i config_unix.py - ${lib.concatMapStrings (dep: '' - sed \ - -e "/^origincdirs =/aorigincdirs += ['${lib.getDev dep}/include']" \ - -e "/^origlibdirs =/aoriglibdirs += ['${lib.getLib dep}/lib']" \ - -i config_unix.py - '') buildInputs - } - LOCALBASE=/ ${python.interpreter} config.py - ''; - - meta = with stdenv.lib; { - description = "Python library for games"; - homepage = http://www.pygame.org/; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 56e8f1fa5eb6..4826db3a8c02 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { # Fix warning spam ./pygobject-2.28.6-set_qdata.patch ./pygobject-2.28.6-gio-types-2.32.patch + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ./pygobject-2.0-fix-darwin.patch ]; configureFlags = [ "--disable-introspection" ]; diff --git a/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch b/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch new file mode 100644 index 000000000000..7fef05262f4d --- /dev/null +++ b/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch @@ -0,0 +1,88 @@ +--- a/gio/unix-types.defs ++++ b/gio/unix-types.defs +@@ -7,18 +7,6 @@ + (gtype-id "G_TYPE_UNIX_CONNECTION") + ) + +-(define-object DesktopAppInfo +- (docstring +- "DesktopAppInfo(desktop_id) -> gio.unix.DesktopAppInfo\n\n" +- "gio.Unix.DesktopAppInfo is an implementation of gio.AppInfo\n" +- "based on desktop files." +- ) +- (in-module "giounix") +- (parent "GObject") +- (c-name "GDesktopAppInfo") +- (gtype-id "G_TYPE_DESKTOP_APP_INFO") +-) +- + (define-object FDMessage + (in-module "giounix") + (parent "GSocketControlMessage") +--- a/gio/unix.defs ++++ b/gio/unix.defs +@@ -32,54 +32,6 @@ + + + +-;; From gdesktopappinfo.h +- +-(define-function desktop_app_info_get_type +- (c-name "g_desktop_app_info_get_type") +- (return-type "GType") +-) +- +-(define-function desktop_app_info_new_from_filename +- (c-name "g_desktop_app_info_new_from_filename") +- (return-type "GDesktopAppInfo*") +- (parameters +- '("const-char*" "filename") +- ) +-) +- +-(define-function g_desktop_app_info_new_from_keyfile +- (c-name "g_desktop_app_info_new_from_keyfile") +- (return-type "GDesktopAppInfo*") +- (parameters +- '("GKeyFile*" "key_file") +- ) +-) +- +-(define-function desktop_app_info_new +- (c-name "g_desktop_app_info_new") +- (is-constructor-of "GDesktopAppInfo") +- (return-type "GDesktopAppInfo*") +- (parameters +- '("const-char*" "desktop_id") +- ) +-) +- +-(define-method get_is_hidden +- (of-object "GDesktopAppInfo") +- (c-name "g_desktop_app_info_get_is_hidden") +- (return-type "gboolean") +-) +- +-(define-function desktop_app_info_set_desktop_env +- (c-name "g_desktop_app_info_set_desktop_env") +- (return-type "none") +- (parameters +- '("const-char*" "desktop_env") +- ) +-) +- +- +- + ;; From gunixfdmessage.h + + (define-function g_unix_fd_message_get_type +--- a/gio/unix.override ++++ b/gio/unix.override +@@ -24,7 +24,6 @@ + #define NO_IMPORT_PYGOBJECT + #include <pygobject.h> + #include <gio/gio.h> +-#include <gio/gdesktopappinfo.h> + #include <gio/gunixinputstream.h> + #include <gio/gunixmounts.h> + #include <gio/gunixoutputstream.h> diff --git a/pkgs/development/python-modules/pymongo/2_9_1.nix b/pkgs/development/python-modules/pymongo/2_9_1.nix deleted file mode 100644 index 8e0b0858754d..000000000000 --- a/pkgs/development/python-modules/pymongo/2_9_1.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "pymongo"; - version = "2.9.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "912516ac6a355d7624374a38337b8587afe3eb535c0a5456b3bd12df637a6e70"; - }; - - # Tests call a running mongodb instance - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://github.com/mongodb/mongo-python-driver; - license = licenses.asl20; - description = "Python driver for MongoDB "; - }; - -} diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 392a0ec580fe..792b8b1bd5b4 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pymongo"; version = "3.7.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "8c74e2a9b594f7962c62cef7680a4cb92a96b4e6e3c2f970790da67cc0213a7e"; }; + # Tests call a running mongodb instance doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/mongodb/mongo-python-driver; license = licenses.asl20; - description = "Python driver for MongoDB "; + description = "Python driver for MongoDB"; }; } diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 3138c114e697..05f2db8ac063 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.15.1"; + version = "0.15.2"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "v${version}"; - sha256 = "1vj367w6xbn9bpmksm162l1aipf7cj97h1q83y7jcpm33ihwpf7x"; + sha256 = "03aczbzx6gmvgy60fhswpwkry7a8zb5q1pbp55v5gx8hk15n40k1"; }; buildInputs = [ bzip2 curl cython lzma zlib ]; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 29dd344a34cb..0eca6c5ddf05 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,16 +2,19 @@ buildPythonPackage rec { pname = "pyspark"; - version = "2.3.2"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "7fb3b4fe47edb0fb78cecec37e0f2a728590f17ef6a49eae55141a7a374c07c8"; + sha256 = "1p7z5f1a20l7xkjkh88q9cvjw2x8jbrlydkycn5lh4qvx72vgmy9"; }; # pypandoc is broken with pandoc2, so we just lose docs. postPatch = '' sed -i "s/'pypandoc'//" setup.py + + # Current release works fine with py4j 0.10.8.1 + substituteInPlace setup.py --replace py4j==0.10.7 'py4j>=0.10.7,<0.11' ''; propagatedBuildInputs = [ py4j ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index dc928130cbb1..9412a750a9ab 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -2,59 +2,46 @@ , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2 }: +buildPythonPackage rec { + version = "3.9.3"; + pname = "pytest"; -let generic = { version, sha256 }: - buildPythonPackage rec { - pname = "pytest"; - inherit version; + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - src = fetchPypi { - inherit pname version sha256; - }; - - checkInputs = [ hypothesis mock ]; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] - ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] - ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; - - checkPhase = '' - runHook preCheck - $out/bin/py.test -x testing/ - runHook postCheck - ''; - - # Remove .pytest_cache when using py.test in a Nix build - setupHook = writeText "pytest-hook" '' - pytestcachePhase() { - find $out -name .pytest_cache -type d -exec rm -rf {} + - } - - preDistPhases+=" pytestcachePhase" - ''; - - meta = with stdenv.lib; { - homepage = https://docs.pytest.org; - description = "Framework for writing tests"; - maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; - license = licenses.mit; - platforms = platforms.unix; - }; - }; - -in { - pytest_39 = generic { - version = "3.9.3"; + src = fetchPypi { + inherit pname version; sha256 = "a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db"; }; - pytest_37 = generic { - version = "3.7.4"; - sha256 = "2d7c49e931316cc7d1638a3e5f54f5d7b4e5225972b3c9838f3584788d27f349"; + checkInputs = [ hypothesis mock ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] + ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] + ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + + checkPhase = '' + runHook preCheck + $out/bin/py.test -x testing/ + runHook postCheck + ''; + + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + + preDistPhases+=" pytestcachePhase" + ''; + + meta = with stdenv.lib; { + homepage = https://docs.pytest.org; + description = "Framework for writing tests"; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 86e58d489a61..1ecf5fe10618 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,17 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi, gnupg1 }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "python-gnupg"; - version = "0.4.3"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "2d158dfc6b54927752b945ebe57e6a0c45da27747fa3b9ae66eccc0d2147ac0d"; + sha256 = "45daf020b370bda13a1429c859fcdff0b766c0576844211446f9266cae97fb0e"; }; - propagatedBuildInputs = [ gnupg1 ]; - # Let's make the library default to our gpg binary patchPhase = '' substituteInPlace gnupg.py \ diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index b7744ce79c3b..7aa776540061 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,29 +1,23 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: buildPythonPackage rec { pname = "python-utils"; version = "2.3.0"; - name = pname + "-" + version; - src = fetchFromGitHub { - owner = "WoLpH"; - repo = "python-utils"; - rev = "v${version}"; - sha256 = "14gyphcqwa77wfbnrzj363v3fdkxy08378lgd7l3jqnpvr8pfp5c"; + src = fetchPypi { + inherit pname version; + sha256 = "34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3"; }; - checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; - postPatch = '' - # pytest-runner is only actually required in checkPhase - substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," "" + rm -r tests/__pycache__ + rm tests/*.pyc ''; - # Tests failing - doCheck = false; + checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; checkPhase = '' - py.test + py.test tests ''; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix new file mode 100644 index 000000000000..88982f15293b --- /dev/null +++ b/pkgs/development/python-modules/python-vagrant/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "0.5.15"; + pname = "python-vagrant"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ikrh6canhcxg5y7pzmkcnnydikppv7s6sm9prfx90nk0ac8m6mg"; + }; + + # The tests try to connect to qemu + doCheck = false; + + meta = { + description = "Python module that provides a thin wrapper around the vagrant command line executable"; + homepage = https://github.com/todddeluca/python-vagrant; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pmiddend ]; + }; +} diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix new file mode 100644 index 000000000000..16aa7b0ec31b --- /dev/null +++ b/pkgs/development/python-modules/pyu2f/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, buildPythonPackage, + six, mock, pyfakefs, unittest2, pytest +}: + +buildPythonPackage rec { + pname = "pyu2f"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = version; + sha256 = "0waxdydvxn05a8ab9j235mz72x7p4pwa59pnxyk1zzbwxnpxb3p9"; + }; + + # Platform detection for linux fails + postPatch = lib.optionalString stdenv.isLinux '' + rm pyu2f/tests/hid/macos_test.py + ''; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest six mock pyfakefs unittest2 ]; + + checkPhase = '' + pytest pyu2f/tests + ''; + + meta = with lib; { + description = "U2F host library for interacting with a U2F device over USB"; + homepage = https://github.com/google/pyu2f/; + license = licenses.asl20; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index 13ea7b75ae3f..b7c38c512652 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -5,7 +5,6 @@ , setuptoolsTrial , simplejson , zbase32 -, argparse , twisted , isPyPy }: @@ -20,7 +19,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []); - propagatedBuildInputs = [ argparse twisted ]; + propagatedBuildInputs = [ twisted ]; # Tests fail because they try to write new code into the twisted # package, apparently some kind of plugin. diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index 00691e65225c..7f908c943aef 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages, imagemagick, feh }: +{ lib, buildPythonPackage, fetchPypi, imagemagick, feh, isPy3k }: -python3Packages.buildPythonApplication rec { +buildPythonPackage rec { pname = "pywal"; version = "3.2.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic"; }; @@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec { ./feh.patch ]; + # Invalid syntax + disabled = !isPy3k; + postPatch = '' substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert" substituteInPlace pywal/wallpaper.py --subst-var-by feh "${feh}/bin/feh" diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix new file mode 100644 index 000000000000..788b2e9e9ae4 --- /dev/null +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, qscintillaCpp +, lndir +, sip +, python +, pyqt5 }: + +buildPythonPackage rec { + pname = "qscintilla"; + version = qscintillaCpp.version; + src = qscintillaCpp.src; + format = "other"; + + nativeBuildInputs = [ lndir sip ]; + buildInputs = [ qscintillaCpp ]; + propagatedBuildInputs = [ pyqt5 ]; + + preConfigure = '' + mkdir -p $out + lndir ${pyqt5} $out + rm -rf "$out/nix-support" + cd Python + ${python.executable} ./configure.py \ + --pyqt=PyQt5 \ + --destdir=$out/lib/${python.sitePackages}/PyQt5 \ + --stubsdir=$out/lib/${python.sitePackages}/PyQt5 \ + --apidir=$out/api/${python.libPrefix} \ + --qsci-incdir=${qscintillaCpp}/include \ + --qsci-libdir=${qscintillaCpp}/lib \ + --pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \ + --qsci-sipdir=$out/share/sip/PyQt5 + ''; + + meta = with lib; { + description = "A Python binding to QScintilla, Qt based text editing control"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ lsix ]; + homepage = https://www.riverbankcomputing.com/software/qscintilla/; + }; +} diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index 2102cf064250..a4d1dcc485ec 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pillow, argparse, pyres, nose +{ stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose , preggy, numpy, yanc, nose-focus, mock, opencv }: buildPythonPackage rec { pname = "remotecv"; version = "2.2.2"; - propagatedBuildInputs = [ pillow argparse pyres ]; + propagatedBuildInputs = [ pillow pyres ]; checkInputs = [ nose preggy numpy yanc nose-focus mock opencv ]; diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index d9b55c852192..c8c4315b66bb 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rlp"; - version = "1.0.3"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b0ad3f3173dedf416565299f684717d4ae7620207d562d3ef94b818a40a48781"; + sha256 = "0742hdnhwcx1bm7pdk83290rxfcb0i2xskgl8yn6lg8fql1hms7b"; }; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index f29cafb7aeed..58a767432a22 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pyparsing, argparse, robotframework, allpairspy }: +{ stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: buildPythonPackage rec { pname = "RoboMachine"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45"; }; - propagatedBuildInputs = [ pyparsing argparse robotframework allpairspy ]; + propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; # Remove Windows .bat files postInstall = '' diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 0e4b6cfa1e47..7342a729e292 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -1,5 +1,6 @@ -{ buildPythonPackage -, fetchgit +{ stdenv +, buildPythonPackage +, fetchFromGitHub , isPy27 , testfixtures , unittest2 @@ -20,13 +21,14 @@ buildPythonPackage rec { pname = "serversyncstorage"; - version = "1.6.11"; + version = "1.6.14"; disabled = !isPy27; - src = fetchgit { - url = https://github.com/mozilla-services/server-syncstorage.git; - rev = "refs/tags/${version}"; - sha256 = "197gj2jfs2c6nzs20j37kqxwi91wabavxnfm4rqmrjwhgqjwhnm0"; + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = "server-syncstorage"; + rev = version; + sha256 = "08xclxj38rav8yay9cijiavv35jbyf6a9jzr24vgcna8pjjnbbmh"; }; checkInputs = [ testfixtures unittest2 webtest ]; @@ -35,7 +37,10 @@ buildPythonPackage rec { pymysqlsa umemcache WSGIProxy requests pybrowserid ]; - meta = { - broken = true; # 2018-11-04 + meta = with stdenv.lib; { + description = "The SyncServer server software, as used by Firefox Sync"; + homepage = https://github.com/mozilla-services/server-syncstorage; + license = licenses.mpl20; + maintainers = with maintainers; [ nadrieril ]; }; } diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix new file mode 100644 index 000000000000..f5de476d1096 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-argparse"; + version = "0.2.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "05wc8f5hb3jsg2vh2jf7jsyan8d4i09ifrz2c8fp6f7x1zw9iav0"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = "py.test"; + + propagatedBuildInputs = [ + sphinx + ]; + + meta = { + description = "A sphinx extension that automatically documents argparse commands and options"; + homepage = https://github.com/ribozz/sphinx-argparse; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ clacke ]; + }; +} diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 8027688c9ea5..4e607799d229 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pbr, six, argparse }: +{ stdenv, buildPythonPackage, fetchPypi, pbr, six }: buildPythonPackage rec { pname = "stevedore"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ pbr six argparse ]; + propagatedBuildInputs = [ pbr six ]; meta = with stdenv.lib; { description = "Manage dynamic plugins for Python applications"; diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix deleted file mode 100644 index 7a93d64a89f5..000000000000 --- a/pkgs/development/python-modules/syncserver/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ buildPythonPackage -, fetchgit -, isPy27 -, unittest2 -, cornice -, gunicorn -, pyramid -, requests -, simplejson -, sqlalchemy -, mozsvc -, tokenserver -, serversyncstorage -, configparser -}: - -buildPythonPackage rec { - pname = "syncserver"; - version = "1.6.0"; - disabled = ! isPy27; - - src = fetchgit { - url = https://github.com/mozilla-services/syncserver.git; - rev = "refs/tags/${version}"; - sha256 = "1fsiwihgq3z5b5kmssxxil5g2abfvsf6wfikzyvi4sy8hnym77mb"; - }; - - buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ - cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver - serversyncstorage configparser - ]; -} diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix new file mode 100644 index 000000000000..a2f8fbb2f536 --- /dev/null +++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "tableaudocumentapi"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "fc6d44b62cf6ea29916c073686e2f9f35c9902eccd57b8493f8d44a59a2f60d9"; + }; + + # tests not inclued with release + doCheck = false; + + meta = with lib; { + description = "A Python module for working with Tableau files"; + homepage = https://github.com/tableau/document-api-python; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix new file mode 100644 index 000000000000..c6d3a21b10ba --- /dev/null +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, sqlalchemy, telethon }: + +buildPythonPackage rec { + pname = "telethon-session-sqlalchemy"; + version = "0.2.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85"; + }; + + propagatedBuildInputs = [ + sqlalchemy + ]; + + # No tests available + doCheck = false; + + meta = with lib; { + homepage = https://github.com/tulir/telethon-session-sqlalchemy; + description = "SQLAlchemy backend for Telethon session storage"; + license = licenses.mit; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix new file mode 100644 index 000000000000..d847a4942018 --- /dev/null +++ b/pkgs/development/python-modules/telethon/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, async_generator, rsa, pyaes, pythonOlder }: + +buildPythonPackage rec { + pname = "telethon"; + version = "1.5.4"; + + src = fetchPypi { + inherit version; + pname = "Telethon"; + sha256 = "52cb4929bf37c98ab5f3e173325dbb3cb9c1ca3f4fe6ba87d35c43e2f98858ce"; + }; + + propagatedBuildInputs = [ + async_generator + rsa + pyaes + ]; + + # No tests available + doCheck = false; + + disabled = pythonOlder "3.5"; + + meta = with lib; { + homepage = https://github.com/LonamiWebs/Telethon; + description = "Full-featured Telegram client library for Python 3"; + license = licenses.mit; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index fdfa91d292f2..4272df1ce398 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -52,6 +52,11 @@ buildPythonPackage rec { unidecode ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'ftfy>=4.2.0,<5.0.0'," "'ftfy>=5.0.0'," + ''; + doCheck = false; # tests want to download data files meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index 6747ae78f49c..d2821310068f 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0mzv6zs8ciwnf83fwikqmmjwbzqmdja3imn4b4k209f80g0rk8qv"; + sha256 = "1z3xbijvhh86adg0jk5iv1jvga7cg25q1w12icb3snr5jim9sjv2"; }; meta = { diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix index a07da568dca4..08f3f87321fe 100644 --- a/pkgs/development/python-modules/tokenserver/default.nix +++ b/pkgs/development/python-modules/tokenserver/default.nix @@ -31,5 +31,6 @@ buildPythonPackage rec { description = "The Mozilla Token Server"; homepage = https://github.com/mozilla-services/tokenserver; license = licenses.mpl20; + maintainers = with maintainers; [ nadrieril ]; }; } diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 878de1875190..7808eb359326 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,27 +1,48 @@ -{ lib, fetchPypi, buildPythonPackage, - protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp, isPy3k +{ lib, fetchPypi, buildPythonPackage, isPy3k, python, pytest +, typing-extensions +, protobuf +, hidapi +, ecdsa +, mnemonic +, requests +, pyblake2 +, click +, construct +, libusb1 +, rlp }: buildPythonPackage rec { pname = "trezor"; - version = "0.10.2"; + version = "0.11.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4dba4d5c53d3ca22884d79fb4aa68905fb8353a5da5f96c734645d8cf537138d"; + sha256 = "6043f321d856e1b45b9df0c37810264f08d065bb56cd999f61a05fe2906e9e18"; }; - propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 rlp ]; + propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp ]; - # There are no actual tests: "ImportError: No module named tests" - doCheck = false; + # build requires UTF-8 locale + LANG = "en_US.UTF-8"; + + checkInputs = [ + pytest + ]; + + # disable test_tx_api.py as it requires being online + checkPhase = '' + runHook preCheck + ${python.interpreter} -m pytest --pyarg trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py + runHook postCheck + ''; meta = { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = https://github.com/trezor/python-trezor; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ np ]; + maintainers = with lib.maintainers; [ np prusnak ]; }; } diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index a616df651228..ba37373e8ea9 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.23.0"; + version = "6.23.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "07fb8sklj8527aa8hi71w4iibgmcnndmnqjdcp82ff80ladn9i5y"; + sha256 = "0f6r2qcgcg4pnnsgf9d1k03ri7h7k8kpasp9mdgv421a4rvqh8lm"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index 0a49c2566409..cdb60946079d 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -7,7 +7,6 @@ , pyplatec , protobuf , purepng -, argparse , h5py , gdal }: @@ -35,7 +34,7 @@ buildPythonPackage rec { ''; buildInputs = [ nose ]; - propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng argparse h5py gdal ]; + propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng h5py gdal ]; prePatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix new file mode 100644 index 000000000000..d7f212f22844 --- /dev/null +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k +, pytest, requests }: + +buildPythonPackage rec { + pname = "zm-py"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hq83svprd21r74palhs3xq15g34135349y4lrgr7c76i3f37j2q"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + PYTHONPATH="./zoneminder:$PYTHONPATH" pytest + ''; + + meta = with lib; { + description = "A loose python wrapper around the ZoneMinder REST API"; + homepage = https://github.com/rohankapoorcom/zm-py; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index cde0b90d6fe9..8bc22d9c9a7f 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -22,8 +22,9 @@ , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem -, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file -, libselinux ? null, libsepol ? null, libvirt +, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx +, file, libvirt, glib, vips +, libselinux ? null, libsepol ? null }@args: let @@ -301,6 +302,11 @@ in buildInputs = [ rainbow_rake ]; }; + rbczmq = { ... }: { + buildInputs = [ zeromq czmq ]; + buildFlags = [ "--with-system-libs" ]; + }; + rbnacl = spec: if lib.versionOlder spec.version "6.0.0" then { postInstall = '' @@ -340,6 +346,22 @@ in "--with-ldflags=-L${ncurses.out}/lib" ]; }; + + ruby-vips = attrs: { + postInstall = '' + cd "$(cat $out/nix-support/gem-meta/install-path)" + + substituteInPlace lib/vips.rb \ + --replace "glib-2.0" "${glib.out}/lib/libglib-2.0${stdenv.hostPlatform.extensions.sharedLibrary}" + + substituteInPlace lib/vips.rb \ + --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}" + + substituteInPlace lib/vips.rb \ + --replace "vips_libname = 'vips'" "vips_libname = '${vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + }; + rugged = attrs: { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake openssl libssh2 zlib ]; @@ -358,6 +380,10 @@ in ''; } else {}; + semian = attrs: { + buildInputs = [ openssl ]; + }; + sequel_pg = attrs: { buildInputs = [ postgresql ]; }; @@ -415,10 +441,16 @@ in tzinfo = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { dontBuild = false; - postPatch = '' - substituteInPlace lib/tzinfo/zoneinfo_data_source.rb \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - ''; + postPatch = + let + path = if lib.versionAtLeast attrs.version "2.0" + then "lib/tzinfo/data_sources/zoneinfo_data_source.rb" + else "lib/tzinfo/zoneinfo_data_source.rb"; + in + '' + substituteInPlace ${path} \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; }; uuid4r = attrs: { diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 7804897bb819..9ae81e073df3 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.6.2"; + version = "1.6.3"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0am21zrnl48d397ll4pfsrgk079jb7x8z9kpfm6fz9hznrbl12hl"; + sha256 = "0wdicgf41ysxcdly4hzpav52yhjx410c7c7nfbq87p0cqzywrbxd"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0827807afef3..b011cb0b918a 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }: stdenv.mkDerivation rec { - version = "0.90.0"; + version = "0.91.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "12y34l4nhcmdcv91gzdrxw0cvd8w0cg69c5km1nkydgayk82a3x2"; + sha256 = "14snr65pbnczkv49lmhgyjzlgrrlfwsxkd7g6xbv9y5xl4sp0309"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index eac1bc7b51ed..a72ef7937c50 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -101,17 +101,17 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "20315"; - gittap = "3.1.3"; - gittip = "57dd0b4e7ec70cc95f859651b1b63b076b8df7a7"; - rev = "3.1.3"; - version = "3.1.3"; - sha256 = "17bd7i9lbr0nxa3llw354mppx44xi7bjwif7g7wxw0zcjlfxnk5d"; - cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a"; - cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y"; + version_commit = "20591"; + gittap = "3.2.1"; + gittip = "25913f4745cb3b635d52f1aafc4d8ff2aad3988a"; + rev = "3.2.1"; + version = "3.2.1"; + sha256 = "1c4zj96386sc9lvfcsdh9lhyh0rvv4zzfr6218gvjkg9fy6cc91y"; + cs_tip = "0ff8220adef16a942697afd245afc5ab0f70cbf8"; + cs_sha256 = "1ak8ysgivq28d23r77881p0z5v65jhpap5plm10p9j3y2x00n3zn"; }; r2-for-cutter = generic { - version_commit = "20315"; + version_commit = "20591"; gittap = "2.9.0-310-gcb62c376b"; gittip = "cb62c376bef6c7427019a7c28910c33c364436dd"; rev = "cb62c376bef6c7427019a7c28910c33c364436dd"; diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix index 5433725b3050..12eee5f80862 100644 --- a/pkgs/development/tools/ansible-lint/default.nix +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { pname = "ansible-lint"; - version = "3.4.23"; + version = "3.5.1"; src = fetchFromGitHub { owner = "willthames"; repo = "ansible-lint"; rev = "v${version}"; - sha256 = "0cnfgxh5m7alzm811hc95jigbca5vc1pf8fjazmsakmhdjyfbpb7"; + sha256 = "09qixiaqhm6dbl74s1rwxbsg31nr6jjsvr4fxfnxl9ccbxcrpzn2"; }; propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ]; diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix index eb805dcce7a9..68f00be342c3 100644 --- a/pkgs/development/tools/build-managers/alibuild/default.nix +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -9,12 +9,9 @@ python.pkgs.buildPythonApplication rec { sha256 = "1mnh0h9m96p78b9ln1gbl4lw1mgl16qbyfi9fj2l13p3nxaq1sib"; }; - argparse = null; - doCheck = false; propagatedBuildInputs = [ python.pkgs.requests - python.pkgs.argparse python.pkgs.pyyaml ]; diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index c20431c5e7e0..624821613465 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, lua5, python }: +{ stdenv, fetchFromGitHub, lua5_3, python }: stdenv.mkDerivation rec { name = "bam-${version}"; - version = "0.4.0"; + version = "0.5.1"; - src = fetchurl { - url = "http://github.com/downloads/matricks/bam/${name}.tar.bz2"; - sha256 = "0z90wvyd4nfl7mybdrv9dsd4caaikc6fxw801b72gqi1m9q0c0sn"; + src = fetchFromGitHub { + owner = "matricks"; + repo = "bam"; + rev = "v${version}"; + sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"; }; - buildInputs = [ lua5 python ]; + buildInputs = [ lua5_3 python ]; buildPhase = ''${stdenv.shell} make_unix.sh''; @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { raskin ]; platforms = platforms.linux; - license = licenses.free; + license = licenses.zlib; downloadPage = "http://matricks.github.com/bam/"; }; } diff --git a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix new file mode 100644 index 000000000000..3bbab475c573 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix @@ -0,0 +1,42 @@ +{ stdenv, writeText, runCommandCC, bazel }: + +# Tests that certain executables are available in bazel-executed bash shells. + +let + WORKSPACE = writeText "WORKSPACE" '' + workspace(name = "our_workspace") + ''; + + fileIn = writeText "input.txt" '' + one + two + three + ''; + + fileBUILD = writeText "BUILD" '' + genrule( + name = "tool_usage", + srcs = [ ":input.txt" ], + outs = [ "output.txt" ], + cmd = "cat $(location :input.txt) | gzip - | gunzip - | awk '/t/' > $@", + ) + ''; + + runLocal = name: script: runCommandCC name { preferLocalBuild = true; } script; + + workspaceDir = runLocal "our_workspace" '' + mkdir $out + cp ${WORKSPACE} $out/WORKSPACE + cp ${fileIn} $out/input.txt + cp ${fileBUILD} $out/BUILD + ''; + + testBazel = runLocal "bazel-test-bash-tools" '' + export HOME=$(mktemp -d) + cp -r ${workspaceDir} wd && chmod +w wd && cd wd + ${bazel}/bin/bazel build :tool_usage + cp bazel-genfiles/output.txt $out + echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK" + ''; + +in testBazel diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index b1bb5708d44a..75ab82a0ac62 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,10 +1,11 @@ { stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper -, jdk, zip, unzip, bash, writeCBin, coreutils -, which, python, perl, gawk, gnused, gnugrep, findutils +, zip, unzip, bash, writeCBin, coreutils +, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils # Apple dependencies , cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively -, buildJdk ? jdk, runJdk ? jdk +, buildJdk, runJdk +, buildJdkName # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -23,12 +24,43 @@ let for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done ''; - defaultShellPath = lib.makeBinPath [ bash coreutils findutils gawk gnugrep gnused which unzip ]; + defaultShellPath = lib.makeBinPath + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + # + [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ]; + + # Java toolchain used for the build and tests + javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; in stdenv.mkDerivation rec { - version = "0.21.0"; + version = "0.22.0"; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -38,16 +70,21 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; }; - # additional tests that check bazel’s functionality + # Additional tests that check bazel’s functionality. Execute + # + # nix-build . -A bazel.tests + # + # in the nixpkgs checkout root to exercise them locally. passthru.tests = { - python_bin_path = callPackage ./python-bin-path-test.nix {}; + pythonBinPath = callPackage ./python-bin-path-test.nix {}; + bashTools = callPackage ./bash-tools-test.nix {}; }; name = "bazel-${version}"; src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1d3x0f1hzaiqq00pd65bks7v8kbv57m13jsing7y0y9id0g87jvc"; + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip"; + sha256 = "0hannnvia8rvmi2v5d97j1f6wv0m1kxkd5hq4aqp0dqjr0ka4q38"; }; sourceRoot = "."; @@ -125,9 +162,11 @@ stdenv.mkDerivation rec { genericPatches = '' # Substitute python's stub shebang to plain python path. (see TODO add pr URL) + # See also `postFixup` where python is added to $out/nix-support substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\ --replace "/usr/bin/env python" "${python}/bin/python" \ --replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \ + # substituteInPlace is rather slow, so prefilter the files with grep grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! @@ -142,11 +181,6 @@ stdenv.mkDerivation rec { substituteInPlace scripts/bootstrap/compile.sh \ --replace /bin/sh ${customBash}/bin/bash - # We only build with JDK8 for now, since JDK11 does not compile bazel - substituteInPlace tools/jdk/default_java_toolchain.bzl \ - --replace '"jvm_opts": JDK9_JVM_OPTS' \ - '"jvm_opts": JDK8_JVM_OPTS' - # add nix environment vars to .bazelrc cat >> .bazelrc <<EOF build --experimental_distdir=${distDir} @@ -156,6 +190,7 @@ stdenv.mkDerivation rec { build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' + build --host_java_toolchain='${javaToolchain}' EOF # add the same environment vars to compile.sh @@ -164,6 +199,7 @@ stdenv.mkDerivation rec { -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ + -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \ -i scripts/bootstrap/compile.sh # --experimental_strict_action_env (which will soon become the @@ -233,7 +269,9 @@ stdenv.mkDerivation rec { export TEST_TMPDIR=$(pwd) hello_test () { - $out/bin/bazel test --test_output=errors \ + $out/bin/bazel test \ + --test_output=errors \ + --java_toolchain='${javaToolchain}' \ examples/cpp:hello-success_test \ examples/java-native/src/test/java/com/example/myproject:hello } @@ -262,7 +300,10 @@ stdenv.mkDerivation rec { # Save paths to hardcoded dependencies so Nix can detect them. postFixup = '' mkdir -p $out/nix-support - echo "${customBash} ${defaultShellPath}" > $out/nix-support/depends + echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends + # The templates get tar’d up into a .jar, + # so nix can’t detect python is needed in the runtime closure + echo "${python}" >> $out/nix-support/depends ''; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index 478ba8eaa712..54ae154a6207 100644 --- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -42,8 +42,10 @@ let testBazel = runLocal "bazel-test-builtin-rules" '' export HOME=$(mktemp -d) - cp -r ${workspaceDir}/* . - ${bazel}/bin/bazel --output_base=/tmp/bazel-tests/wd\ + # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 + # about why to create a subdir for the workspace. + cp -r ${workspaceDir} wd && chmod u+w wd && cd wd + ${bazel}/bin/bazel \ test \ --test_output=errors \ --host_javabase='@local_jdk//:jdk' \ diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 8f3622e186c7..c20985f31dc4 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -2,7 +2,7 @@ let baseName = "bloop"; - version = "1.2.3"; + version = "1.2.5"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -16,7 +16,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0d0q4rzz21afzfclm3sjp940wk7p8cllbxsidr6rg3r1qqhzawlr"; + outputHash = "19373fyb0g7irrdzb1vsjmyv5xj84qwbcfb6lm076px7wfyn0w1c"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index d9bfb40b46e7..2d0bf244370f 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -7,8 +7,8 @@ in { version = "3.0.1"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; - scons_3_0_3 = mkScons { - version = "3.0.3"; - sha256 = "1wwn0534d83ryfxjihvqk2ncj8wh5210pi3jxjd2cvjqa9mpkv6q"; + scons_latest = mkScons { + version = "3.0.4"; + sha256 = "06lv3pmdz5l23rx3kqsi1k712bdl36i942hgbjh209s94mpb7f72"; }; } diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index e350e475f73c..1feaf2c79a9d 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform +{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform , CoreServices, Security }: rustPlatform.buildRustPackage rec { name = "cargo-web-${version}"; - version = "0.6.15"; + version = "0.6.23"; src = fetchFromGitHub { owner = "koute"; repo = "cargo-web"; rev = version; - sha256 = "076g7cd9v53vi8xvd4kfsiyzw1m2hhd1lwlwcv2dx2s5vlw4dxzh"; + sha256 = "1qbi3z4x39il07xlhfvq5ckzjqrf0yf6p8qidf24fp92gb940zxr"; }; - cargoSha256 = "157av9zkirr00w9v11mh7yp8w36sy7rw6i80i5jmi0mgrdvcg5si"; + cargoSha256 = "16wzgyn3k0yn70y0ciliyx1sjgppmkv9b4bn9p4x0qi6l0ah7fdp"; - nativeBuildInputs = [ openssl pkgconfig ]; + nativeBuildInputs = [ openssl perl pkgconfig ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix index 2ceaee5650b2..e8266c2efe2c 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix @@ -1,12 +1,15 @@ -{ callPackage, fetchFromGitHub, ... } @ args: +{ bash, callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "09smyrzp1xkczlmh8vqb7bmjb2b5d6yf9birjgaw36c6m44bpfvs"; + sha256 = "0sr1rxl92d4wdipl66f1yymx5bmyj1y85v6k22v57rzr6yhyfmsf"; }; - version = "3.0.1"; + version = "3.8.4"; hasBootstrapScript = false; + postPatch = '' + substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash + ''; }) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 8aa02ac307dd..ba0be89abf3d 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep -, src, version, hasBootstrapScript +, src, version, hasBootstrapScript, postPatch ? "" , ... }: let goPackagePath = "github.com/buildkite/agent"; @@ -7,14 +7,10 @@ in buildGoPackage { name = "buildkite-agent-${version}"; - inherit goPackagePath src; + inherit goPackagePath src postPatch; nativeBuildInputs = [ makeWrapper ]; - # on Linux, the TMPDIR is /build which is the same prefix as this package - # remove once #35068 is merged - noAuditTmpdir = stdenv.isLinux; - postInstall = '' ${stdenv.lib.optionalString hasBootstrapScript '' # Install bootstrap.sh diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix new file mode 100644 index 000000000000..cbf1af440575 --- /dev/null +++ b/pkgs/development/tools/database/litecli/default.nix @@ -0,0 +1,51 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "litecli"; + version = "1.0.0"; + + # Python 2 won't have prompt_toolkit 2.x.x + # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 + disabled = python3Packages.isPy27; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0s5a6r5q09144cc5169snwis5i2jrh3z2g4mw9wi2fsjxyhgpwq5"; + }; + + # fixes tests https://github.com/dbcli/litecli/pull/53 + postPatch = '' + substituteInPlace litecli/main.py \ + --replace 'except FileNotFoundError:' 'except (FileNotFoundError, OSError):' + ''; + + propagatedBuildInputs = with python3Packages; [ + cli-helpers + click + configobj + prompt_toolkit + pygments + sqlparse + ]; + + checkInputs = with python3Packages; [ + pytest + mock + ]; + + preCheck = '' + export XDG_CONFIG_HOME=$TMP + # add missing file + echo "litecli is awesome!" > tests/test.txt + ''; + + meta = with lib; { + description = "Command-line interface for SQLite"; + longDescription = '' + A command-line client for SQLite databases that has auto-completion and syntax highlighting. + ''; + homepage = https://litecli.com; + license = licenses.bsd3; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index 49e90ce64c87..f65347889382 100644 --- a/pkgs/development/tools/database/shmig/default.nix +++ b/pkgs/development/tools/database/shmig/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub -, withMySQL ? false, withPSQL ? false, withSQLite ? false -, mysql, postgresql, sqlite, gawk, which +, withMySQL ? true, withPSQL ? false, withSQLite ? false +, mysql, postgresql, sqlite, gawk , lib }: -stdenv.mkDerivation { - name = "shmig-2017-07-24"; +stdenv.mkDerivation rec { + name = "shmig-${version}"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mbucc"; repo = "shmig"; - rev = "aff54e03d13f8f95b422cf898505490a56152a4a"; - sha256 = "08q94dka5yqkzkis3w7j1q8kc7d3kk7mb2drx8ms59jcqvp847j3"; + rev = "v${version}"; + sha256 = "15ry1d51d6dlzzzhck2x57wrq48vs4n9pp20bv2sz6nk92fva5l5"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -23,8 +24,7 @@ stdenv.mkDerivation { --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mysql.client}/bin/mysql"}" \ --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \ --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \ - --replace "awk" "${gawk}/bin/awk" \ - --replace "which" "${which}/bin/which" + --replace "awk" "${gawk}/bin/awk" ''; preBuild = '' diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix new file mode 100644 index 000000000000..2bdb455f8e88 --- /dev/null +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -0,0 +1,58 @@ +{ docker +, fetchFromGitLab +, python +, lib }: + +python.pkgs.buildPythonApplication rec { + version = "1.1"; + pname = "fdroidserver"; + + src = fetchFromGitLab { + owner = "fdroid"; + repo = "fdroidserver"; + rev = version; + sha256 = "1910ali90aj3wkxy6mi88c5ya6n7zbqr69nvmpc5dydxm0gb98w5"; + }; + + patchPhase = '' + substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" + substituteInPlace setup.py --replace "pyasn1-modules == 0.2.1" "pyasn1-modules" + ''; + + preConfigure = '' + ${python.interpreter} setup.py compile_catalog + ''; + postInstall = '' + install -m 0755 gradlew-fdroid $out/bin + ''; + + buildInputs = [ python.pkgs.Babel ]; + + propagatedBuildInputs = with python.pkgs; [ + androguard + clint + defusedxml + docker + docker-py + GitPython + libcloud + mwclient + paramiko + pillow + pyasn1 + pyasn1-modules + python-vagrant + pyyaml + qrcode + requests + ruamel_yaml + ]; + + meta = with lib; { + homepage = https://f-droid.org; + description = "Server and tools for F-Droid, the Free Software repository system for Android"; + license = licenses.agpl3; + maintainers = [ lib.maintainers.pmiddend ]; + }; + +} diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 09b7796b5f68..a987cebdc193 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "heroku-${version}"; - version = "7.18.2"; + version = "7.19.4"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "1dplh3bfin1g0wwbkg76z3xsja4zqj350vrzl8jfw7982saxqywh"; + sha256 = "0l30acam8q114imgz7kzpfp6z1zwpg2sm1ygnjjdjd2bw62bmv3a"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 02ea20d8bad7..8722d49eb32e 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -19,7 +19,7 @@ in checkInputs = with python3Packages; [ vcrpy mock hiro ]; buildInputs = [ libffi openssl ]; propagatedBuildInputs = with python3Packages; [ - argparse ordereddict requests six suds-jurko termcolor keyring + ordereddict requests six suds-jurko termcolor keyring jira keyrings-alt ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 38b495d89a63..cbe37cec3c78 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -3,9 +3,9 @@ buildGoPackage rec { name = "kustomize-${version}"; - version = "1.0.10"; - # rev is the 1.0.10 commit, mainly for kustomize version command output - rev = "383b3e798b7042f8b7431f93e440fb85631890a3"; + version = "1.0.11"; + # rev is the 1.0.11 commit, mainly for kustomize version command output + rev = "8f701a00417a812558a7b785e8354957afa469ae"; goPackagePath = "sigs.k8s.io/kustomize"; @@ -17,7 +17,7 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - sha256 = "1z78d5j2w78x4ks4v745050g2ffmirj03v7129dib2lfhfjra8aj"; + sha256 = "18kc23l6r2di35md9jbinyzxr791vvdjyklaf3k725imqksikwri"; rev = "v${version}"; repo = "kustomize"; owner = "kubernetes-sigs"; diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index d051e1d57592..d7cea5c3d4ed 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autoconf-archive-${version}"; - version = "2018.03.13"; + version = "2019.01.06"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "0ng1lvpijf3kv7w7nb1shqs23vp0398yicyvkf9lsk56kw6zjxb1"; + sha256 = "0gqya7nf4j5k98dkky0c3bnr0paciya91vkqazg7knlq621mq68p"; }; buildInputs = [ xz ]; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 9464ad463f66..693c791875be 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington vrthra ]; + maintainers = with maintainers; [ vrthra ]; }; } diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index e016882c8ef5..b671a27ac747 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.5"; + version = "2.10.6"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "04bll20lqb76xi6hcjrlankvyqc1hkyj8kvc4gf867lnxxw811m4"; + sha256 = "0z2kh6svszi332012id373bjwzcmzj6fks993f6yi35zpqmzapgh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 039e5b1ec542..27c8f609d5d6 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "lttng-ust-${version}"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "0if0hrs32r98sp85c8c63zpgy5xjw6cx8wrs65xq227b0jwj5jn4"; + sha256 = "0aw580xx6x9hgbxrzil7yqv12j8yvi5d9iibldx3z5jz1pwj114y"; }; buildInputs = [ python ]; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index afe026359e53..8b9bf453c468 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -1,4 +1,11 @@ -{stdenv, fetchurl, lua, curl, makeWrapper, which, unzip}: +{stdenv, fetchurl +, curl, makeWrapper, which, unzip +, lua +# for 'luarocks pack' +, zip +# some packages need to be compiled with cmake +, cmake +}: let s = # Generated upstream information rec { @@ -36,17 +43,33 @@ stdenv.mkDerivation { for i in "$out"/bin/*; do test -L "$i" || { wrapProgram "$i" \ - --prefix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \ - --prefix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ + --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \ + --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ + --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \ + --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" } done ''; - meta = { + + propagatedBuildInputs = [ zip unzip cmake ]; + + # unpack hook for src.rock and rockspec files + setupHook = ./setup-hook.sh; + + # cmake is just to compile packages with "cmake" buildType, not luarocks itself + dontUseCmakeConfigure = true; + + shellHook = '' + export PATH="src/bin:''${PATH:-}" + export LUA_PATH="src/?.lua;''${LUA_PATH:-}" + ''; + + meta = with stdenv.lib; { inherit (s) version; description = ''A package manager for Lua''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.mit ; + maintainers = with maintainers; [raskin teto]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix new file mode 100644 index 000000000000..3728caf193ae --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -0,0 +1,9 @@ +{ luarocks, fetchFromGitHub }: +luarocks.overrideAttrs(old: { + src = fetchFromGitHub { + owner = "teto"; + repo = "luarocks"; + rev = "d669e8e118e6ca8bff05f32dbc9e5589e6ac45d2"; + sha256 = "1lay3905a5sx2a4y68lbys0913qs210hcj9kn2lbqinw86c1vyc3"; + }; +}) diff --git a/pkgs/development/tools/misc/luarocks/setup-hook.sh b/pkgs/development/tools/misc/luarocks/setup-hook.sh new file mode 100644 index 000000000000..593ee8bbe83e --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/setup-hook.sh @@ -0,0 +1,20 @@ +unpackCmdHooks+=(_trySourceRock) +unpackCmdHooks+=(_tryRockSpec) + +_tryRockSpec() { + if ! [[ "$curSrc" =~ \.rockspec$ ]]; then return 1; fi +} + +_trySourceRock() { + + if ! [[ "$curSrc" =~ \.src.rock$ ]]; then return 1; fi + + export PATH=${unzip}/bin:$PATH + + # luarocks expects a clean <name>.rock.spec name to be the package name + # so we have to strip the hash + renamed="$(stripHash $curSrc)" + cp "$curSrc" "$renamed" + luarocks unpack --force "$renamed" +} + diff --git a/pkgs/development/tools/misc/mdl/.bundle/config b/pkgs/development/tools/misc/mdl/.bundle/config new file mode 100644 index 000000000000..d28c8337bc45 --- /dev/null +++ b/pkgs/development/tools/misc/mdl/.bundle/config @@ -0,0 +1,3 @@ +--- +BUNDLE_PATH: "vendor/bundle" +BUNDLE_CACHE_ALL: "true" diff --git a/pkgs/development/tools/misc/mdl/Gemfile b/pkgs/development/tools/misc/mdl/Gemfile new file mode 100644 index 000000000000..15b33c53a653 --- /dev/null +++ b/pkgs/development/tools/misc/mdl/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "mdl" diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/development/tools/misc/mdl/Gemfile.lock new file mode 100644 index 000000000000..aabcd784d867 --- /dev/null +++ b/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -0,0 +1,21 @@ +GEM + remote: https://rubygems.org/ + specs: + kramdown (1.17.0) + mdl (0.5.0) + kramdown (~> 1.12, >= 1.12.0) + mixlib-cli (~> 1.7, >= 1.7.0) + mixlib-config (~> 2.2, >= 2.2.1) + mixlib-cli (1.7.0) + mixlib-config (2.2.18) + tomlrb + tomlrb (1.2.8) + +PLATFORMS + ruby + +DEPENDENCIES + mdl + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/development/tools/misc/mdl/default.nix b/pkgs/development/tools/misc/mdl/default.nix new file mode 100644 index 000000000000..a3c361efc9d5 --- /dev/null +++ b/pkgs/development/tools/misc/mdl/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv { + inherit ruby; + pname = "mdl"; + gemdir = ./.; + + meta = with lib; { + description = "A tool to check markdown files and flag style issues"; + homepage = https://github.com/markdownlint/markdownlint; + license = licenses.mit; + maintainers = with maintainers; [ gerschtli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/development/tools/misc/mdl/gemset.nix new file mode 100644 index 000000000000..54994f3da6ab --- /dev/null +++ b/pkgs/development/tools/misc/mdl/gemset.nix @@ -0,0 +1,44 @@ +{ + kramdown = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + type = "gem"; + }; + version = "1.17.0"; + }; + mdl = { + dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; + type = "gem"; + }; + version = "0.5.0"; + }; + mixlib-cli = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; + type = "gem"; + }; + version = "1.7.0"; + }; + mixlib-config = { + dependencies = ["tomlrb"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; + type = "gem"; + }; + version = "2.2.18"; + }; + tomlrb = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; + type = "gem"; + }; + version = "1.2.8"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 136ea9c9062f..903693b92808 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 8e89dd3fadd2..b3e9e71ebc05 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -11,8 +11,8 @@ let sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; }; cppo = fetchurl { - url = "https://github.com/mjambon/cppo/archive/v1.6.4.tar.gz"; - sha256 = "0jdb7d21lfa3ck4k59mrqs5pljzq5rb504jq57nnrc6klljm42j7"; + url = "https://github.com/mjambon/cppo/archive/v1.6.5.tar.gz"; + sha256 = "1dkm3d5h6h56y937gcdk2wixlpzl59vv5pmiafglr89p20kf7gqf"; }; cudf = fetchurl { url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; @@ -22,42 +22,46 @@ let url = "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz"; sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; }; + dune-local = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/1.2.1/dune-1.2.1.tbz"; + sha256 = "00c5dbm4hkdapc2i7pg07b2lj8sv6ly38qr7zid58cdmbmzq21z9"; + }; extlib = fetchurl { url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; }; - jbuilder = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/1.0+beta20/jbuilder-1.0.beta20.tbz"; - sha256 = "07hl9as5llffgd6hbw41rs76i1ibgn3n9r0dba5h0mdlkapcwb10"; - }; mccs = fetchurl { - url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+8.tar.gz"; - sha256 = "0xavfvxfrcf3lmry8ymma1yzy0hw3ijbx94c9zq3pzlwnylrapa4"; + url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+9.tar.gz"; + sha256 = "0gf86c65jdxxcwd96kcmrqxrmnnzc0570gb9ad6c57rl3fyy8yhv"; }; ocamlgraph = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz"; sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"; }; opam-file-format = fetchurl { - url = "https://github.com/ocaml/opam-file-format/archive/2.0.0-rc2.tar.gz"; - sha256 = "1mgk08msp7hxn0hs0m82vky3yv6hcq4pw5402b3vhx4c49431jsb"; + url = "https://github.com/ocaml/opam-file-format/archive/2.0.0.tar.gz"; + sha256 = "0cjw69r7iilidi7b6arr92kjnjspchvwnmwr1b1gyaxqxpr2s98m"; }; re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/releases/download/1.7.3/re-1.7.3.tbz"; - sha256 = "0nv933qfl8y9i19cqvhsalwzif3dkm28vg478rpnr4hgfqjlfryr"; + url = "https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz"; + sha256 = "0qkv42a4hpqpxvqa4kdkkcbhbg7aym9kv4mqgm3m51vxbd0pq0lv"; }; result = fetchurl { url = "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz"; sha256 = "1lrnbxdq80gbhnp85mqp1kfk0bkh6q1c93sfz2qgnq2qyz60w4sk"; }; + seq = fetchurl { + url = "https://github.com/c-cube/seq/archive/0.1.tar.gz"; + sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; + }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.0.zip"; - sha256 = "0m4ilsldrfkkn0vlvl119bk76j2pwvqvdi8mpg957z4kqflfbfp8"; + url = "https://github.com/ocaml/opam/archive/2.0.2.zip"; + sha256 = "0hxf0ns3si03rl7dxix7i30limbl50ffyvdyk9bqqms4ir8dcza6"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "2.0.0"; + version = "2.0.2"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -68,16 +72,17 @@ in stdenv.mkDerivation rec { ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tar.gz ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz + ln -sv ${srcs.dune-local} $sourceRoot/src_ext/dune-local.tbz ln -sv ${srcs.extlib} $sourceRoot/src_ext/extlib.tar.gz - ln -sv ${srcs.jbuilder} $sourceRoot/src_ext/jbuilder.tbz ln -sv ${srcs.mccs} $sourceRoot/src_ext/mccs.tar.gz ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz ln -sv ${srcs.result} $sourceRoot/src_ext/result.tbz + ln -sv ${srcs.seq} $sourceRoot/src_ext/seq.tar.gz ''; - patches = [ ./opam-pull-3487.patch ./opam-shebangs.patch ./opam-mccs-darwin.patch ]; + patches = [ ./opam-shebangs.patch ]; preConfigure = '' substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" @@ -98,7 +103,8 @@ in stdenv.mkDerivation rec { mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store $out/bin/opam-installer --prefix=$installer opam-installer.install ''; @@ -111,4 +117,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.0 -p opam-pull-3487.patch,opam-shebangs.patch,opam-mccs-darwin.patch +# Generated by: ./opam.nix.pl -v 2.0.2 -p opam-shebangs.patch diff --git a/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch deleted file mode 100644 index 501242c40a01..000000000000 --- a/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src_ext/patches/mccs/build-on-darwin.patch b/src_ext/patches/mccs/build-on-darwin.patch -new file mode 100644 -index 00000000..157e2094 ---- /dev/null -+++ b/src_ext/patches/mccs/build-on-darwin.patch -@@ -0,0 +1,12 @@ -+diff --git a/src/context_flags.ml b/src/context_flags.ml -+index 7470030..6e07370 100644 -+--- a/src/context_flags.ml -++++ b/src/context_flags.ml -+@@ -24,6 +24,7 @@ let ifc c x = if c then x else [] -+ -+ let cxxflags = -+ let flags = -++ (ifc (Config.system = "macosx") ["-x"; "c++"]) @ -+ (ifc (Sys.win32 && Config.ccomp_type = "msvc") ["/EHsc"]) @ -+ (ifc useGLPK ["-DUSEGLPK"]) @ -+ (ifc useCOIN ["-DUSECOIN"]) @ diff --git a/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch deleted file mode 100644 index e047c8298bc3..000000000000 --- a/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh -index 6f5d7dbea..3e1a3e1b4 100755 ---- a/src/state/shellscripts/bwrap.sh -+++ b/src/state/shellscripts/bwrap.sh -@@ -1,4 +1,6 @@ --#!/bin/bash -ue -+#!/usr/bin/env bash -+ -+set -ue - - if ! command -v bwrap >/dev/null; then - echo "The 'bwrap' command was not found. Install 'bubblewrap' on your system, or" >&2 -@@ -11,7 +13,9 @@ fi - - ARGS=(--unshare-net --new-session) - ARGS=("${ARGS[@]}" --proc /proc --dev /dev) --ARGS=("${ARGS[@]}" --bind /tmp /tmp --tmpfs /run --tmpfs /var) -+ARGS=("${ARGS[@]}" --bind "${TMPDIR:-/tmp}" /tmp) -+ARGS=("${ARGS[@]}" --setenv TMPDIR /tmp --setenv TMP /tmp --setenv TEMPDIR /tmp --setenv TEMP /tmp) -+ARGS=("${ARGS[@]}" --tmpfs /run --tmpfs /var) - - add_mounts() { - case "$1" in diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 1862add452d6..537997eb8a45 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -113,7 +113,8 @@ print <<'EOF'; mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 25ec443be42b..5e54a8b37058 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.3.1"; + version = "1.3.3"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0aif4ilzfv8qyqk4mn525r38xw2w34ryknzd2vrg6mcjcarm8myq"; + sha256 = "1b1yp5k2apccyqw9zb2xclnm16gfnnkaiwh2s0p79prsy6gjkp7y"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 8b42ed124360..1ade2b353868 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, jre, gawk }: +{ stdenv, fetchurl, makeWrapper, jre_headless, gawk }: stdenv.mkDerivation rec { name = "nexus-${version}"; - version = "3.14.0-04"; + version = "3.15.0-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "1ql707672xhybmfajjmli9w0wcf1f26skq8i5kqirms2364wg35f"; + sha256 = "0akizdljcjl1nh25k01wxvp5wp4i2jphsj0hh5rqbd0fk1pjivkv"; }; sourceRoot = name; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rm -fv $out/bin/nexus.bat wrapProgram $out/bin/nexus \ - --set JAVA_HOME ${jre} \ + --set JAVA_HOME ${jre_headless} \ --set ALTERNATIVE_NAME "nexus" \ --prefix PATH "${stdenv.lib.makeBinPath [ gawk ]}" diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 5ad9a7c58efb..90d36c71caa9 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; buildInputs = [ lua ]; - patches = [ ./environ-and-linux-is-kinda-posix.patch ]; + patches = [ ./environ-and-linux-is-kinda-posix.patch ./headers.patch ]; preConfigure = '' substituteInPlace config_posix.py \ diff --git a/pkgs/development/tools/toluapp/headers.patch b/pkgs/development/tools/toluapp/headers.patch new file mode 100644 index 000000000000..59a47bb989a9 --- /dev/null +++ b/pkgs/development/tools/toluapp/headers.patch @@ -0,0 +1,15 @@ +diff --git a/include/tolua++.h b/include/tolua++.h +index ed53449..f57d56d 100644 +--- a/include/tolua++.h ++++ b/include/tolua++.h +@@ -43,8 +43,8 @@ extern "C" { + + typedef int lua_Object; + +-#include "lua.h" +-#include "lauxlib.h" ++#include <lua.h> ++#include <lauxlib.h> + + struct tolua_Error + { diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index 7d5569b4376b..cb10a252d121 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "uftrace-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "1jb4dp6crvfzxzmi5iflc7p13b7p2v1djyj6smbf9ns4wr515y6b"; + sha256 = "0s7yfnf7kcqlfw3zzv4y8akkd12f8di69c4sranympnl7z5srfam"; }; postUnpack = '' diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index 8257d5fc583e..59496e8d8f0e 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { name = "vgo2nix-${version}"; - version = "unstable-2018-12-02"; + version = "unstable-2019-02-01"; goPackagePath = "github.com/adisbladis/vgo2nix"; nativeBuildInputs = [ makeWrapper ]; @@ -17,8 +17,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "adisbladis"; repo = "vgo2nix"; - rev = "b298f4fb799fc532488fc887e1938668d7f3d219"; - sha256 = "0gr5vfz5wzpcyxsz948aniyfbryg53agvzbkhdnb5hiwhi7nay9p"; + rev = "8213e1ffe9e59b1f92df15a995eafd96b66da472"; + sha256 = "1djwsw7zbprz4czaqsimpwccmmnk8wn38ksj7dis8xdvqrfy7h0g"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/vgo2nix/deps.nix b/pkgs/development/tools/vgo2nix/deps.nix index b8327cd6069f..4f8506794d36 100644 --- a/pkgs/development/tools/vgo2nix/deps.nix +++ b/pkgs/development/tools/vgo2nix/deps.nix @@ -1,5 +1,140 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ - + { + goPackagePath = "github.com/alecthomas/assert"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/assert"; + rev = "405dbfeb8e38"; + sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; + }; + } + { + goPackagePath = "github.com/alecthomas/colour"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/colour"; + rev = "60882d9e2721"; + sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; + }; + } + { + goPackagePath = "github.com/alecthomas/kingpin"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "github.com/alecthomas/repr"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/repr"; + rev = "117648cd9897"; + sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.3"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/orivej/e"; + fetch = { + type = "git"; + url = "https://github.com/orivej/e"; + rev = "ac3492690fda"; + sha256 = "11jizr28kfkr6zscjxg95pqi6cjp08aqnhs41sdhc98nww78ilkr"; + }; + } + { + goPackagePath = "github.com/orivej/go-nix"; + fetch = { + type = "git"; + url = "https://github.com/orivej/go-nix"; + rev = "dae45d921a44"; + sha256 = "17hfmsz8hs3h2d5c06j1bvbw8ijrhzm3iz911z5zydsl4x7y0cgy"; + }; + } + { + goPackagePath = "github.com/pkg/profile"; + fetch = { + type = "git"; + url = "https://github.com/pkg/profile"; + rev = "v1.2.1"; + sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d99a578cf41b"; + sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm"; + }; + } { goPackagePath = "golang.org/x/tools"; fetch = { diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index dade09ee5f6e..e9e12c7d20b1 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wabt-${version}"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "0lqsf4wmg24mb3ksmib8xwvmghx8m2vzrjrs8dazwlmik7rill8i"; + sha256 = "018sb7p8xlvv8p2fdbnl0v98zh78zc8ha74ldw5c8z0i7xzgzj9w"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix index 59e009a43386..92ff35ac8b53 100644 --- a/pkgs/development/tools/xcbuild/toolchains.nix +++ b/pkgs/development/tools/xcbuild/toolchains.nix @@ -67,5 +67,6 @@ runCommand "Toolchains" {} ('' done ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/bin + ln -s ${buildPackages.darwin.bootstrap_cmds}/libexec/migcom $toolchain/libexec ln -s ${mkdep-darwin-src} $toolchain/bin/mkdep '') diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index d512d5570332..1c49f99d6190 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "13.0.4"; + version = "13.1.2"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "0qiykqrdd1yv6n1kzkzp300j32g682rv4p0l39rgnczdaiqcv9w5"; + sha256 = "0hgbmvhzxkr84ilrzjxnj3p5pkibam739cckpvwalq5q1ddy2cn4"; }; sourceRoot = "."; |