diff options
Diffstat (limited to 'nixpkgs/pkgs/development')
178 files changed, 4293 insertions, 1498 deletions
diff --git a/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/nixpkgs/pkgs/development/compilers/binaryen/default.nix index 1b53a142d12a..52323b3de765 100644 --- a/nixpkgs/pkgs/development/compilers/binaryen/default.nix +++ b/nixpkgs/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }: let - defaultVersion = "88"; + defaultVersion = "89"; # Map from git revs to SHA256 hashes sha256s = { - "version_88" = "14vm2hksn696klk97yz562mm5sqd67qbbzmlw4kvy22ldyc6sgmi"; + "version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix index a3b32ceee0cf..74f711811907 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { name = "chicken-${version}"; - binaryVersion = 9; + binaryVersion = 11; src = fetchurl { url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; - installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; + buildFlags = "PLATFORM=${platform} PREFIX=$(out)"; + installFlags = "PLATFORM=${platform} PREFIX=$(out)"; buildInputs = [ makeWrapper @@ -37,10 +37,6 @@ stdenv.mkDerivation { wrapProgram $f \ --prefix PATH : ${stdenv.cc}/bin done - - mv $out/var/lib/chicken $out/lib - rmdir $out/var/lib - rmdir $out/var ''; # TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix b/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix index 2d3324ceaca4..a8e3ee5976e8 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, stdenv }: rec { inherit (pkgs) eggDerivation fetchegg; @@ -33,12 +33,12 @@ rec { }; srfi-1 = eggDerivation { - name = "srfi-1-0.5"; + name = "srfi-1-0.5.1"; src = fetchegg { name = "srfi-1"; - version = "0.5"; - sha256 = "0gh1h406xbxwm5gvc5znc93nxp9xjbhyqf7zzga08k5y6igxrlvk"; + version = "0.5.1"; + sha256 = "15x0ajdkw5gb3vgs8flzh5g0pzl3wmcpf11iimlm67mw6fxc8p7j"; }; buildInputs = [ @@ -47,12 +47,12 @@ rec { }; srfi-13 = eggDerivation { - name = "srfi-13-0.2"; + name = "srfi-13-0.2.1"; src = fetchegg { name = "srfi-13"; - version = "0.2"; - sha256 = "0jazbdnn9bjm7wwxqq7xzqxc9zfvaapq565rf1czj6ayl96yvk3n"; + version = "0.2.1"; + sha256 = "0204i7fhc4dy0l89lbi2lv9cjndrvwyrk68z3wy7x445jb4ky1gq"; }; buildInputs = [ @@ -61,12 +61,12 @@ rec { }; srfi-14 = eggDerivation { - name = "srfi-14-0.2"; + name = "srfi-14-0.2.1"; src = fetchegg { name = "srfi-14"; - version = "0.2"; - sha256 = "13nm4nn1d52nkvhjizy26z3s6q41x1ml4zm847xzf86x1zwvymni"; + version = "0.2.1"; + sha256 = "0gc33cx4xll9vsf7fm8jvn3gc0604kn3bbi6jfn6xscqp86kqb9p"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/setup-hook.sh b/nixpkgs/pkgs/development/compilers/chicken/5/setup-hook.sh index 2447aeb0ceae..f5ebaaf638e3 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/setup-hook.sh +++ b/nixpkgs/pkgs/development/compilers/chicken/5/setup-hook.sh @@ -1,5 +1,5 @@ addChickenRepositoryPath() { - addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/9/" + addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11/" addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share/" } diff --git a/nixpkgs/pkgs/development/compilers/fasm/bin.nix b/nixpkgs/pkgs/development/compilers/fasm/bin.nix index 98cc2804f600..44d784133f5f 100644 --- a/nixpkgs/pkgs/development/compilers/fasm/bin.nix +++ b/nixpkgs/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { name = "fasm-bin-${version}"; - version = "1.73.15"; + version = "1.73.16"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "0yc30y4hkr226629347gcrzi153f10hcp5q7bm3q6ir3gx35xa39"; + sha256 = "1jaqm7w458ny37fsw3fln17kw31rcsk8kyadci45qcbw6jspmn7k"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/gambit/unstable.nix b/nixpkgs/pkgs/development/compilers/gambit/unstable.nix index 5788f0df1da9..d855b83f0afc 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/unstable.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { stdenv, callPackage, fetchFromGitHub }: callPackage ./build.nix { - version = "unstable-2019-02-05"; -# git-version = "4.9.3"; + version = "unstable-2019-07-21"; +# git-version = "4.9.3-109-g3b5f74fa"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "baf7de67f6d800821412fe83a8d9e9e09faeb490"; - sha256 = "0ygm5y8fvq6dbb8mwq52v8rc8pdnwm4qpmxlnx5m9hzzbm1kzxxv"; + rev = "3b5f74fae74b2159e3bf6923f29a18b31cc15dcc"; + sha256 = "07cb0d8754dqhxawkp5dp4y0bsa9kfald4dkj60j5yfnsp81y5mi"; }; inherit stdenv; } diff --git a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index 0d75de7557be..506cfee7f498 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -37,7 +37,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "9.1.0"; +let version = "9.2.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -131,7 +131,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "1817nc2bqdc251k0lpc51cimna7v68xjrnvqzvc50q3ax4s6i9kr"; + sha256 = "01mj3yk7z49i49168hg2cg7qs4bsccrrnv7pjmbdlf8j2a7z0vpa"; }; inherit patches; diff --git a/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix b/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix index 6e60ea6fea49..a9618a7e0667 100644 --- a/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix +++ b/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix @@ -1,14 +1,14 @@ { stdenv, callPackage, fetchFromGitHub, gambit-unstable }: callPackage ./build.nix { - version = "unstable-2019-02-09"; - git-version = "0.16-DEV-15-gafc20fc2"; + version = "unstable-2019-08-11"; + git-version = "0.16-DEV-132-gcb58f9a3"; gambit = gambit-unstable; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "afc20fc21030e8445b46b8267cc4c52cfd662aad"; - sha256 = "02v16zya9zryjs4wallibp1kvnpba60aw15y4k7zhddc71qjfbhw"; + rev = "cb58f9a30630a6f3e85a55f2c1dcc654f517ffed"; + sha256 = "18jh64v1gi6z3pks9zf19f2wcjpv21cs270dnaq617kgwp53vysh"; }; inherit stdenv; } diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix index 81d1a6f9b8a5..423eaf02d8c4 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix @@ -86,12 +86,12 @@ let in stdenv.mkDerivation (rec { - version = "8.8.0.20190613"; + version = "8.8.0.20190721"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.8.1-alpha2/ghc-${version}-src.tar.xz"; - sha256 = "17531jabkdmlhj57mkshjfwlri2g3jgal8fw9zpkl1kbplnrivyr"; + url = "https://downloads.haskell.org/ghc/8.8.1-rc1/ghc-${version}-src.tar.xz"; + sha256 = "1ih76zpxk8ay84xjyaflqc754002y8pdaainqfvb4cnhy6lpb1br"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/compilers/icedtea-web/default.nix b/nixpkgs/pkgs/development/compilers/icedtea-web/default.nix index 9390cbde6377..73dd90ab4a1f 100644 --- a/nixpkgs/pkgs/development/compilers/icedtea-web/default.nix +++ b/nixpkgs/pkgs/development/compilers/icedtea-web/default.nix @@ -1,30 +1,55 @@ -{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash, bc }: +{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.7.1"; + version = "1.8.3"; - src = fetchurl { - url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "1b9z0i9b1dsc2qpfdzbn2fi4vi3idrhm7ig45g1ny40ymvxcwwn9"; + src = fetchFromGitHub { + owner = "AdoptOpenJDK"; + repo = "IcedTea-Web"; + rev = name; + sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; }; - nativeBuildInputs = [ pkgconfig bc perl ]; - buildInputs = [ gtk2 xulrunner zip npapi_sdk ]; + nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; + buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; preConfigure = '' - #patchShebangs javac.in configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") ''; + patches = [ ./patches/0001-make-cargo-work-with-nix-build-on-linux.patch ]; + + doCheck = true; + preCheck = '' + # Needed for the below rust-launcher tests to pass + # dirs_paths_helper::tests::check_config_files_paths + # dirs_paths_helper::tests::check_legacy_config_files_paths + + mkdir -p $HOME/.icedtea + touch $HOME/.icedtea/deployment.properties + + mkdir -p $XDG_CONFIG_HOME/icedtea-web + touch $XDG_CONFIG_HOME/icedtea-web/deployment.properties + ''; + + HOME = "/build"; + XDG_CONFIG_HOME = "/build"; + configureFlags = [ + "--with-itw-libs=DISTRIBUTION" "--with-jdk-home=${jdk.home}" "--disable-docs" ]; mozillaPlugin = "/lib"; + postInstall = '' + mkdir -p $out/share/applications + cp javaws.desktop itweb-settings.desktop policyeditor.desktop $out/share/applications + ''; + meta = { description = "Java web browser plugin and an implementation of Java Web Start"; longDescription = '' @@ -32,7 +57,7 @@ stdenv.mkDerivation rec { programming language and an implementation of Java Web Start, originally based on the NetX project. ''; - homepage = http://icedtea.classpath.org/wiki/IcedTea-Web; + homepage = https://github.com/adoptopenjdk/icedtea-web; maintainers = with stdenv.lib.maintainers; [ wizeman ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch b/nixpkgs/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch new file mode 100644 index 000000000000..85cad6cf4678 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch @@ -0,0 +1,46 @@ +Subject: [PATCH] make cargo work with nix-build on linux + +--- + .cargo/config | 2 ++ + rust-launcher/Cargo.lock | 4 ++++ + rust-launcher/Cargo.toml | 7 ++++--- + 3 files changed, 10 insertions(+), 3 deletions(-) + create mode 100644 .cargo/config + create mode 100644 rust-launcher/Cargo.lock + +diff --git a/.cargo/config b/.cargo/config +new file mode 100644 +index 0000000..03ec4a2 +--- /dev/null ++++ b/.cargo/config +@@ -0,0 +1,2 @@ ++[net] ++offline=true +diff --git a/rust-launcher/Cargo.lock b/rust-launcher/Cargo.lock +new file mode 100644 +index 0000000..6055cc0 +--- /dev/null ++++ b/rust-launcher/Cargo.lock +@@ -0,0 +1,4 @@ ++[[package]] ++name = "launcher" ++version = "1.8.0" ++ +diff --git a/rust-launcher/Cargo.toml b/rust-launcher/Cargo.toml +index 61ee308..5e6e91b 100644 +--- a/rust-launcher/Cargo.toml ++++ b/rust-launcher/Cargo.toml +@@ -3,6 +3,7 @@ name = "launcher" + version = "1.8.0" + authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"] + +-[dependencies] +-[target.'cfg(windows)'.dependencies] +-dunce = "0.1.1" ++[workspace] ++# We need this too or cargo will fail. Some files seem to be copied around and ++# cargo thinks we are in a workspace, so let's exclude everything. ++exclude = ["*"] +-- +2.19.2 + diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch b/nixpkgs/pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch new file mode 100644 index 000000000000..a4a0f21b0fcd --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch @@ -0,0 +1,53 @@ +Index: lib/Driver/ToolChains/BareMetal.cpp +=================================================================== +--- a/lib/Driver/ToolChains/BareMetal.cpp ++++ b/lib/Driver/ToolChains/BareMetal.cpp +@@ -157,7 +157,7 @@ + void BareMetal::AddLinkRuntimeLib(const ArgList &Args, + ArgStringList &CmdArgs) const { + CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" + +- getTriple().getArchName() + ".a")); ++ getTriple().getArchName())); + } + + void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA, +Index: test/Driver/baremetal.cpp +=================================================================== +--- a/test/Driver/baremetal.cpp ++++ b/test/Driver/baremetal.cpp +@@ -13,7 +13,7 @@ + // CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic" + // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal" + // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for" +-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a" ++// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m" + // CHECK-V6M-C-SAME: "-o" "{{.*}}.o" + + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +@@ -35,7 +35,7 @@ + // CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic" + // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal" + // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind" +-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a" ++// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m" + // CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o" + + // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +@@ -48,7 +48,7 @@ + // CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic" + // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal" + // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind" +-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a" ++// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m" + // CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o" + + // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +@@ -61,7 +61,7 @@ + // CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic" + // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal" + // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind" +-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a" ++// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m" + // CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o" + + // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \ diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix index 266a877f7620..6911089250e8 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix @@ -47,6 +47,8 @@ let # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is # needed for our bootstrapping to not interfere with C. ./unwindlib.patch + # https://reviews.llvm.org/D51899 + ./compiler-rt-baremetal.patch ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index 25db273d7e3a..5959b99316d9 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.parsed.kernel.name == "none") [ + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCOMPILER_RT_OS_DIR=baremetal" ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix index 648320028536..75edd1fff54d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, fetchpatch }: +{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: stdenv.mkDerivation { name = "libunwind-${version}"; @@ -19,4 +19,6 @@ stdenv.mkDerivation { ]; enableParallelBuilding = true; + + cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index d1c0db25351c..d32d3fa67f1d 100644 --- a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -26,14 +26,14 @@ let }); in stdenv.mkDerivation rec { - name = "nextpnr-${version}"; - version = "2019.04.19"; + pname = "nextpnr"; + version = "2019.08.10"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "5344bc3b65f4e06f983db781e9a82d30b3f1512b"; - sha256 = "1y14jpa948cwk0i19bsfqh7yxsxkgskm4xym4z179sjcvcdvrn3a"; + rev = "3f26cf50767143e48d29ae691b2a0052c359eb15"; + sha256 = "1gv84svw56ass9idbzh17h3yxkk9ydr40ijf9w72gf72rbixszdr"; }; nativeBuildInputs @@ -49,6 +49,10 @@ stdenv.mkDerivation rec { "-DICEBOX_ROOT=${icestorm}/share/icebox" "-DTRELLIS_ROOT=${trellisRoot}/trellis" "-DUSE_OPENMP=ON" + # warning: high RAM usage + "-DSERIALIZE_CHIPDB=OFF" + # use PyPy for icestorm if enabled + "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" ] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF"); # Fix the version number. This is a bit stupid (and fragile) in practice diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix index 4f9b8ebd294c..11c22e636ef1 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "08"; - patch_version = "0"; - sha256 = "0si976y8snbmhm96671di65z0rrdyldxd55wjxn2mkn6654nryna"; + patch_version = "1"; + sha256 = "18sycl3zmgb8ghpxymriy5d72gvw7m5ra65v51hcrmzzac21hkyd"; # If the executable is stripped it does not work dontStrip = true; diff --git a/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/nixpkgs/pkgs/development/compilers/ponyc/default.nix index 35a1ee37b361..85641c351d49 100644 --- a/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation ( rec { substituteInPlace packages/process/_test.pony \ --replace '=/bin' "${coreutils}/bin" + # Disabling the stdlib tests + substituteInPlace Makefile-ponyc \ + --replace 'test-ci: all check-version test-core test-stdlib-debug test-stdlib' 'test-ci: all check-version test-core' + # Remove impure system refs substituteInPlace src/libponyc/pkg/package.c \ --replace "/usr/local/lib" "" \ diff --git a/nixpkgs/pkgs/development/compilers/rust/cargo.nix b/nixpkgs/pkgs/development/compilers/rust/cargo.nix index 9f576042787a..e000edad49b6 100644 --- a/nixpkgs/pkgs/development/compilers/rust/cargo.nix +++ b/nixpkgs/pkgs/development/compilers/rust/cargo.nix @@ -26,13 +26,6 @@ rustPlatform.buildRustPackage rec { # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel RUSTC_BOOTSTRAP = 1; - # FIXME: Use impure version of CoreFoundation because of missing symbols. - # CFURLSetResourcePropertyForKey is defined in the headers but there's no - # corresponding implementation in the sources from opensource.apple.com. - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" - ''; - postInstall = '' # NOTE: We override the `http.cainfo` option usually specified in # `.cargo/config`. This is an issue when users want to specify diff --git a/nixpkgs/pkgs/development/compilers/rust/clippy.nix b/nixpkgs/pkgs/development/compilers/rust/clippy.nix new file mode 100644 index 000000000000..2b8fcbe0ba4b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/rust/clippy.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, rustPlatform, rustc, Security, patchelf }: +rustPlatform.buildRustPackage rec { + name = "clippy-${rustc.version}"; + inherit (rustc) version src; + + # the rust source tarball already has all the dependencies vendored, no need to fetch them again + cargoVendorDir = "vendor"; + preBuild = "pushd src/tools/clippy"; + postBuild = "popd"; + + # changes hash of vendor directory otherwise + dontUpdateAutotoolsGnuConfigScripts = true; + + buildInputs = [ rustc ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + # fixes: error: the option `Z` is only accepted on the nightly compiler + RUSTC_BOOTSTRAP = 1; + + # Without disabling the test the build fails with: + # error: failed to run custom build command for `rustc_llvm v0.0.0 + # (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm) + doCheck = false; + + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver + ''; + + meta = with stdenv.lib; { + homepage = https://rust-lang.github.io/rust-clippy/; + description = "A bunch of lints to catch common mistakes and improve your Rust code"; + maintainers = with maintainers; [ basvandijk ]; + license = with licenses; [ mit asl20 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/rust/default.nix b/nixpkgs/pkgs/development/compilers/rust/default.nix index 0e3de0c4ab98..fb04239dbd4b 100644 --- a/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -64,6 +64,7 @@ rustPlatform = bootRustPlatform; inherit CoreFoundation Security; }; + clippy = self.callPackage ./clippy.nix { inherit Security; }; }); }; } diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 66da4d33251a..d77769583902 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -45,12 +45,6 @@ in stdenv.mkDerivation rec { ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"; - # Enable nightly features in stable compiles (used for - # bootstrapping, see https://github.com/rust-lang/rust/pull/37265). - # This loosens the hard restrictions on bootstrapping-compiler - # versions. - RUSTC_BOOTSTRAP = "1"; - # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; @@ -92,6 +86,8 @@ in stdenv.mkDerivation rec { "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config" "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config" "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" + ] ++ optional stdenv.isLinux [ + "--enable-profiler" # build libprofiler_builtins ]; # The bootstrap.py will generated a Makefile that then executes the build. diff --git a/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix b/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix new file mode 100644 index 000000000000..4b1358b72472 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchurl +, cmake +, pkgconfig +, libffi +, boehmgc +, openssl +, zlib +, odbcSupport ? true +, libiodbc +}: + +let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" + else if (stdenv.isLinux or stdenv.isBSD) then "LD_LIBRARY_PATH" + else throw "unsupported platform"; +in +stdenv.mkDerivation rec { + pname = "sagittarius-scheme"; + version = "0.9.6"; + src = fetchurl { + url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; + sha256 = "03nvvvfd4gdlvq244zpnikxxajp6w8jj3ymw4bcq83x7zilb2imr"; + }; + preBuild = '' + # since we lack rpath during build, need to explicitly add build path + # to LD_LIBRARY_PATH so we can load libsagittarius.so as required to + # build extensions + export ${platformLdLibraryPath}="$(pwd)/build" + ''; + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ libffi boehmgc openssl zlib ] ++ stdenv.lib.optional odbcSupport libiodbc; + + meta = with stdenv.lib; { + description = "An R6RS/R7RS Scheme system"; + longDescription = '' + Sagittarius Scheme is a free Scheme implementation supporting + R6RS/R7RS specification. + + Features: + + - Builtin CLOS. + - Common Lisp like reader macro. + - Cryptographic libraries. + - Customisable cipher and hash algorithm. + - Custom codec mechanism. + - CL like keyword lambda syntax (taken from Gauche). + - Constant definition form. (define-constant form). + - Builtin regular expression + - mostly works O(n) + - Replaceable reader + ''; + homepage = "https://bitbucket.org/ktakashi/sagittarius-scheme"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/shaderc/default.nix b/nixpkgs/pkgs/development/compilers/shaderc/default.nix index 7f4c895d85a0..75717b5ba096 100644 --- a/nixpkgs/pkgs/development/compilers/shaderc/default.nix +++ b/nixpkgs/pkgs/development/compilers/shaderc/default.nix @@ -48,10 +48,6 @@ in stdenv.mkDerivation rec { moveToOutput "lib/*.a" $static ''; - preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_BINDIR=$bin/bin"''; - - enableParallelBuilding = true; - cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/compilers/yosys/default.nix b/nixpkgs/pkgs/development/compilers/yosys/default.nix index afb1bcd5a0b0..aaa8628efbe9 100644 --- a/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub , pkgconfig, bison, flex , tcl, readline, libffi, python3 -, protobuf +, protobuf, zlib }: with builtins; stdenv.mkDerivation rec { - name = "yosys-${version}"; - version = "2019.04.23"; + pname = "yosys"; + version = "2019.08.13"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "d9daf09cf3aab202b6da058c5e959f6375a4541e"; - sha256 = "0l27r9l3fvkqhmbqqpjz1f3ny4wdh5mdc7jlnbgy6nxx6vqcmkh0"; + rev = "19d6b8846f55b4c7be705619f753bec86deadac8"; + sha256 = "185sbkxajx3k9j03n0cxq2qvzwfwdbcxp19h8vnk7ghd5y9gp602"; name = "yosys"; }) @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { (fetchFromGitHub { owner = "berkeley-abc"; repo = "abc"; - rev = "3709744c60696c5e3f4cc123939921ce8107fe04"; - sha256 = "18a9cjng3qfalq8m9az5ck1y5h4l2pf9ycrvkzs9hn82b1j7vrax"; + rev = "5776ad07e7247993976bffed4802a5737c456782"; + sha256 = "1la4idmssg44rp6hd63sd5vybvs3vr14yzvwcg03ls37p39cslnl"; name = "yosys-abc"; }) ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ tcl readline libffi python3 bison flex protobuf ]; + buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ]; makeFlags = [ "ENABLE_PROTOBUF=1" ]; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 9f58d819bb0c..8c1e1f0191c1 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -214,15 +214,19 @@ self: super: { # base bound digit = doJailbreak super.digit; + # Needs older version of QuickCheck. + these_0_7_6 = doJailbreak super.these_0_7_6; + # dontCheck: Can be removed once https://github.com/haskell-nix/hnix/commit/471712f is in (5.2 probably) # This is due to GenList having been removed from generic-random in 1.2.0.0 # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably) # This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though + # Does not support recent versions of "these". + # https://github.com/haskell-nix/hnix/issues/514 hnix = generateOptparseApplicativeCompletion "hnix" ( - dontCheck (doJailbreak (overrideCabal super.hnix (old: { - testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ]; - })))); + dontCheck (doJailbreak (super.hnix.override { these = self.these_0_7_6; })) + ); # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -706,15 +710,9 @@ 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.override { - # Needed for versions <= 1.3.1 https://github.com/idris-lang/Idris-dev/pull/4610 - megaparsec = self.megaparsec_6_5_0; - })) + doJailbreak (dontCheck super.idris) ); # https://github.com/bos/math-functions/issues/25 @@ -1224,14 +1222,14 @@ self: super: { # The latest release version is ancient. You really need this tool from git. haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { - version = "20190625-git"; + version = "20190814-git"; src = pkgs.fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "260f967c6973dfb22ecc8061a1811a2ea4b79e01"; - sha256 = "1mvn6pqa6wfcm4jxhlhm4l54pwrlgnz7vdrmkwabliwz4q0bzgqk"; + rev = "70918d80b6fd43aca7e4d00ba0d2ea116b666556"; + sha256 = "0bzp959qy74zmqq75f60rcixpjbvvyrb5a8zp2nyql3nm9vxzy5k"; }; - }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck exceptions temporary])); + }) (with self; [temporary lattices Cabal_3_0_0_0])); # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; @@ -1279,4 +1277,7 @@ self: super: { # https://github.com/sol/hpack/issues/366 hpack = dontCheck super.hpack; + # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7 + graphviz = dontCheck super.graphviz; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a8f462571f0f..89f9df7faa56 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.0 + # LTS Haskell 14.1 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -91,8 +91,8 @@ default-package-overrides: - ANum ==0.2.0.2 - aos-signature ==0.1.1 - apecs ==0.8.1 - - apecs-gloss ==0.2.1 - - apecs-physics ==0.4.0 + - apecs-gloss ==0.2.2 + - apecs-physics ==0.4.2 - api-field-json-th ==0.1.0.2 - appar ==0.1.8 - appendmap ==0.1.5 @@ -134,12 +134,12 @@ default-package-overrides: - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - - autoexporter ==1.1.13 + - autoexporter ==1.1.14 - auto-update ==0.1.6 - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 - - avro ==0.4.5.1 + - avro ==0.4.5.2 - avwx ==0.3.0.2 - aws-cloudfront-signed-cookies ==0.2.0.1 - aws-lambda-haskell-runtime ==2.0.1 @@ -203,7 +203,7 @@ default-package-overrides: - bits ==0.5.2 - bitset-word8 ==0.1.1.1 - bits-extra ==0.0.1.3 - - bitvec ==1.0.0.0 + - bitvec ==1.0.0.1 - bitx-bitcoin ==0.12.0.0 - blake2 ==0.3.0 - blas-carray ==0.1.0.1 @@ -260,7 +260,7 @@ default-package-overrides: - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.3 - bzlib ==0.5.0.5 - - bzlib-conduit ==0.3.0.1 + - bzlib-conduit ==0.3.0.2 - c2hs ==0.28.6 - Cabal ==2.4.1.0 - cabal2spec ==2.2.2.1 @@ -413,7 +413,7 @@ default-package-overrides: - crc32c ==0.0.0 - credential-store ==0.1.2 - criterion ==1.5.5.0 - - criterion-measurement ==0.1.1.0 + - criterion-measurement ==0.1.2.0 - cron ==0.6.1 - crypto-api ==0.13.3 - crypto-api-tests ==0.3 @@ -540,7 +540,7 @@ default-package-overrides: - distribution-opensuse ==1.1.1 - distributive ==0.6 - dl-fedora ==0.5 - - dlist ==0.8.0.6 + - dlist ==0.8.0.7 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.0 @@ -581,7 +581,7 @@ default-package-overrides: - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - either ==5.0.1.1 - - either-both ==0.1.0.0 + - either-both ==0.1.1.1 - ekg ==0.4.0.15 - ekg-core ==0.1.1.6 - ekg-json ==0.1.0.6 @@ -668,7 +668,7 @@ default-package-overrides: - filepattern ==0.1.1 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - - filtrable ==0.1.1.0 + - filtrable ==0.1.2.0 - fin ==0.1 - FindBin ==0.0.5 - fingertree ==0.1.4.2 @@ -852,12 +852,12 @@ default-package-overrides: - HandsomeSoup ==0.4.2 - hapistrano ==0.3.9.3 - happy ==1.19.11 - - hasbolt ==0.1.3.3 + - hasbolt ==0.1.3.4 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 - hashmap ==1.3.3 - - hashtables ==1.2.3.3 + - hashtables ==1.2.3.4 - haskeline ==0.7.5.0 - haskell-gi ==0.23.0 - haskell-gi-base ==0.23.0 @@ -893,7 +893,7 @@ default-package-overrides: - hedgehog ==1.0 - hedgehog-corpus ==0.1.0 - hedgehog-fn ==1.0 - - hedis ==0.12.6 + - hedis ==0.12.7 - hedn ==0.2.0.1 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1184,7 +1184,7 @@ default-package-overrides: - language-java ==0.2.9 - language-javascript ==0.6.0.13 - language-puppet ==1.4.5 - - lapack ==0.3.0.1 + - lapack ==0.3.1 - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.0.1 - lapack-ffi ==0.0.2 @@ -1229,7 +1229,7 @@ default-package-overrides: - lift-generics ==0.1.2 - line ==4.0.1 - linear ==1.20.9 - - linear-circuit ==0.1.0.1 + - linear-circuit ==0.1.0.2 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 @@ -1338,7 +1338,7 @@ default-package-overrides: - mmtf ==0.1.3.1 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - - modern-uri ==0.3.0.1 + - modern-uri ==0.3.1.0 - modular ==0.1.0.8 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 @@ -1509,14 +1509,14 @@ default-package-overrides: - pandoc-citeproc ==0.16.2 - pandoc-csv2table ==1.0.7 - pandoc-markdown-ghci-filter ==0.1.0.0 - - pandoc-pyplot ==2.1.4.0 + - pandoc-pyplot ==2.1.5.1 - pandoc-types ==1.17.5.4 - pantry ==0.1.1.1 - parallel ==3.2.2.0 - parallel-io ==0.3.3 - paripari ==0.6.0.0 - parseargs ==0.2.0.9 - - parsec ==3.1.13.0 + - parsec ==3.1.14.0 - parsec-class ==1.0.0.0 - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 @@ -1610,7 +1610,7 @@ default-package-overrides: - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 - - postgresql-binary ==0.12.1.2 + - postgresql-binary ==0.12.1.3 - postgresql-libpq ==0.9.4.2 - postgresql-orm ==0.5.1 - postgresql-schema ==0.1.14 @@ -1692,7 +1692,7 @@ default-package-overrides: - quickcheck-classes ==0.6.1.0 - quickcheck-instances ==0.3.22 - quickcheck-io ==0.2.0 - - quickcheck-simple ==0.1.1.0 + - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.6.0 - quickcheck-text ==0.1.2.1 @@ -1754,7 +1754,7 @@ default-package-overrides: - regex-tdfa ==1.2.3.2 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.6.2 + - registry ==0.1.7.0 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.2 @@ -1771,7 +1771,7 @@ default-package-overrides: - req-conduit ==1.0.0 - require ==0.4.2 - rerebase ==1.3.1.1 - - resistor-cube ==0.0.1.1 + - resistor-cube ==0.0.1.2 - resource-pool ==0.2.3.2 - resourcet ==1.2.2 - result ==0.2.6.0 @@ -1808,7 +1808,7 @@ default-package-overrides: - safe-json ==0.1.0 - safe-money ==0.9 - SafeSemaphore ==0.10.1 - - salak ==0.3.3 + - salak ==0.3.3.1 - salak-toml ==0.3.3 - salak-yaml ==0.3.3 - saltine ==0.1.0.2 @@ -2222,7 +2222,7 @@ default-package-overrides: - ucam-webauth ==0.1.0.0 - ucam-webauth-types ==0.1.0.0 - uglymemo ==0.1.0.1 - - unagi-chan ==0.4.1.0 + - unagi-chan ==0.4.1.2 - unbounded-delays ==0.1.1.0 - unbound-generics ==0.4.0 - unboxed-ref ==0.4.0.0 @@ -2251,7 +2251,7 @@ default-package-overrides: - universe-reverse-instances ==1.1 - universum ==1.5.0 - unix-bytestring ==0.3.7.3 - - unix-compat ==0.5.1 + - unix-compat ==0.5.2 - unix-time ==0.4.7 - unliftio ==0.2.12 - unliftio-core ==0.1.2.0 @@ -2361,7 +2361,7 @@ default-package-overrides: - windns ==0.1.0.1 - winery ==1.1.2 - wire-streams ==0.1.1.0 - - witherable ==0.3.1 + - witherable ==0.3.2 - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.3 @@ -2503,7 +2503,6 @@ extra-packages: - 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 @@ -2522,6 +2521,7 @@ extra-packages: - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x + - these == 0.7.6 # required by hnix 0.6.1 - transformers == 0.4.3.* # the latest version isn't supported by mtl yet - vector < 0.10.10 # newer versions don't work with GHC 6.12.3 - xml-conduit ^>= 1.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 @@ -3253,6 +3253,7 @@ broken-packages: - Bang - bank-holiday-usa - banwords + - barbly - barchart - barcodes-code128 - barecheck @@ -4100,7 +4101,6 @@ broken-packages: - Dao - dao - dapi - - darcs - darcs-benchmark - darcs-beta - darcs-buildpackage @@ -4832,7 +4832,6 @@ broken-packages: - fmark - FModExRaw - fn-extra - - focuslist - foldl-incremental - foldl-statistics - folds-common @@ -4944,6 +4943,7 @@ broken-packages: - functional-arrow - functor - functor-combinators + - functor-products - functorm - funflow - funflow-nix @@ -5248,7 +5248,6 @@ broken-packages: - graphql - graphql-api - graphtype - - graphviz - graql - grasp - gray-code @@ -5923,7 +5922,6 @@ broken-packages: - hmumps - hnetcdf - hnix - - hnix-store-core - hnix-store-remote - HNM - hnormalise @@ -5992,7 +5990,6 @@ broken-packages: - hp2any-core - hp2any-graph - hp2any-manager - - hpack - hpack-convert - hpack-dhall - hpaco @@ -6239,7 +6236,6 @@ broken-packages: - http-conduit-browser - http-directory - http-dispatch - - http-download - http-enumerator - http-grammar - http-kinder @@ -6370,7 +6366,6 @@ broken-packages: - identifiers - idiii - idna2008 - - idris - IDynamic - ieee-utils - iexcloud @@ -6581,7 +6576,6 @@ broken-packages: - join-api - joinlist - jonathanscard - - jose - jpeg - js-good-parts - jsaddle-hello @@ -7614,6 +7608,7 @@ broken-packages: - Nomyx-Web - non-empty-zipper - NonEmpty + - nonempty-lift - NonEmptyList - normalization-insensitive - NoSlow @@ -7794,7 +7789,6 @@ broken-packages: - pang-a-lambda - pangraph - panpipe - - pantry - pantry-tmp - papa-export - papa-implement @@ -8534,6 +8528,7 @@ broken-packages: - rfc-servant - rg - rhythm-game-tutorial + - rib - RichConditional - ridley - ridley-extras @@ -8769,7 +8764,6 @@ broken-packages: - servant-aeson-specs - servant-auth-cookie - servant-auth-hmac - - servant-auth-server - servant-auth-token - servant-auth-token-acid - servant-auth-token-api @@ -9108,6 +9102,7 @@ broken-packages: - sparrow - sparse - sparse-lin-alg + - sparse-tensor - sparsebit - sparsecheck - sparser @@ -9396,6 +9391,7 @@ broken-packages: - taglib-api - tagsoup-ht - tagsoup-megaparsec + - tagsoup-navigate - tagsoup-parsec - tagsoup-selection - tai64 @@ -9415,11 +9411,9 @@ broken-packages: - task-distribution - taskell - tasty-auto - - tasty-discover - tasty-fail-fast - tasty-groundhog-converters - tasty-hedgehog-coverage - - tasty-hspec - tasty-integrate - tasty-jenkins-xml - tasty-laws @@ -9468,7 +9462,6 @@ broken-packages: - terminal-punch - terminal-text - termination-combinators - - termonad - termplot - terntup - terrahs @@ -9618,7 +9611,6 @@ broken-packages: - tokyotyrant-haskell - tomato-rubato-openal - toml - - tomland - tomlcheck - too-many-cells - toodles @@ -10294,6 +10286,7 @@ broken-packages: - yate - yavie - yaya + - yaya-hedgehog - yaya-unsafe - ycextra - yeller diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index b5f1db71e317..29483b56a7db 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -95,6 +95,7 @@ self: super: builtins.intersectAttrs super { sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; cachix = enableSeparateBinOutput super.cachix; + ghcid = enableSeparateBinOutput super.ghcid; hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; @@ -530,10 +531,6 @@ self: super: builtins.intersectAttrs super { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; })); - # Doctests hang only when compiling with nix. - # https://github.com/cdepillabout/termonad/issues/15 - termonad = dontCheck super.termonad; - # Expects z3 to be on path so we replace it with a hard sbv = overrideCabal super.sbv (drv: { postPatch = '' diff --git a/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix b/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix index 184d45eda445..96774f71730f 100644 --- a/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -2,6 +2,7 @@ , cacert, stack, makeSetupHook, lib }@depArgs: { buildInputs ? [] +, nativeBuildInputs ? [] , extraArgs ? [] , LD_LIBRARY_PATH ? [] , ghc ? depArgs.ghc @@ -22,7 +23,8 @@ in stdenv.mkDerivation (args // { buildInputs = buildInputs ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; - nativeBuildInputs = [ ghc pkgconfig stack stackHook ]; + nativeBuildInputs = nativeBuildInputs + ++ [ ghc pkgconfig stack stackHook ]; STACK_PLATFORM_VARIANT = "nix"; STACK_IN_NIX_SHELL = 1; diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index e1c70c608ddd..fd6d5744686f 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -10741,6 +10741,20 @@ self: { broken = true; }) {}; + "I1M" = callPackage + ({ mkDerivation, array, base, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "I1M"; + version = "0.0.2"; + sha256 = "0f9pl46m05izxhychf7j8pd9rfx8bqw13735xvq602iyszng8pa4"; + libraryHaskellDepends = [ array base QuickCheck ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + description = "Code for the Haskell course taught at the University of Seville"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "IDynamic" = callPackage ({ mkDerivation, base, containers, directory }: mkDerivation { @@ -12677,24 +12691,20 @@ self: { }) {}; "Map" = callPackage - ({ mkDerivation, base, containers, either-both, filtrable, map + ({ mkDerivation, base, containers, either-both, filtrable , smallcheck, tasty, tasty-smallcheck, util }: mkDerivation { pname = "Map"; - version = "0.0.0.0"; - sha256 = "1w79zzlzh3ivrqznvcrg5kgaizzs838y7hd52nvxn5v7lax5y3wz"; + version = "0.0.1.1"; + sha256 = "0m7654arnnm19assm0fvjm3m6jrq6pn54f9pqvcn09h6vawsbyza"; libraryHaskellDepends = [ base containers either-both filtrable util ]; - testHaskellDepends = [ - base map smallcheck tasty tasty-smallcheck - ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Class of key-value maps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {map = null;}; + }) {}; "Mapping" = callPackage ({ mkDerivation, base }: @@ -13281,8 +13291,8 @@ self: { ({ mkDerivation, ansi-terminal, base, doctest, time }: mkDerivation { pname = "Monadoro"; - version = "0.2.1.1"; - sha256 = "0f7swjf5lr7w7gld46l74plc2x79v6dbq5zmsglpk1x8k7vpfj79"; + version = "0.2.1.5"; + sha256 = "1k4f7ks0cbyqz2g6y5kdzrlbx2j3xz7mrvj79k2m3lbhs4hcik6l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base time ]; @@ -15262,8 +15272,8 @@ self: { }: mkDerivation { pname = "Persistence"; - version = "2.0.1"; - sha256 = "1qv35q7y7sl142dxdaf7647g62xr76b4blij0yn9x5694qm9r80v"; + version = "2.0.3"; + sha256 = "19zzggnzdfdvvp0svixpdrnxpjn5h4wgpi01vkjydczq4630aiaa"; libraryHaskellDepends = [ base containers maximal-cliques parallel vector ]; @@ -16662,6 +16672,24 @@ self: { broken = true; }) {}; + "S3" = callPackage + ({ mkDerivation, base, base-encoding, bytestring, cryptohash-md5 + , cryptohash-sha1, cryptohash-sha256, deepseq, hashable + , http-io-streams, io-streams, Prelude, text, text-short, time, X + }: + mkDerivation { + pname = "S3"; + version = "0.1.0.0"; + sha256 = "0z59h36qnb1vvshqik3f1ai3a3frnmzzxdcmkbbh3x6flnih7r0a"; + libraryHaskellDepends = [ + base base-encoding bytestring cryptohash-md5 cryptohash-sha1 + cryptohash-sha256 deepseq hashable http-io-streams io-streams + Prelude text text-short time X + ]; + description = "Library for accessing S3 compatible storage services"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "SBench" = callPackage ({ mkDerivation, base, bytestring, cassava, criterion, deepseq , directory, filepath, gnuplot, hp2any-core, parsec, process @@ -28743,8 +28771,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "7.2.2"; - sha256 = "1a5mp3s22qv41p9cgiyz6gc96kwz9f9wwx8v4dr1jjgslmlik4m1"; + version = "7.3.0"; + sha256 = "1ixrpfc1yrvzigv5mid12s9yill5x0yvr5xfzwl9plm9jpzjjvv9"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28763,8 +28791,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.2.2"; - sha256 = "188p6b4mzj513ylkjlf9z3cra6qdv6x0ar4fc1hjs1waggng0b9d"; + version = "7.3.0"; + sha256 = "0alg9nfwgyrvwxi8syrarqhf8din9dayvvll2078zl82r1x8hmgb"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28782,8 +28810,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.2.2"; - sha256 = "0j27bd5f9zkx0qhsl9zam7rzvprcb5075rm174gr77gmf4lqraaa"; + version = "7.3.0"; + sha256 = "0x2lz5ljxdd2d0fv3srn6v6az1dacb83n16fshnm27z9vgnzvfjc"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28808,8 +28836,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.2.2"; - sha256 = "19a41njxa09sf1qlc9zmy65nmwp02lcn0q0dk5gwqkpmjjf5ah3s"; + version = "7.3.0"; + sha256 = "04izlg44mz7xv529q2m6j47hcxfca1zrk1fl11rcixdfi3iwfmvf"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28832,8 +28860,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.2.2"; - sha256 = "0vdp8kkqv4g3lkjvwhg4yyb8rjwphjp4gjmx0b6910jwizhslqwf"; + version = "7.3.0"; + sha256 = "13mm39hbwmlhg1qv61nv0rs6kvw784k2ynrfd9yi1zlr5zycgwlm"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28855,8 +28883,8 @@ self: { }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.2.2"; - sha256 = "006jr3kdyvfzyabxr4zc4kf9sm8pkaca572whdxwpnfpz0m54k0j"; + version = "7.3.0"; + sha256 = "1qgd4mb99vpjswxca6l10ghg3d63vlqj3wc87afdcddfwa50f1zr"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28879,8 +28907,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.2.2"; - sha256 = "14lmkkr86n8h7iqkjvc5sxmccxi3fv97kgljb8m8fl35fxcwd1j8"; + version = "7.3.0"; + sha256 = "03qkvaz95qfqrildz92qhrnrny4i00p2l89j5p7miwxbdfzy7ga9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -28906,8 +28934,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "7.2.2"; - sha256 = "10wbf6pmws8gway4i7z55z7xi2az5xzb65yj0q1qc86vxbchnxkk"; + version = "7.3.0"; + sha256 = "066ryids04k0sixn9yf0h70jfj55z2g2xkrpqhxnr54sk2jr4njy"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -28932,8 +28960,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "7.2.2"; - sha256 = "0qjnwrc23zav84s4ffqi2g97yrfpkxmzm981ik6h5fsi7f6wzj0n"; + version = "7.3.0"; + sha256 = "1nhs4v0h0hqjv6ncfy1wpsdsxkbbb0gz45rhf8swm8h2zfv9rqxl"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri split text @@ -28956,8 +28984,8 @@ self: { }: mkDerivation { pname = "antiope-swf"; - version = "7.2.2"; - sha256 = "1shw4sw0nfrkdcjjin3nq63igfalywz03w171v5knn2kx6xwf4yy"; + version = "7.3.0"; + sha256 = "1jqhq0ifdv8dqsnqsyb814nqq987fvng04gg8sbz5cjds7nm1c0m"; libraryHaskellDepends = [ amazonka-swf base lens text ]; testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; @@ -29199,21 +29227,6 @@ self: { }: mkDerivation { pname = "apecs-gloss"; - version = "0.2.1"; - sha256 = "0v1nagzwhb1l9wfjl4yp3ymbhbpjcrwrih2y8cxkzws5wxgbbnvg"; - libraryHaskellDepends = [ - apecs apecs-physics base containers gloss linear - ]; - description = "Simple gloss renderer for apecs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "apecs-gloss_0_2_2" = callPackage - ({ mkDerivation, apecs, apecs-physics, base, containers, gloss - , linear - }: - mkDerivation { - pname = "apecs-gloss"; version = "0.2.2"; sha256 = "0p8r8hraqa49f13p045j54kzyrcvgscppgqllwnqgdx0in8j71cf"; libraryHaskellDepends = [ @@ -29221,7 +29234,6 @@ self: { ]; description = "Simple gloss renderer for apecs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apecs-physics" = callPackage @@ -29230,8 +29242,8 @@ self: { }: mkDerivation { pname = "apecs-physics"; - version = "0.4.0"; - sha256 = "0yqylgsl2n0fsb73qdvl1iinazfzzx64683jp37sr2dm8jpys3lc"; + version = "0.4.2"; + sha256 = "0jqylv937c4y4jygqyb127n9lvvmss52pz7rcwq7x3qc3k5mwgnh"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector @@ -29240,14 +29252,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "apecs-physics_0_4_2" = callPackage + "apecs-physics_0_4_3" = callPackage ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear , template-haskell, vector }: mkDerivation { pname = "apecs-physics"; - version = "0.4.2"; - sha256 = "0jqylv937c4y4jygqyb127n9lvvmss52pz7rcwq7x3qc3k5mwgnh"; + version = "0.4.3"; + sha256 = "1d1dq50r5hqq3551abn82i35qaq62gsk04h6vzwhi01jrfkjxyxr"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector @@ -30354,8 +30366,8 @@ self: { }: mkDerivation { pname = "arbor-postgres"; - version = "0.0.3"; - sha256 = "18rqy2zyaf5cawn8dkn3xmjh19zzqgwj6mkk415x5a4p53dya46b"; + version = "0.0.4"; + sha256 = "0z3n2w9a57sl24i7h4yz8204drwkgr54pr2yrjam4xs3dyx6irf4"; libraryHaskellDepends = [ base bytestring generic-lens lens network-uri optparse-applicative postgresql-simple text @@ -30945,6 +30957,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "array-chunks" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "array-chunks"; + version = "0.1.0.0"; + sha256 = "15x8l8m953ws3253zvxg4q0q0qqcc34wawijnzmq87y39g9ghlag"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes tasty tasty-hunit + tasty-quickcheck + ]; + description = "Lists of chunks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "array-forth" = callPackage ({ mkDerivation, array, base, HUnit, mcmc-synthesis , modular-arithmetic, MonadRandom, OddWord, QuickCheck, split @@ -32670,8 +32699,8 @@ self: { pname = "attoparsec"; version = "0.13.2.2"; sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx"; - revision = "3"; - editedCabalFile = "1birva836xdp92lf1v5yrs8lj3bgj9vnarrfh2ssfxxacqj1gjji"; + revision = "4"; + editedCabalFile = "1vz6jz7cwd80sryabpa99hccamgccjf2l7907wjblbs7dy66a8cb"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -33301,8 +33330,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.13"; - sha256 = "05mgvif7wiq0vplk92kp8qn4a5wfma1gwdihqlz5lspmczszpdkv"; + version = "1.1.14"; + sha256 = "0ijykr8qg7ijadlkn0gx3n06n14ihar8dvaddmmaab2awpmaa3l8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -33658,8 +33687,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.4.5.1"; - sha256 = "1a7ykj2c8bk7y8iaac1076sp4c4qzxh37d97w0xv63srmy7l1r8s"; + version = "0.4.5.2"; + sha256 = "0cy2r8jrnyxwsxpd6mah4g56xh8n93f6gd613a4bwg8kqvykrpgq"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail hashable mtl scientific @@ -33670,13 +33699,13 @@ self: { aeson array base base16-bytestring bifunctors binary bytestring containers directory extra fail hashable hspec lens lens-aeson mtl pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged - template-haskell text tf-random transformers unordered-containers - vector + text tf-random transformers unordered-containers vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ aeson base bytestring containers gauge hashable mtl random - raw-strings-qq text transformers unordered-containers vector + raw-strings-qq template-haskell text transformers + unordered-containers vector ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -34829,6 +34858,29 @@ self: { broken = true; }) {}; + "backprop_0_2_6_3" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, directory + , hmatrix, microlens, microlens-th, mwc-random, primitive + , reflection, time, transformers, vector, vinyl + }: + mkDerivation { + pname = "backprop"; + version = "0.2.6.3"; + sha256 = "0zk3k20c100iwqcvg1xw2vdysn01w4h9jypz08xs849n1a3bp7di"; + libraryHaskellDepends = [ + base containers deepseq microlens primitive reflection transformers + vector vinyl + ]; + benchmarkHaskellDepends = [ + base criterion deepseq directory hmatrix microlens microlens-th + mwc-random time vector + ]; + description = "Heterogeneous automatic differentation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "backstop" = callPackage ({ mkDerivation, base, directory, filepath, HUnit, mtl, process , QuickCheck, unix @@ -35196,6 +35248,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "barbly" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring, mtl + , optparse-applicative, shh, text + }: + mkDerivation { + pname = "barbly"; + version = "0.1.0.0"; + sha256 = "1mmbvgw5g2jb8qv7vd00iym9xyb07jx03wi6x1ldqvzfn2vcc22l"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base bytestring mtl optparse-applicative shh + text + ]; + description = "Create status bar menus for macOS from executables"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "barchart" = callPackage ({ mkDerivation, base, cmdargs, csv, diagrams, filepath }: mkDerivation { @@ -39062,8 +39134,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.4.4"; - sha256 = "04pw1znsv7gm1qkdvb65kh4x0d8na590ks7437dymzy9h75m6mvj"; + version = "0.1.4.5"; + sha256 = "1yyb897yg2ipvz6jsc6np1jwlckyi41jq94dwxlpyj2sigawzvwh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39797,24 +39869,6 @@ self: { }) {}; "bitvec" = callPackage - ({ mkDerivation, base, gauge, ghc-prim, primitive - , quickcheck-classes, tasty, tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "bitvec"; - version = "1.0.0.0"; - sha256 = "0m33q70h513iiiwv7w45p4zz7jkf00p5kjy9x3ds6y2rk4di4vl2"; - libraryHaskellDepends = [ base ghc-prim primitive vector ]; - testHaskellDepends = [ - base primitive quickcheck-classes tasty tasty-hunit - tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ base gauge vector ]; - description = "Unboxed bit vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bitvec_1_0_0_1" = callPackage ({ mkDerivation, base, containers, gauge, ghc-prim, primitive , quickcheck-classes, random, tasty, tasty-hunit, tasty-quickcheck , vector @@ -39833,7 +39887,6 @@ self: { benchmarkHaskellDepends = [ base containers gauge random vector ]; description = "Space-efficient bit vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitwise" = callPackage @@ -41547,8 +41600,8 @@ self: { }: mkDerivation { pname = "boots-app"; - version = "0.1.0.3"; - sha256 = "0sgd5girr559plpd055xc8zixwmmfdlq2mrcm3vkwsr1djr5wi95"; + version = "0.1.0.5"; + sha256 = "0dx2nlbf86nbqfrxaacjskammx84bg4nrp5v075h76b9mky00i5l"; libraryHaskellDepends = [ base boots data-default exceptions fast-logger menshen microlens monad-logger mtl salak salak-yaml splitmix text unliftio-core vault @@ -43167,30 +43220,30 @@ self: { broken = true; }) {}; - "bulletproofs_1_0_0" = callPackage + "bulletproofs_1_0_1" = callPackage ({ mkDerivation, arithmoi, base, containers, criterion, cryptonite - , galois-field, memory, MonadRandom, pairing, protolude, QuickCheck + , galois-field, memory, MonadRandom, protolude, QuickCheck , random-shuffle, tasty, tasty-discover, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "bulletproofs"; - version = "1.0.0"; - sha256 = "1q1d8bj8hh2ik4arrgqrkhk4gwirvabfiw8mbazmpgvir8yv19s0"; + version = "1.0.1"; + sha256 = "1c23dppl851a1ga9x8axkl27bswb0hlwql0mfabsd9ydclmipzf0"; libraryHaskellDepends = [ arithmoi base containers cryptonite galois-field memory MonadRandom - pairing protolude QuickCheck random-shuffle text + protolude QuickCheck random-shuffle text ]; testHaskellDepends = [ arithmoi base containers cryptonite galois-field memory MonadRandom - pairing protolude QuickCheck random-shuffle tasty tasty-discover + protolude QuickCheck random-shuffle tasty tasty-discover tasty-hunit tasty-quickcheck text ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ arithmoi base containers criterion cryptonite galois-field memory - MonadRandom pairing protolude QuickCheck random-shuffle tasty - tasty-hunit tasty-quickcheck text + MonadRandom protolude QuickCheck random-shuffle tasty tasty-hunit + tasty-quickcheck text ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -44193,32 +44246,6 @@ self: { }: mkDerivation { pname = "bzlib-conduit"; - version = "0.3.0.1"; - sha256 = "0fd2hnr782s7qgipazg2yxwia9qqhkvm9bcm90773c3zkxa13n23"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bindings-DSL bytestring conduit data-default-class mtl - resourcet - ]; - librarySystemDepends = [ bzip2 ]; - testHaskellDepends = [ - base bindings-DSL bytestring conduit data-default-class hspec mtl - random resourcet - ]; - benchmarkHaskellDepends = [ - base bindings-DSL bytestring conduit data-default-class mtl - resourcet - ]; - description = "Streaming compression/decompression via conduits"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) bzip2;}; - - "bzlib-conduit_0_3_0_2" = callPackage - ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit - , data-default-class, hspec, mtl, random, resourcet - }: - mkDerivation { - pname = "bzlib-conduit"; version = "0.3.0.2"; sha256 = "0a21zin5plsl37hkxh2jv8cxwyjrbs2fy7n5cyrzgdaa7lmp6b7b"; enableSeparateDataOutput = true; @@ -44237,7 +44264,6 @@ self: { ]; description = "Streaming compression/decompression via conduits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) bzip2;}; "c-dsl" = callPackage @@ -49720,6 +49746,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chronos_1_0_7" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clock + , criterion, deepseq, doctest, hashable, HUnit, old-locale + , primitive, QuickCheck, semigroups, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, thyme + , time, torsor, vector + }: + mkDerivation { + pname = "chronos"; + version = "1.0.7"; + sha256 = "0yqk43ax20sk3rpxd5s857ivbgigvd5qdq4axawzmqr2na6jlikx"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock hashable primitive + semigroups text torsor vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text torsor + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq old-locale QuickCheck + text thyme time vector + ]; + description = "A performant time library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "chronos-bench" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , containers, deepseq, optparse-applicative, process, terminal-size @@ -50768,30 +50822,31 @@ self: { }) {}; "classify-frog" = callPackage - ({ mkDerivation, array, audacity, base, bifunctors, Cabal, carray + ({ mkDerivation, array, audacity, base, bifunctors, carray , comfort-array, concurrent-split, containers, deepseq , explicit-exception, fft, filemanip, gnuplot, hmm-lapack, lapack , lazy-csv, llvm-extra, llvm-tf, non-empty, numeric-prelude , optparse-applicative, parallel, pathtype, pooled-io, semigroups - , soxlib, storable-record, storablevector, storablevector-carray - , synthesizer-core, synthesizer-llvm, tagchup, text, time - , transformers, utility-ht, xml-basic + , shell-utility, soxlib, storable-record, storablevector + , storablevector-carray, synthesizer-core, synthesizer-llvm + , tagchup, text, time, transformers, utility-ht, xml-basic }: mkDerivation { pname = "classify-frog"; - version = "0.2.4.2"; - sha256 = "1q1jr4q1a27wscznrkr04fxlaac2xp7l02rzspmf8bpkadfp3wfw"; + version = "0.2.4.3"; + sha256 = "0pba3a2vj9s5x8mm878q8vl0a57vrm2c4s79n0vc2pggbkb6dybc"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - array audacity base bifunctors Cabal carray comfort-array + array audacity base bifunctors carray comfort-array concurrent-split containers deepseq explicit-exception fft filemanip gnuplot hmm-lapack lapack lazy-csv llvm-extra llvm-tf non-empty numeric-prelude optparse-applicative parallel pathtype - pooled-io semigroups soxlib storable-record storablevector - storablevector-carray synthesizer-core synthesizer-llvm tagchup - text time transformers utility-ht xml-basic + pooled-io semigroups shell-utility soxlib storable-record + storablevector storablevector-carray synthesizer-core + synthesizer-llvm tagchup text time transformers utility-ht + xml-basic ]; description = "Classify sounds produced by Xenopus laevis"; license = stdenv.lib.licenses.bsd3; @@ -55151,8 +55206,8 @@ self: { }: mkDerivation { pname = "concurrent-dns-cache"; - version = "0.1.2"; - sha256 = "1hczxqvlnp5nxcx3mdpv9cm7mv66823jhyw9pibfklpy94syiz5a"; + version = "0.1.3"; + sha256 = "1qq8zj39sw1jl44v3midxv0xnmn5p5v6k4j8a2s5cgkjimdwwbz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59424,21 +59479,6 @@ self: { }: mkDerivation { pname = "criterion-measurement"; - version = "0.1.1.0"; - sha256 = "0mmbhajphlg32gqxr1lf0w12jkw0qrpjabvx92zpv4ka71lpgy7m"; - libraryHaskellDepends = [ - aeson base base-compat binary containers deepseq vector - ]; - description = "Criterion measurement functionality and associated types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion-measurement_0_1_2_0" = callPackage - ({ mkDerivation, aeson, base, base-compat, binary, containers - , deepseq, vector - }: - mkDerivation { - pname = "criterion-measurement"; version = "0.1.2.0"; sha256 = "03p71mfnnfjx9dnf0yhrhdcr30zc2nwn5f8lql48cabccpd3793l"; libraryHaskellDepends = [ @@ -59446,7 +59486,6 @@ self: { ]; description = "Criterion measurement functionality and associated types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-plus" = callPackage @@ -60976,6 +61015,26 @@ self: { broken = true; }) {}; + "cuckoo" = callPackage + ({ mkDerivation, base, bytestring, criterion, cryptonite, hashable + , memory, primitive, QuickCheck, random, stopwatch, vector + }: + mkDerivation { + pname = "cuckoo"; + version = "0.1.0.0"; + sha256 = "0riij9hqszpaw1hnn3hk7bakc2qqj29n86wpl0ajcz4gv91pd16q"; + libraryHaskellDepends = [ base memory primitive random vector ]; + testHaskellDepends = [ + base bytestring cryptonite hashable memory stopwatch + ]; + benchmarkHaskellDepends = [ + base bytestring criterion memory QuickCheck stopwatch + ]; + doHaddock = false; + description = "Haskell Implementation of Cuckoo Filters"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cuckoo-filter" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cereal, containers , criterion, hashable, QuickCheck, random, tasty, tasty-hunit @@ -61355,12 +61414,12 @@ self: { }) {}; "cursor-brick" = callPackage - ({ mkDerivation, base, brick, cursor }: + ({ mkDerivation, base, brick, cursor, text }: mkDerivation { pname = "cursor-brick"; - version = "0.0.0.0"; - sha256 = "1cbby07x8d8pr3j07s9hl78xx8zd2va4g06xjb2qkjd2ffs705gb"; - libraryHaskellDepends = [ base brick cursor ]; + version = "0.1.0.0"; + sha256 = "018i8yrdcj69qf00vz1sx7is5cx1a7vn5b8kr9b226n7vxlr3nzd"; + libraryHaskellDepends = [ base brick cursor text ]; license = stdenv.lib.licenses.mit; }) {}; @@ -61840,8 +61899,6 @@ self: { ''; description = "a distributed, interactive, smart revision control system"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) curl;}; "darcs-benchmark" = callPackage @@ -65428,6 +65485,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "decidable_0_2_0_0" = callPackage + ({ mkDerivation, base, functor-products, microlens, singletons + , vinyl + }: + mkDerivation { + pname = "decidable"; + version = "0.2.0.0"; + sha256 = "1b0mnkgk60qm84wim9lq6hlgm2ijxjx0s4gahvd5fjkccdryz2h2"; + libraryHaskellDepends = [ + base functor-products microlens singletons vinyl + ]; + description = "Combinators for manipulating dependently-typed predicates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "decimal-arithmetic" = callPackage ({ mkDerivation, base, binary, binary-bits, deepseq, doctest, hspec , mtl, QuickCheck @@ -70566,27 +70639,12 @@ self: { ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; - version = "0.8.0.6"; - sha256 = "0gy70df86pfmqwbmnafdw2w5jnflvn5mca8npxzfg23f3p4ll2vq"; - revision = "1"; - editedCabalFile = "0f3r78gjdrhg5zg693dgdfx78ds6vbp5bg1sws1y1vbamraa65sf"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dlist_0_8_0_7" = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: - mkDerivation { - pname = "dlist"; version = "0.8.0.7"; sha256 = "0b5spkzvj2kx8pk86xz0djkxs13j7dryf5fl16dk4mlp1wh6mh53"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dlist-instances" = callPackage @@ -74411,34 +74469,17 @@ self: { }) {}; "either-both" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck }: mkDerivation { pname = "either-both"; - version = "0.1.0.0"; - sha256 = "1lbvahbbmhz6cazl5s4wkf66h1l20cg7380g027h53v5pjpvpdpl"; + version = "0.1.1.1"; + sha256 = "1cm6g0wvwqlm405y8svv2fi49kpxqs7hffwd4gnsvlk2rfxng93f"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Either or both"; license = stdenv.lib.licenses.bsd3; }) {}; - "either-both_0_1_1_0" = callPackage - ({ mkDerivation, base, either-prime, smallcheck, tasty - , tasty-smallcheck - }: - mkDerivation { - pname = "either-both"; - version = "0.1.1.0"; - sha256 = "1dcr4pygk86rks764xcgfp8l6y3c11ycz0xaibxj00hy2zijzg8k"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base either-prime smallcheck tasty tasty-smallcheck - ]; - description = "Either or both"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {either-prime = null;}; - "either-list-functions" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -74873,6 +74914,31 @@ self: { broken = true; }) {}; + "elliptic-curve" = callPackage + ({ mkDerivation, arithmoi, base, criterion, galois-field + , MonadRandom, protolude, tasty, tasty-hunit, tasty-quickcheck + , text, wl-pprint-text + }: + mkDerivation { + pname = "elliptic-curve"; + version = "0.2.2"; + sha256 = "082q01xqfqa73c0wasmh8v0hgf76gsfg8jzd78n9vgrp69zali1n"; + libraryHaskellDepends = [ + base galois-field MonadRandom protolude tasty-quickcheck text + wl-pprint-text + ]; + testHaskellDepends = [ + arithmoi base galois-field MonadRandom protolude tasty tasty-hunit + tasty-quickcheck text wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base criterion galois-field MonadRandom protolude tasty-quickcheck + text wl-pprint-text + ]; + description = "Elliptic curve library"; + license = stdenv.lib.licenses.mit; + }) {}; + "elm-bridge" = callPackage ({ mkDerivation, aeson, base, containers, hspec, QuickCheck , template-haskell, text @@ -76249,6 +76315,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "enumset_0_0_5" = callPackage + ({ mkDerivation, base, data-accessor, semigroups, storable-record + }: + mkDerivation { + pname = "enumset"; + version = "0.0.5"; + sha256 = "0d9lnl7mmcwydfhb4iazh6gcdbxvdh7b3gar3c9l1k5xmc4r8qii"; + libraryHaskellDepends = [ + base data-accessor semigroups storable-record + ]; + description = "Sets of enumeration values represented by machine words"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "env-locale" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -79119,8 +79200,8 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.1"; - sha256 = "0zx5wdrw506lb3himzbyr7bgw4l12fmn9rbl0w95njrgm67h6667"; + version = "0.1.2"; + sha256 = "0i6dh1kpadhh4faanmkszdq1bbsdyl2ngbyrwv7pb8kb3wqc4y6y"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -80064,6 +80145,27 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-builder_0_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, process, QuickCheck, scientific, stm + , template-haskell, text, true-name, unordered-containers, vector + }: + mkDerivation { + pname = "fast-builder"; + version = "0.1.1.0"; + sha256 = "024n5q1zsmd1va662sjdnc42w4qj6pmqg64fsfcn0jx5zvmg62d9"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring process QuickCheck stm ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion deepseq ghc-prim + scientific template-haskell text true-name unordered-containers + vector + ]; + description = "Fast ByteString Builder"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-combinatorics" = callPackage ({ mkDerivation, base, Cabal, composition-prelude, criterion , directory, hspec, http-client, http-client-tls, tar, zlib @@ -82190,23 +82292,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "filtrable"; - version = "0.1.1.0"; - sha256 = "0g1ngsbxrydbwa637sk8zvpvygppr6abj9hh87maf56ily4ki9fn"; - libraryHaskellDepends = [ base ]; - description = "Class of filtrable containers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "filtrable_0_1_2_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "filtrable"; version = "0.1.2.0"; sha256 = "1bgy3pydi7paiia63kygrg7fjjs7fm73jqfmlmw4szcbjmv8xq8k"; libraryHaskellDepends = [ base ]; description = "Class of filtrable containers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fin" = callPackage @@ -84227,8 +84317,6 @@ self: { ]; description = "Lists with a focused element"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fold-debounce" = callPackage @@ -87257,6 +87345,19 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "functor-products" = callPackage + ({ mkDerivation, base, microlens, singletons, text, vinyl }: + mkDerivation { + pname = "functor-products"; + version = "0.1.0.0"; + sha256 = "18yxsqah4afyvhcgi9fp6zmn511kgnw8cx02ig2kaypl2j4bnsxp"; + libraryHaskellDepends = [ base microlens singletons text vinyl ]; + description = "General functor products for various Foldable instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "functor-utils" = callPackage ({ mkDerivation, base, ghc-prim, lens }: mkDerivation { @@ -87905,15 +88006,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "galois-field_0_4_0" = callPackage + "galois-field_0_4_1" = callPackage ({ mkDerivation, base, criterion, integer-gmp, MonadRandom, poly , protolude, semirings, tasty, tasty-quickcheck, vector , wl-pprint-text }: mkDerivation { pname = "galois-field"; - version = "0.4.0"; - sha256 = "087mvqbp18ak9wgih3sxjp210pjw7rka9x1vjmsivk15ppm17zsz"; + version = "0.4.1"; + sha256 = "1q577m518gb3q7z7l84pf2ghw786p86sjx7b5mr3xhrvplwdvhcl"; libraryHaskellDepends = [ base integer-gmp MonadRandom poly protolude semirings tasty-quickcheck vector wl-pprint-text @@ -93240,6 +93341,26 @@ self: { inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; + "git-brunch" = callPackage + ({ mkDerivation, base, brick, microlens, process, vector, vty }: + mkDerivation { + pname = "git-brunch"; + version = "1.0.4.0"; + sha256 = "1ss2axjwjx7pqx9dq7mxhbnn43k1g1zj7n54f2xq7zwq2ngd5x8f"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base brick microlens process vector vty + ]; + executableHaskellDepends = [ + base brick microlens process vector vty + ]; + testHaskellDepends = [ base brick microlens process vector vty ]; + doHaddock = false; + description = "git checkout command-line tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "git-checklist" = callPackage ({ mkDerivation, base, directory, filepath, optparse-applicative , parsec, pretty, process @@ -93891,8 +94012,8 @@ self: { }: mkDerivation { pname = "githud"; - version = "3.0.1"; - sha256 = "12ilxa52yib3ck80mr7djy59pzszb2l73npmpygcdwpcy46jq4p8"; + version = "3.1.0"; + sha256 = "0shdb3a73w0n0p9pl0j7gmsqjwvniah3l251cgn27sp1cm33li8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93904,7 +94025,7 @@ self: { base daemons mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; - description = "More efficient replacement to the great git-radar"; + description = "Heads up, and you see your GIT context"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -99164,8 +99285,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.4.0.0"; - sha256 = "03y8wn0a1zbrsl3i5g5zy5awmlgsncnksskd4gcx8wzfl14120g0"; + version = "0.5.0.0"; + sha256 = "01466hfw3mkiz557r5ch3rn01w6wys38n580hdqmkhsqysgsqzqa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base megaparsec text transformers unordered-containers @@ -99289,8 +99410,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) graphviz;}; "graql" = callPackage @@ -105553,28 +105672,6 @@ self: { "hasbolt" = callPackage ({ mkDerivation, base, binary, bytestring, connection, containers - , data-binary-ieee754, data-default, hex, hspec, network - , QuickCheck, text, transformers - }: - mkDerivation { - pname = "hasbolt"; - version = "0.1.3.3"; - sha256 = "1l1p9iz9k8i1car5cd6cfd2bpidkrfbr2354hxvg8gpnw1i5jsbb"; - revision = "1"; - editedCabalFile = "0v4ksld4qs1ll5a5c6x5kvrcb584yskhbda7zv9r9lrqvcsjwg5i"; - libraryHaskellDepends = [ - base binary bytestring connection containers data-binary-ieee754 - data-default network text transformers - ]; - testHaskellDepends = [ - base bytestring containers hex hspec QuickCheck text - ]; - description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hasbolt_0_1_3_4" = callPackage - ({ mkDerivation, base, binary, bytestring, connection, containers , data-binary-ieee754, data-default, hex, hspec, mtl, network , QuickCheck, text }: @@ -105591,7 +105688,6 @@ self: { ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasbolt-extras" = callPackage @@ -106091,19 +106187,6 @@ self: { ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { pname = "hashtables"; - version = "1.2.3.3"; - sha256 = "00rp3844z2kan1mdhxb8iw39hhjpirv6mhnwc32byfqjsvx8a3ny"; - libraryHaskellDepends = [ - base ghc-prim hashable primitive vector - ]; - description = "Mutable hash tables in the ST monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hashtables_1_2_3_4" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: - mkDerivation { - pname = "hashtables"; version = "1.2.3.4"; sha256 = "1rjmxnr30g4hygiywkpz5p9sanh0abs7ap4zc1kgd8zv04kycp0j"; libraryHaskellDepends = [ @@ -106111,7 +106194,6 @@ self: { ]; description = "Mutable hash tables in the ST monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashtables-plus" = callPackage @@ -109219,8 +109301,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.16.6"; - sha256 = "03214p8xqf062grgpkbfchrm4awm0zrq41j77z8s31iin9d0qzp9"; + version = "0.17.1"; + sha256 = "19vzwxy27xkkkx3lmq554kkyh6iclrxdhbp901vb0rh9v8l3cc74"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112352,21 +112434,21 @@ self: { }) {}; "hedgehog-classes" = callPackage - ({ mkDerivation, aeson, base, binary, containers, hedgehog + ({ mkDerivation, aeson, base, binary, comonad, containers, hedgehog , pretty-show, semirings, silently, transformers , wl-pprint-annotated }: mkDerivation { pname = "hedgehog-classes"; - version = "0.2.2"; - sha256 = "072w697nc7dv9yi700g5ap4h49ichpw1srzkq07sz637022l19wl"; - revision = "1"; - editedCabalFile = "03kz2y6k8p0ifhjmnpfmjmflz3v2qbjqccv3p87ffgpr5317m14k"; + version = "0.2.3"; + sha256 = "0ww1ll557iapbxg6rwhimf5fh8gngk15zlm4mlrh3p3j3xx9f22p"; libraryHaskellDepends = [ - aeson base binary containers hedgehog pretty-show semirings + aeson base binary comonad containers hedgehog pretty-show semirings silently transformers wl-pprint-annotated ]; - testHaskellDepends = [ aeson base binary containers hedgehog ]; + testHaskellDepends = [ + aeson base binary comonad containers hedgehog + ]; description = "Hedgehog will eat your typeclass bugs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -112457,30 +112539,6 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.6"; - sha256 = "1lx7lwh282ijp63yfy6ybb6zc5zil09abnrsbm052ghdlnz3sfk1"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq errors HTTP mtl - network network-uri resource-pool scanner stm text time tls - unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring doctest HUnit mtl stm test-framework - test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedis_0_12_7" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri - , resource-pool, scanner, stm, test-framework, test-framework-hunit - , text, time, tls, unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; version = "0.12.7"; sha256 = "1q59g99mv4axwm77f8m5fmlnq04qy04c6s1aj57jvfq7p31iq05a"; libraryHaskellDepends = [ @@ -112495,7 +112553,6 @@ self: { benchmarkHaskellDepends = [ base mtl time ]; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -114818,8 +114875,8 @@ self: { }: mkDerivation { pname = "hierarchical-clustering"; - version = "0.4.6"; - sha256 = "1cfcrnxqczqzqgpyipsw9dwfw1j75zd11vpd12i533f3p44pzwbm"; + version = "0.4.7"; + sha256 = "15fiqvhcd0i5l1w4s5liggfbdknasdpvyxd54qrjjdp41qb4d3qk"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; description = "Fast algorithms for single, average/UPGMA and complete linkage clustering"; @@ -116192,8 +116249,8 @@ self: { }: mkDerivation { pname = "hjugement-cli"; - version = "0.0.0.20190721"; - sha256 = "1fgl9yjjmwd8y2hcmva0fh3d6qwvj8papdm0v50s85b9s8cwn6ll"; + version = "0.0.0.20190815"; + sha256 = "1ard95f5zs5bkj24qk3wwkgcz99xkwjqs35gfrslf3yd14davy2w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -116218,8 +116275,8 @@ self: { }: mkDerivation { pname = "hjugement-protocol"; - version = "0.0.4.20190711"; - sha256 = "0r4g8n1a8c0azdk307mq1q2dv1h4xf251fjrmldcws7b0vrla5ri"; + version = "0.0.7.20190815"; + sha256 = "0b356pi6s3ih47d42ns50irgwsblwd9hvasav6sswzww3qlrnbrz"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring containers cryptonite deepseq memory random reflection text transformers @@ -116453,6 +116510,8 @@ self: { pname = "hledger-api"; version = "1.14"; sha256 = "18zpclm3nh2zq6cqa10vm232ndg22r8s4h3ffmn2m4fg05172ymd"; + revision = "1"; + editedCabalFile = "05jlbpp4p45q8bd3152l0fm4xz9yvz07ip2cd0kplzvwnmy8sfrg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117046,6 +117105,32 @@ self: { pname = "hmatrix-backprop"; version = "0.1.2.5"; sha256 = "1m6imvvcg8cjlqlcj2qhk5k0g88w853mw9r2mky54rmxfd86xfsf"; + revision = "1"; + editedCabalFile = "0bqngjaxyz354bp38pqxdb2hk2jd5n8zxg7hrwnb4hhy0lvf2251"; + libraryHaskellDepends = [ + backprop base ghc-typelits-knownnat ghc-typelits-natnormalise + hmatrix hmatrix-vector-sized microlens vector vector-sized vinyl + ]; + testHaskellDepends = [ + backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized + microlens microlens-platform vector-sized vinyl + ]; + description = "hmatrix operations lifted for backprop"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "hmatrix-backprop_0_1_3_0" = callPackage + ({ mkDerivation, backprop, base, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog + , hmatrix, hmatrix-vector-sized, microlens, microlens-platform + , vector, vector-sized, vinyl + }: + mkDerivation { + pname = "hmatrix-backprop"; + version = "0.1.3.0"; + sha256 = "1nknwamc51f3d1syy1wi8fkvlx40riwi7x94yh34y0fzgddgjl2k"; libraryHaskellDepends = [ backprop base ghc-typelits-knownnat ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens vector vector-sized vinyl @@ -117353,6 +117438,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hmatrix-vector-sized_0_1_2_0" = callPackage + ({ mkDerivation, base, ghc-typelits-knownnat, hedgehog, hmatrix + , vector, vector-sized + }: + mkDerivation { + pname = "hmatrix-vector-sized"; + version = "0.1.2.0"; + sha256 = "0n9pylrxz0pkdlha1rqi2xabfjxpiya9kcyx6qlcqal1q57wh2bc"; + libraryHaskellDepends = [ base hmatrix vector vector-sized ]; + testHaskellDepends = [ + base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized + ]; + description = "Conversions between hmatrix and vector-sized types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmeap" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-lexing , delimited-text, parsec @@ -117751,8 +117853,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hnix-store-remote" = callPackage @@ -117907,6 +118007,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_8_9" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit + , http-types, microlens, text, unordered-containers, uri-bytestring + , uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "1.8.9"; + sha256 = "03yggs3if14saxiz5m02p17crl7askh8qjky6h1jqpxric49alv7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-conduit http-types microlens + text unordered-containers uri-bytestring uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -122735,6 +122855,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsinspect" = callPackage + ({ mkDerivation, base, directory, ghc, ghc-boot, ghc-paths, time }: + mkDerivation { + pname = "hsinspect"; + version = "0.0.1"; + sha256 = "13z7dk42cnwdxfqnadis56m2wy0s5kyzw2dv55dnspd77hd5v28k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory ghc ghc-boot time ]; + executableHaskellDepends = [ + base directory ghc ghc-boot ghc-paths time + ]; + description = "Inspect Haskell source files"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "hsinstall" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process , safe-exceptions @@ -127889,6 +128025,35 @@ self: { broken = true; }) {}; + "hw-ip_2_3_4_1" = callPackage + ({ mkDerivation, appar, base, binary, bytestring, containers + , generic-lens, hedgehog, hspec, hspec-discover, hw-bits + , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text + }: + mkDerivation { + pname = "hw-ip"; + version = "2.3.4.1"; + sha256 = "023wv7dvpyw2nnlrdqhp3nqrbbh9af074fz12y8510br2gfdyamd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + appar base containers generic-lens hw-bits iproute text + ]; + executableHaskellDepends = [ + appar base binary bytestring generic-lens lens optparse-applicative + text + ]; + testHaskellDepends = [ + appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for manipulating IP addresses and CIDR blocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bits-extra, bytestring, criterion, directory, dlist, generic-lens @@ -130451,8 +130616,6 @@ self: { ]; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -136659,8 +136822,6 @@ self: { ]; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "jose-jwt" = callPackage @@ -142916,8 +143077,8 @@ self: { }: mkDerivation { pname = "lapack"; - version = "0.3.0.1"; - sha256 = "0i7zzsw7rdb2hja0rdmw0l45x8svv5dxmnmrjdfs52gxzqmq621g"; + version = "0.3.1"; + sha256 = "1w8nndh3gj6vrildxjn13lmi7aqjwbhpqkdj7d21fsfbmhjlgwvr"; libraryHaskellDepends = [ base blas-ffi blaze-html boxes comfort-array deepseq fixed-length guarded-allocation hyper lapack-ffi lazyio netlib-ffi non-empty @@ -144711,6 +144872,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lenz_0_3_1_0" = callPackage + ({ mkDerivation, base, base-unicode-symbols, hs-functors + , transformers + }: + mkDerivation { + pname = "lenz"; + version = "0.3.1.0"; + sha256 = "1c87m35wvsk9dyfp9d8ar6qb4gz534xmg1rf8xahsjkryn9vjqfn"; + libraryHaskellDepends = [ + base base-unicode-symbols hs-functors transformers + ]; + description = "Van Laarhoven lenses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lenz-template" = callPackage ({ mkDerivation, base, base-unicode-symbols, containers, lenz , template-haskell @@ -146566,8 +146743,8 @@ self: { }: mkDerivation { pname = "linear-circuit"; - version = "0.1.0.1"; - sha256 = "1pm2pvx9ds1x9cb85n9b2km6ypmqqv5d3rwxyyszy10vcymypns4"; + version = "0.1.0.2"; + sha256 = "0cf2lq8p2yppns8qn732drky8ghhd4ri9zxv7nbvas10ha0p19lm"; libraryHaskellDepends = [ base comfort-array comfort-graph containers lapack netlib-ffi transformers utility-ht @@ -147619,6 +147796,24 @@ self: { broken = true; }) {}; + "list-witnesses_0_1_2_0" = callPackage + ({ mkDerivation, base, decidable, functor-products, microlens + , profunctors, singletons, vinyl + }: + mkDerivation { + pname = "list-witnesses"; + version = "0.1.2.0"; + sha256 = "10bflmrj747xs2ga8s0vw7hb419wvrwnm0bakxw7x1l7bcaa7z7m"; + libraryHaskellDepends = [ + base decidable functor-products microlens profunctors singletons + vinyl + ]; + description = "Witnesses for working with type-level lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "list-zip-def" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -148156,8 +148351,8 @@ self: { }: mkDerivation { pname = "llvm-hs-pretty"; - version = "0.6.1.0"; - sha256 = "12w1rkkaf50jl2vdkyk4xpvjmsxzjbfkdyklaq5p6b8ykw872pda"; + version = "0.6.2.0"; + sha256 = "0inljys97b3vmb0006p75kzsm922w1r9721df2h7nfqp0in28c14"; libraryHaskellDepends = [ array base bytestring llvm-hs-pure prettyprinter text ]; @@ -148934,21 +149129,25 @@ self: { }) {}; "log4hs" = callPackage - ({ mkDerivation, aeson, base, containers, data-default, directory - , filepath, hspec, hspec-core, process, QuickCheck - , template-haskell, text, time + ({ mkDerivation, aeson, base, containers, criterion, data-default + , directory, filepath, generic-lens, hspec, hspec-core, lens + , process, QuickCheck, template-haskell, text, time }: mkDerivation { pname = "log4hs"; - version = "0.0.4.0"; - sha256 = "1731vg58q9qcizlbsjvpy1xl9vls7gyi4bk2f7klid7204fnz2zk"; + version = "0.0.6.0"; + sha256 = "19k61f3w93vz21h4r013vxcv4yhyxrq33l4f3pzg18xx095csgka"; libraryHaskellDepends = [ - aeson base containers data-default directory filepath - template-haskell text time + aeson base containers data-default directory filepath generic-lens + lens template-haskell text time ]; testHaskellDepends = [ - aeson base containers data-default directory filepath hspec - hspec-core process QuickCheck template-haskell text time + aeson base containers data-default directory filepath generic-lens + hspec hspec-core lens process QuickCheck template-haskell text time + ]; + benchmarkHaskellDepends = [ + aeson base containers criterion data-default directory filepath + generic-lens lens template-haskell text time ]; description = "A python logging style log library"; license = stdenv.lib.licenses.bsd3; @@ -153980,8 +154179,8 @@ self: { }: mkDerivation { pname = "med-module"; - version = "0.1.1"; - sha256 = "1qzffgcg29gjc6j0dl9ablgzad3lry28n9kv55kp5lgqm3xp92gp"; + version = "0.1.2.1"; + sha256 = "0f1yjdix89g6z2kigj08iq88jmi0x59la7764ixfha5sbjnwz0pp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154212,33 +154411,6 @@ self: { broken = true; }) {}; - "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, mtl, parser-combinators, scientific, text @@ -157369,34 +157541,6 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.0.1"; - sha256 = "01a5jnv8kbl2c9ka9dgqm4a8b7n6frmg7yi8f417qcnwgn1lbs78"; - revision = "1"; - editedCabalFile = "13q0lapxk1v3ci3bqv21942jf2fw87frbbam53apd3i2iv69bqyr"; - libraryHaskellDepends = [ - base bytestring containers contravariant deepseq exceptions - megaparsec mtl profunctors QuickCheck reflection tagged - template-haskell text - ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq megaparsec text weigh - ]; - description = "Modern library for working with URIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "modern-uri_0_3_1_0" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , criterion, deepseq, exceptions, hspec, hspec-discover - , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck - , reflection, tagged, template-haskell, text, weigh - }: - mkDerivation { - pname = "modern-uri"; version = "0.3.1.0"; sha256 = "1pi7la2rrpfa9qszz7zm4dd7dihakm4kjrhjzvxpbp4n34ihl8h5"; libraryHaskellDepends = [ @@ -157413,7 +157557,6 @@ self: { ]; description = "Modern library for working with URIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modify-fasta" = callPackage @@ -159361,6 +159504,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_12_0" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, gauge + , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split + , text, transformers, unordered-containers, vector + , vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.12.0"; + sha256 = "1h586myaayxg73lc1fx18axlq2bw761fypyy7mii1h0h75d8fyry"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ base gauge mwc-random vector ]; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -165523,8 +165690,8 @@ self: { ({ mkDerivation, base, network }: mkDerivation { pname = "network-run"; - version = "0.0.1"; - sha256 = "1yc5hpcadab1dzvi9wz6v25v7wp5j07a36wdabrxi1pwy4gania5"; + version = "0.1.0"; + sha256 = "16n7d0vgzcp6qq3y2vs1wjlj81xdi3a1kyk9qncmj3h7djav3r5b"; libraryHaskellDepends = [ base network ]; description = "Simple network runner library"; license = stdenv.lib.licenses.bsd3; @@ -167365,6 +167532,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nonempty-lift" = callPackage + ({ mkDerivation, base, comonad, hedgehog, hedgehog-classes + , semigroupoids + }: + mkDerivation { + pname = "nonempty-lift"; + version = "0.1"; + sha256 = "0zz6kh0ihbpjsigs2ssqcif6i85y9ykpx739yzpqz0drqn4013g8"; + libraryHaskellDepends = [ base comonad semigroupoids ]; + testHaskellDepends = [ base hedgehog hedgehog-classes ]; + description = "nonempty structure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "nonemptymap" = callPackage ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { @@ -167995,6 +168178,8 @@ self: { pname = "numbered-semigroups"; version = "0.1.0.0"; sha256 = "100r6k3cwycl75mj9g1x4w4qv064v8bdaan5rsj2vnvx4w1jrhp2"; + revision = "2"; + editedCabalFile = "04wkhb2r275nax8wh00w6c4pxfaky190g2bsviw39jyi7wr2f33c"; libraryHaskellDepends = [ base call-stack semigroups ]; description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; license = stdenv.lib.licenses.lgpl3; @@ -172346,6 +172531,36 @@ self: { broken = true; }) {}; + "pairing_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, elliptic-curve + , errors, galois-field, MonadRandom, protolude, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck + , wl-pprint-text + }: + mkDerivation { + pname = "pairing"; + version = "0.5.0"; + sha256 = "0qnwkkfzd1jiqg4b989knvzzf05aljqjfqv1z35nl2ms46sqdv1b"; + libraryHaskellDepends = [ + base bytestring elliptic-curve errors galois-field MonadRandom + protolude QuickCheck wl-pprint-text + ]; + testHaskellDepends = [ + base bytestring elliptic-curve errors galois-field MonadRandom + protolude QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion elliptic-curve errors galois-field + MonadRandom protolude QuickCheck quickcheck-instances tasty + tasty-hunit tasty-quickcheck wl-pprint-text + ]; + description = "Bilinear pairings"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "palette" = callPackage ({ mkDerivation, array, base, colour, containers, MonadRandom }: mkDerivation { @@ -172788,38 +173003,6 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.1.4.0"; - sha256 = "1mfyb8gyyc7dsg0n3l8kp8f7wx9ag0imn88xpibic5x6ff1g75br"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-default-class directory filepath hashable - pandoc pandoc-types temporary text typed-process yaml - ]; - executableHaskellDepends = [ - base data-default-class deepseq directory filepath open-browser - optparse-applicative pandoc pandoc-types template-haskell temporary - text - ]; - testHaskellDepends = [ - base data-default-class directory filepath hspec hspec-expectations - pandoc-types tasty tasty-hspec tasty-hunit temporary text - ]; - description = "A Pandoc filter to include figures generated from Python code blocks"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "pandoc-pyplot_2_1_5_1" = callPackage - ({ mkDerivation, base, containers, data-default-class, deepseq - , directory, filepath, hashable, hspec, hspec-expectations - , open-browser, optparse-applicative, pandoc, pandoc-types, tasty - , tasty-hspec, tasty-hunit, template-haskell, temporary, text - , typed-process, yaml - }: - mkDerivation { - pname = "pandoc-pyplot"; version = "2.1.5.1"; sha256 = "100mn7q5nz7xvhbnhjsfmcf9n6x1gjl71akrnc5j8k2j57bk1kkf"; isLibrary = true; @@ -174843,8 +175026,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.2.3"; - sha256 = "0fkrm5zq2978qaqkxwibqj5dlmrrkpnlqv97ff436bf6ad5vpfw8"; + version = "0.8.2.5"; + sha256 = "1hss18gb71xrjgncjr4g5935k7kcwxpxxb6j52i32ans43xavhiv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178959,6 +179142,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-cborg" = callPackage + ({ mkDerivation, base, bytestring, cborg, ghc-prim, pipes + , pipes-bytestring, pipes-parse, QuickCheck, serialise, tasty + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "pipes-cborg"; + version = "0.1"; + sha256 = "1ihngg2gvlyq40wnpajhbb7xpj028pk1k08xay19ir4n9mmx4jrn"; + libraryHaskellDepends = [ + base bytestring cborg ghc-prim pipes pipes-bytestring pipes-parse + serialise transformers + ]; + testHaskellDepends = [ + base bytestring cborg pipes pipes-bytestring QuickCheck serialise + tasty tasty-quickcheck transformers + ]; + description = "Encode and decode cborg streams using the pipes and cborg libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-cellular" = callPackage ({ mkDerivation, base, bytestring, data-cell, pipes }: mkDerivation { @@ -181398,6 +181602,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polysemy_1_1_0_0" = callPackage + ({ mkDerivation, async, base, containers, criterion, doctest + , first-class-families, free, freer-simple, hspec, hspec-discover + , inspection-testing, mtl, stm, syb, template-haskell + , th-abstraction, transformers, type-errors, type-errors-pretty + , unagi-chan + }: + mkDerivation { + pname = "polysemy"; + version = "1.1.0.0"; + sha256 = "1slc177ygphiaaxr301nmn47q7jl71rmzcw8h9q7az2s2f3gy83p"; + libraryHaskellDepends = [ + async base containers first-class-families mtl stm syb + template-haskell th-abstraction transformers type-errors + type-errors-pretty unagi-chan + ]; + testHaskellDepends = [ + async base containers doctest first-class-families hspec + inspection-testing mtl stm syb template-haskell th-abstraction + transformers type-errors type-errors-pretty unagi-chan + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + async base containers criterion first-class-families free + freer-simple mtl stm syb template-haskell th-abstraction + transformers type-errors type-errors-pretty unagi-chan + ]; + description = "Higher-order, low-boilerplate, zero-cost free monads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "polysemy-RandomFu" = callPackage ({ mkDerivation, base, hspec, hspec-discover, polysemy , polysemy-plugin, polysemy-zoo, random-fu, random-source, text @@ -182288,35 +182524,6 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.12.1.2"; - sha256 = "10h5299fxqmfz0kxyvivfy396q35gzg60spnjagyha33kx5m3bc3"; - libraryHaskellDepends = [ - aeson base base-prelude binary-parser bytestring - bytestring-strict-builder containers loch-th network-ip - placeholders scientific text time transformers unordered-containers - uuid vector - ]; - testHaskellDepends = [ - aeson conversion conversion-bytestring conversion-text json-ast - loch-th network-ip placeholders postgresql-libpq QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = stdenv.lib.licenses.mit; - }) {}; - - "postgresql-binary_0_12_1_3" = callPackage - ({ mkDerivation, aeson, base, base-prelude, binary-parser - , bytestring, bytestring-strict-builder, containers, conversion - , conversion-bytestring, conversion-text, criterion, json-ast - , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck - , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; version = "0.12.1.3"; sha256 = "0y2irx1fw0xqs77qpaa3lk06r2q7j7wzbzriyc274h6lmn85sjdw"; libraryHaskellDepends = [ @@ -182333,7 +182540,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-common" = callPackage @@ -182620,6 +182826,21 @@ self: { broken = true; }) {}; + "postgresql-simple-interpolate" = callPackage + ({ mkDerivation, base, haskell-src-meta, mtl, parsec + , postgresql-simple, template-haskell + }: + mkDerivation { + pname = "postgresql-simple-interpolate"; + version = "0.1"; + sha256 = "0nq4j1lbylklsz3fhc4y7rh6c4lfzzfyha65g6i22mbpx51vdf30"; + libraryHaskellDepends = [ + base haskell-src-meta mtl parsec postgresql-simple template-haskell + ]; + description = "Interpolated SQL queries via quasiquotation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgresql-simple-migration" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , directory, hspec, postgresql-simple, text, time @@ -184142,20 +184363,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pretty-simple_3_0_0_0" = callPackage - ({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl - , text, transformers + "pretty-simple_3_1_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest + , containers, criterion, doctest, Glob, mtl, QuickCheck + , template-haskell, text, transformers }: mkDerivation { pname = "pretty-simple"; - version = "3.0.0.0"; - sha256 = "0cv21iq6xk73dlmkm9ax22qv93sgqj72gzl1zxxn2870vhf102ab"; + version = "3.1.0.0"; + sha256 = "0p3p5i2rjwv19hzgqyarv7x6g6hvam159y50irvs0dd5wwphd2pa"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - ansi-terminal base mtl text transformers + ansi-terminal base containers mtl text transformers + ]; + testHaskellDepends = [ + base doctest Glob QuickCheck template-haskell ]; - testHaskellDepends = [ base doctest Glob ]; benchmarkHaskellDepends = [ base criterion text ]; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; @@ -187590,8 +187815,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.13.2"; - sha256 = "0g4g2xsn3r5xxqndlyg1yxnsdgj27l5zll9q6wly119mkcllvvql"; + version = "0.13.3"; + sha256 = "05cz0ilxawrcn4hm6mbd0qpkbfp0g8mcqvcscl4ghagjljgimaqv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189198,6 +189423,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.22"; sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax"; + revision = "1"; + editedCabalFile = "1ln7zp6rx7ya7iwcbh8m1s1y1pdh28f64nga74f2lszmpmmd512w"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific splitmix tagged text time @@ -189360,23 +189587,11 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; - version = "0.1.1.0"; - sha256 = "0rclb8ghakcrcw3sz9q8lvb2zh1a4lafb711mqpfl0csd3yvlia4"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Test properties and default-mains for QuickCheck"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-simple_0_1_1_1" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "quickcheck-simple"; version = "0.1.1.1"; sha256 = "0ah32y1p39p3d0696zp4mlf4bj67ggh73sb8nvf21snkwll86dai"; libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-special" = callPackage @@ -190178,8 +190393,8 @@ self: { }: mkDerivation { pname = "raft"; - version = "0.3.11.0"; - sha256 = "0rc4gvhfcslwb01lxbwmd1j3hbcbkyflm0qg43ccdkf2pj2gibz8"; + version = "0.4.0.0"; + sha256 = "07lfjq2dz9vki7pvjg6p3mp2ifazhmidcx9pbsfxnhj1h8xb80bp"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring cereal containers data-default ghc-prim mtl parallel scientific split stm text time @@ -193288,6 +193503,24 @@ self: { broken = true; }) {}; + "refinery" = callPackage + ({ mkDerivation, base, containers, exceptions, mmorph, mtl, pipes + , semigroupoids + }: + mkDerivation { + pname = "refinery"; + version = "0.1.0.0"; + sha256 = "1g18ih1122h61jxgi72kxc9b4x7nvfxl807km46x150x1f3m7wvl"; + libraryHaskellDepends = [ + base containers exceptions mmorph mtl pipes semigroupoids + ]; + testHaskellDepends = [ + base containers exceptions mmorph mtl pipes semigroupoids + ]; + description = "Toolkit for building proof automation systems"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reflection" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -193905,6 +194138,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "regex-applicative_0_3_3_1" = callPackage + ({ mkDerivation, base, containers, criterion, smallcheck, tasty + , tasty-hunit, tasty-smallcheck, transformers + }: + mkDerivation { + pname = "regex-applicative"; + version = "0.3.3.1"; + sha256 = "0p0anx5vamrhrdvviwkh2zn6pa3pv2bjb7nfyc7dvz2q7g14y1lg"; + libraryHaskellDepends = [ base containers transformers ]; + testHaskellDepends = [ + base containers smallcheck tasty tasty-hunit tasty-smallcheck + transformers + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Regex-based parsing with applicative interface"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-applicative-text" = callPackage ({ mkDerivation, base, regex-applicative, text }: mkDerivation { @@ -194560,35 +194812,6 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, containers, exceptions, generic-lens - , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl - , multimap, protolude, random, resourcet, semigroupoids, semigroups - , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell - , text, transformers-base, universum - }: - mkDerivation { - pname = "registry"; - version = "0.1.6.2"; - sha256 = "03j7m08wj0abr0nywb3vgsifyhmdrr7mvbn82gg8kx3gcbxvanbd"; - libraryHaskellDepends = [ - base containers exceptions hashable mmorph mtl protolude resourcet - semigroupoids semigroups template-haskell text transformers-base - ]; - testHaskellDepends = [ - async base containers exceptions generic-lens hashable hedgehog - io-memoize mmorph MonadRandom mtl multimap protolude random - resourcet semigroupoids semigroups tasty tasty-discover - tasty-hedgehog tasty-th template-haskell text transformers-base - universum - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "registry_0_1_7_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph , MonadRandom, mtl, multimap, protolude, random, resourcet @@ -196145,8 +196368,8 @@ self: { ({ mkDerivation, base, comfort-array, lapack }: mkDerivation { pname = "resistor-cube"; - version = "0.0.1.1"; - sha256 = "1prbjl1zm4pbkz7xwwkp00bnnq94fql7jlskrxfrk6vxp9ryp60a"; + version = "0.0.1.2"; + sha256 = "1jdpyxpbqhlbd66gy1qlrjqm31mhvg636yp8nrm9qbksllzdi6n6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base comfort-array lapack ]; @@ -197363,6 +197586,8 @@ self: { wai wai-app-static wai-extra warp ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ribbit" = callPackage @@ -200355,49 +200580,50 @@ self: { }) {}; "salak" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, data-default - , directory, exceptions, filepath, hashable, heaps, hspec, menshen - , mtl, QuickCheck, random, scientific, text, time, unliftio-core - , unordered-containers + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, directory, exceptions, filepath, hashable, heaps + , hspec, menshen, mtl, QuickCheck, random, scientific, text, time + , unliftio-core, unordered-containers }: mkDerivation { pname = "salak"; - version = "0.3.3"; - sha256 = "1jq9vngi03wqcvfb1r9ndg4w1vipgbhbzdyybkpj4hmc074l1079"; + version = "0.3.3.1"; + sha256 = "0gv7qjiwnr67s38g68y2aqjljihrlggmnz2jz79865bi2v34isd2"; libraryHaskellDepends = [ - attoparsec base bytestring data-default directory exceptions - filepath hashable heaps menshen mtl scientific text time + attoparsec base bytestring containers data-default directory + exceptions filepath hashable heaps menshen mtl scientific text time unliftio-core unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring data-default directory exceptions - filepath hashable heaps hspec menshen mtl QuickCheck random - scientific text time unliftio-core unordered-containers + attoparsec base bytestring containers data-default directory + exceptions filepath hashable heaps hspec menshen mtl QuickCheck + random scientific text time unliftio-core unordered-containers ]; description = "Configuration (re)Loader and Parser"; license = stdenv.lib.licenses.mit; }) {}; - "salak_0_3_3_1" = callPackage + "salak_0_3_4" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default, directory, exceptions, filepath, hashable, heaps - , hspec, menshen, mtl, QuickCheck, random, scientific, text, time - , unliftio-core, unordered-containers + , data-default, directory, dlist, exceptions, filepath, hashable + , heaps, hspec, hspec-discover, menshen, mtl, QuickCheck, random + , scientific, text, time, unliftio-core, unordered-containers }: mkDerivation { pname = "salak"; - version = "0.3.3.1"; - sha256 = "0gv7qjiwnr67s38g68y2aqjljihrlggmnz2jz79865bi2v34isd2"; + version = "0.3.4"; + sha256 = "1syjj2i2p0myy4jmxq37i11p10cv6q9k1b562g6nkx8n4vghy2kz"; libraryHaskellDepends = [ - attoparsec base bytestring containers data-default directory + attoparsec base bytestring containers data-default directory dlist exceptions filepath hashable heaps menshen mtl scientific text time unliftio-core unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring containers data-default directory + attoparsec base bytestring containers data-default directory dlist exceptions filepath hashable heaps hspec menshen mtl QuickCheck random scientific text time unliftio-core unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Configuration (re)Loader and Parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -200424,6 +200650,27 @@ self: { broken = true; }) {}; + "salak-toml_0_3_4" = callPackage + ({ mkDerivation, base, exceptions, hspec, mtl, QuickCheck, salak + , text, time, tomland, unordered-containers + }: + mkDerivation { + pname = "salak-toml"; + version = "0.3.4"; + sha256 = "1nmc22vb869inwy1h954bjlqp5p21vgdxjn1858pw7xv5mxyx9pl"; + libraryHaskellDepends = [ + base salak text time tomland unordered-containers + ]; + testHaskellDepends = [ + base exceptions hspec mtl QuickCheck salak text time tomland + unordered-containers + ]; + description = "Configuration Loader for toml"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "salak-yaml" = callPackage ({ mkDerivation, base, conduit, exceptions, hspec, libyaml, mtl , QuickCheck, salak, text @@ -200440,6 +200687,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "salak-yaml_0_3_4" = callPackage + ({ mkDerivation, base, conduit, exceptions, hspec, libyaml, mtl + , QuickCheck, salak, text + }: + mkDerivation { + pname = "salak-yaml"; + version = "0.3.4"; + sha256 = "0qlr0vaq23nbxg73hvrj7llxlc0g8x661c1jmizs4xr8is2j8wr4"; + libraryHaskellDepends = [ base conduit libyaml salak text ]; + testHaskellDepends = [ + base conduit exceptions hspec libyaml mtl QuickCheck salak text + ]; + description = "Configuration Loader for yaml"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "saltine" = callPackage ({ mkDerivation, base, bytestring, libsodium, profunctors , QuickCheck, semigroups, test-framework @@ -204610,8 +204874,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-swagger" = callPackage @@ -207771,8 +208033,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.10.2.1"; - sha256 = "1y85rrrrcd7jz51ir6cwa3w23ldi4fkc215iqj1crbxfjzrphacn"; + version = "1.10.2.2"; + sha256 = "070vvzz0nmdal9ja43l8s4dll2iwxjzd3lmlynkdm1v9qzj0iw67"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -207908,8 +208170,8 @@ self: { ({ mkDerivation, base, cpphs, shake }: mkDerivation { pname = "shake-literate"; - version = "0.1.0.0"; - sha256 = "1kliv9i9libcyzm0bccxi226rd69kvjxi9hi3n4y7zjbbp40cqgd"; + version = "0.1.0.1"; + sha256 = "0wx3mh62b8kq20qw15zg35nl4l066i11mzgj0vxlvys5a6902ijn"; libraryHaskellDepends = [ base cpphs shake ]; description = "Rules for building literate programs in shake"; license = stdenv.lib.licenses.bsd3; @@ -207930,6 +208192,19 @@ self: { broken = true; }) {}; + "shake-minify-css" = callPackage + ({ mkDerivation, base, directory, filepath, hasmin, shake, text }: + mkDerivation { + pname = "shake-minify-css"; + version = "0.1.0.0"; + sha256 = "0gy3h108gbv93jr74sp3wa3r3vkm8k53wr3z9bmm6c9rg7zwr2q7"; + libraryHaskellDepends = [ + base directory filepath hasmin shake text + ]; + description = "Shake rules for CSS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shake-pack" = callPackage ({ mkDerivation, base, bytestring, bzlib, shake, tar }: mkDerivation { @@ -208439,6 +208714,17 @@ self: { broken = true; }) {}; + "shell-utility" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shell-utility"; + version = "0.0"; + sha256 = "1s3482vxllmmjbcqbwsrql9ka6zng7qbbqk3kfjs6dvkcs710hbs"; + libraryHaskellDepends = [ base ]; + description = "Utility functions for writing command-line programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shellish" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , process, strict, time, unix-compat @@ -208630,8 +208916,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.7.0.0"; - sha256 = "0dgfjvxdli4z1i9qailq5mgrgynm1vvfcbjj9nsridypff0vf1qj"; + version = "0.7.0.2"; + sha256 = "0b9q4pg1gvnw18gxba8cd7b9crj8d822vivsvgagcjmhm6a8y3pk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214866,6 +215152,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "sparse-tensor" = callPackage + ({ mkDerivation, ad, base, bytestring, cereal, containers, deepseq + , eigen, ghc-typelits-knownnat, ghc-typelits-natnormalise, parallel + , singletons, tf-random, zlib + }: + mkDerivation { + pname = "sparse-tensor"; + version = "0.1.0.0"; + sha256 = "039i9d3w3xxkxvkqs59d82qm0yp0w23w7lrcfdmnb6bgc228mjvl"; + libraryHaskellDepends = [ + ad base bytestring cereal containers deepseq eigen + ghc-typelits-knownnat ghc-typelits-natnormalise parallel singletons + tf-random zlib + ]; + description = "typesafe tensor algebra library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sparsebit" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { @@ -220753,8 +221059,8 @@ self: { }: mkDerivation { pname = "strongswan-sql"; - version = "1.3.0.0"; - sha256 = "0dxl6j73hmw9la2ivbgxm6wr12dd79nh2315k517zlgiq4q1yir7"; + version = "1.3.0.1"; + sha256 = "1n61xxgp4saljyq6zywi5x5nlcwzp3i9vhwlmib790wr19znnxky"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221640,8 +221946,8 @@ self: { }: mkDerivation { pname = "super-user-spark"; - version = "0.4.0.1"; - sha256 = "0pxkvc1vjarh4p5rqnai6nlsqxv9as8jvqs2vpywl1525nsfyvy5"; + version = "0.4.0.3"; + sha256 = "0z2alc67p8nvvwaxxrgwhkwfki1iw7ycs3ay8kyfw0wh01d2cmgk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221965,6 +222271,36 @@ self: { broken = true; }) {}; + "sv_1_4" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava + , contravariant, criterion, deepseq, hedgehog, hw-dsv, lens, Only + , parsers, semigroupoids, semigroups, sv-core, tasty + , tasty-hedgehog, tasty-hunit, text, transformers, trifecta + , utf8-string, validation, vector + }: + mkDerivation { + pname = "sv"; + version = "1.4"; + sha256 = "02ymnnknfppx59b922y62grkmarwsyy77iv6bmyp2bzm8vbvnvd5"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring contravariant hw-dsv + semigroupoids sv-core transformers utf8-string validation + ]; + testHaskellDepends = [ + base bytestring cassava contravariant hedgehog lens Only parsers + semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text + trifecta utf8-string validation vector + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq hw-dsv lens text + vector + ]; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sv-cassava" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit , sv-core, text, utf8-string, validation, vector @@ -221973,8 +222309,8 @@ self: { pname = "sv-cassava"; version = "0.3"; sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b"; - revision = "2"; - editedCabalFile = "14grn815r54480jqpfib6qi3ivbaw0asa5ys0rp93allsprk96xb"; + revision = "3"; + editedCabalFile = "13414sn9rllq842bz0lv8qzdy6fxv72jbhmk64krrxq2xmw7wkhb"; libraryHaskellDepends = [ attoparsec base bytestring cassava sv-core utf8-string validation vector @@ -222013,6 +222349,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sv-core_0_5" = 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.5"; + sha256 = "1x5gmv2pbn3hx1dhpkigivjkbg6n6xy7lc36wmccsw2qqn9r5qxa"; + 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 @@ -222021,8 +222383,8 @@ self: { pname = "sv-svfactor"; version = "0.2"; sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb"; - revision = "1"; - editedCabalFile = "0g0bswas1y06k1yg9lgzwm36pyxd05s3pji3nsiqff6bhfph3d37"; + revision = "2"; + editedCabalFile = "1igmg66d7zs8pcia4j7nhr7iivnbanqz34wcpfx967823vc2whpw"; libraryHaskellDepends = [ base bytestring lens profunctors sv-core svfactor validation ]; @@ -222843,16 +223205,14 @@ self: { }) {}; "symbolic-link" = callPackage - ({ mkDerivation, base, directory, unix, yaml }: + ({ mkDerivation, base, directory, tasty, tasty-hunit, unix }: mkDerivation { pname = "symbolic-link"; - version = "0.1.0.2"; - sha256 = "02v0ry474xkpacbav6s3781xiczkhbx5rzks9ad5pj2y16z59pr7"; - isLibrary = true; - isExecutable = true; + version = "0.1.1.1"; + sha256 = "1g5w67kviqzz5q9xpln6nh8g86yh1v2wmgmgjmn5ai1qj4x80rf8"; libraryHaskellDepends = [ base directory unix ]; - executableHaskellDepends = [ base directory unix yaml ]; - description = "Symlink tools"; + testHaskellDepends = [ base tasty tasty-hunit unix ]; + description = "Symlink functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -223385,21 +223745,21 @@ self: { "synthesizer-llvm" = callPackage ({ mkDerivation, base, containers, event-list, llvm-extra, llvm-tf , midi, non-empty, non-negative, numeric-prelude, pathtype - , QuickCheck, random, sox, storable-record, storable-tuple - , storablevector, synthesizer-core, synthesizer-midi, tfp - , transformers, unsafe, utility-ht, vault + , QuickCheck, random, semigroups, sox, storable-record + , storable-tuple, storablevector, synthesizer-core + , synthesizer-midi, tfp, transformers, unsafe, utility-ht, vault }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.8.1.2"; - sha256 = "1rklmaibicc4fwcz22cw6vp5qm74b5vn5ymflwk4gi3knsn7mzi9"; + version = "0.8.2"; + sha256 = "0vf0p1ajs7k327cc1dwm6ja2qyby865g1bqc6mzrjn826dv2vric"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers event-list llvm-extra llvm-tf midi non-empty - non-negative numeric-prelude pathtype random sox storable-record - storable-tuple storablevector synthesizer-core synthesizer-midi tfp - transformers unsafe utility-ht vault + non-negative numeric-prelude pathtype random semigroups sox + storable-record storable-tuple storablevector synthesizer-core + synthesizer-midi tfp transformers unsafe utility-ht vault ]; testHaskellDepends = [ base llvm-extra llvm-tf numeric-prelude QuickCheck random @@ -224541,6 +224901,25 @@ self: { broken = true; }) {}; + "tagsoup-navigate" = callPackage + ({ mkDerivation, base, deriving-compat, lens, mmorph, mtl + , semigroupoids, semigroups, tagsoup, tagsoup-selection + , transformers + }: + mkDerivation { + pname = "tagsoup-navigate"; + version = "0.1.0.1"; + sha256 = "01xzw375wdcj58s6mrwgzf9ccv8bbc50p4kcnv76cxbm38p1v94j"; + libraryHaskellDepends = [ + base deriving-compat lens mmorph mtl semigroupoids semigroups + tagsoup tagsoup-selection transformers + ]; + description = "Tagsoup Navigate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tagsoup-parsec" = callPackage ({ mkDerivation, base, parsec, tagsoup }: mkDerivation { @@ -225221,8 +225600,6 @@ self: { ]; description = "Test discovery for the tasty framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tasty-expected-failure" = callPackage @@ -225352,8 +225729,6 @@ self: { ]; description = "Hspec support for the Tasty test framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tasty-html" = callPackage @@ -227168,8 +227543,6 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3; libpcre2 = null; vte_291 = pkgs.vte;}; "termplot" = callPackage @@ -229343,6 +229716,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-lift-instances_0_1_14" = callPackage + ({ mkDerivation, base, bytestring, containers, QuickCheck + , template-haskell, text, th-lift, transformers, vector + }: + mkDerivation { + pname = "th-lift-instances"; + version = "0.1.14"; + sha256 = "0r1b4jnvcj64wp4hfccwkl4a70n1p1q7qzyx6ax7cmd8k961jz78"; + libraryHaskellDepends = [ + base bytestring containers template-haskell text th-lift + transformers vector + ]; + testHaskellDepends = [ + base bytestring containers QuickCheck template-haskell text vector + ]; + description = "Lift instances for template-haskell for common data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-nowq" = callPackage ({ mkDerivation, base, markdown-unlit, template-haskell, time }: mkDerivation { @@ -229693,6 +230086,33 @@ self: { broken = true; }) {}; + "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" = callPackage ({ mkDerivation, aeson, assoc, base, base-compat, binary, deepseq , hashable, QuickCheck, semigroupoids, unordered-containers @@ -230134,8 +230554,8 @@ self: { pname = "through-text"; version = "0.1.0.0"; sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk"; - revision = "3"; - editedCabalFile = "1gia9j7zq3g74kqvkzwp68d690nhddix1kpmj23d5a3zns3rxasn"; + revision = "4"; + editedCabalFile = "1clc4g6rg5970654fd596ygly79axkhyzn773by1wi4grvhw96fi"; libraryHaskellDepends = [ base bytestring case-insensitive text ]; description = "Convert textual types through Text without needing O(n^2) instances"; license = stdenv.lib.licenses.bsd3; @@ -231978,6 +232398,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "to" = callPackage + ({ mkDerivation, base, bytestring, containers, gauge, hashable + , text, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "to"; + version = "1.2.0"; + sha256 = "13y4vxfm76929c4nj6rp06y81nm30m3v52r927k41nbb0fdx8z7y"; + libraryHaskellDepends = [ + base bytestring containers hashable text unordered-containers + utf8-string vector + ]; + benchmarkHaskellDepends = [ + base containers gauge text unordered-containers + ]; + description = "Simple, safe, boring type conversions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "to-haskell" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, transformers }: @@ -232346,8 +232785,6 @@ self: { ]; description = "Bidirectional TOML serialization"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tomlcheck" = callPackage @@ -237742,10 +238179,8 @@ self: { }: mkDerivation { pname = "unagi-chan"; - version = "0.4.1.0"; - sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb"; - revision = "2"; - editedCabalFile = "06iygfs8k6agspfhci3p76chc84z0pcyq918fr10xnjbzpjfkrrg"; + version = "0.4.1.2"; + sha256 = "1lnl5n4jnjmm4chp461glcwkrrw63rjz3fvprwxcy3lkpbkrqvgn"; libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ]; testHaskellDepends = [ atomic-primops base containers ghc-prim primitive @@ -238960,25 +239395,11 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "unix-compat"; - version = "0.5.1"; - sha256 = "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3"; - revision = "1"; - editedCabalFile = "0c4ak3y72nhv3nf025cyfi1dri2wjmsal3icjwj0aczmlb0imwrd"; - libraryHaskellDepends = [ base unix ]; - description = "Portable POSIX-compatibility layer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unix-compat_0_5_2" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "unix-compat"; version = "0.5.2"; sha256 = "1a8brv9fax76b1fymslzyghwa6ma8yijiyyhn12msl3i5x24x6k5"; libraryHaskellDepends = [ base unix ]; description = "Portable POSIX-compatibility layer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unix-fcntl" = callPackage @@ -242534,8 +242955,8 @@ self: { }: mkDerivation { pname = "verifiable-expressions"; - version = "0.5.0"; - sha256 = "04bm6m9aflf2zcbwbgga6sl3ydxmp295pgwp9wfbvnzyc2bggrg5"; + version = "0.6.0"; + sha256 = "1drb5zkpm5zn765fkp2p7jq69q50f9577rz9bs76cp0gvccan8my"; libraryHaskellDepends = [ base containers lens mtl sbv transformers union vinyl ]; @@ -244011,6 +244432,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_28" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, http2, HUnit, iproute, network, old-locale, resourcet + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, void, wai, wai-logger, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.28"; + sha256 = "0iky7k4kirngvk1p2nz19zgzffb5hppfaxdjan80v06ikc8w1wm7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types http2 iproute network old-locale + resourcet streaming-commons text time transformers unix unix-compat + vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base bytestring case-insensitive cookie fast-logger hspec + http-types http2 HUnit resourcet text time transformers wai zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -247874,22 +248325,6 @@ self: { "witherable" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable - , transformers, transformers-compat, unordered-containers, vector - }: - mkDerivation { - pname = "witherable"; - version = "0.3.1"; - sha256 = "0sjpr1fnmxicpiyhh715fh8cznc971awhhd1mzqn03ybrja8278l"; - libraryHaskellDepends = [ - base base-orphans containers hashable transformers - transformers-compat unordered-containers vector - ]; - description = "filterable traversable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "witherable_0_3_2" = callPackage - ({ mkDerivation, base, base-orphans, containers, hashable , monoidal-containers, transformers, transformers-compat , unordered-containers, vector }: @@ -247903,7 +248338,6 @@ self: { ]; description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witness" = callPackage @@ -249263,6 +249697,21 @@ self: { broken = true; }) {}; + "wu-wei" = callPackage + ({ mkDerivation, base, directory, symbolic-link, unix, yaml }: + mkDerivation { + pname = "wu-wei"; + version = "0.1.0.2"; + sha256 = "001bs5s92wpj1s7pjg7knc9w4czjq2zwm0wj6gjjxgymvvwjax7w"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory symbolic-link unix yaml + ]; + description = "Unimportant Unix adminstration tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wumpus-basic" = callPackage ({ mkDerivation, base, containers, directory, filepath , vector-space, wumpus-core @@ -252819,6 +253268,8 @@ self: { libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaya-unsafe" = callPackage @@ -254075,6 +254526,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-multi" = callPackage + ({ mkDerivation, base, containers, network-uri, shakespeare, text + , transformers, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-form-multi"; + version = "1.6.0"; + sha256 = "162pyvyv5kv5bicl8ikvffnsyjqc8z0n758ycgnvwly0bvskrl37"; + libraryHaskellDepends = [ + base containers network-uri shakespeare text transformers + yesod-core yesod-form + ]; + description = "Multi-input form handling for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-form-richtext" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text , xss-sanitize, yesod-core, yesod-form diff --git a/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/nixpkgs/pkgs/development/interpreters/clojure/default.nix index 6b1a71c80207..b5a7c2b467ef 100644 --- a/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.466"; + version = "1.10.1.469"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1rh4isdac7l8k8p45cqim8lfccjzxw7z173xqnpgk3z307jj4n90"; + sha256 = "0hpb6rixmgllss69vl9zlpb41svm4mx4xmfbq1q7y12jsxckzgpq"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R19.nix b/nixpkgs/pkgs/development/interpreters/erlang/R19.nix index e0d4ecbc95ac..25a3f662565c 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R19.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R19.nix @@ -14,6 +14,6 @@ mkDerivation rec { ]; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R20.nix b/nixpkgs/pkgs/development/interpreters/erlang/R20.nix index c408d21d9b31..016e175d6b56 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R20.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R20.nix @@ -5,6 +5,6 @@ mkDerivation rec { sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a"; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R21.nix b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix index 60eb6c8a6a5e..e21bf6dafbff 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R21.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix @@ -5,6 +5,6 @@ mkDerivation rec { sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R22.nix b/nixpkgs/pkgs/development/interpreters/erlang/R22.nix index 1af047f43bd7..a8c05513c5a6 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R22.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R22.nix @@ -5,7 +5,7 @@ mkDerivation rec { sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai"; prePatch = '' - substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" ''; } diff --git a/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix b/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix index 3bec73ea0369..56becd3d6c94 100644 --- a/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix +++ b/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, libX11, libXt }: +{ stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }: stdenv.mkDerivation rec { name = "icon-lang-${version}"; version = "9.5.1"; src = fetchFromGitHub { - rev = "39d7438e8d23ccfe20c0af8bbbf61e34d9c715e9"; owner = "gtownsend"; repo = "icon"; + rev = "rel${builtins.replaceStrings ["."] [""] version}"; sha256 = "1gkvj678ldlr1m5kjhx6zpmq11nls8kxa7pyy64whgakfzrypynw"; }; - buildInputs = [ libX11 libXt ]; - configurePhase = '' - make X-Configure name=linux - ''; + buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; + + configurePhase = + let + _name = if stdenv.isDarwin then "macintosh" else "linux"; + in + '' + make ${stdenv.lib.optionalString withGraphics "X-"}Configure name=${_name} + ''; installPhase = '' make Install dest=$out @@ -21,8 +26,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''A very high level general-purpose programming language''; - maintainers = with maintainers; [ vrthra ]; - platforms = platforms.linux; + maintainers = with maintainers; [ vrthra yurrriq ]; + platforms = with platforms; linux ++ darwin; license = licenses.publicDomain; homepage = https://www.cs.arizona.edu/icon/; }; diff --git a/nixpkgs/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix index b3b506783cd2..c8856ea2aa30 100644 --- a/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -115,25 +115,25 @@ in { self = pypy27; sourceVersion = { major = "7"; - minor = "0"; - patch = "0"; + minor = "1"; + patch = "1"; }; - sha256 = "1m6ja79sbkl38p1hs7c0n4kq5xzn01wp7wl5456hsw9q6cwg6894"; + sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg"; pythonVersion = "2.7"; db = db.override { dbmSupport = true; }; python = python27; inherit passthruFun; }; - pypy35 = callPackage ./pypy { - self = pypy35; + pypy36 = callPackage ./pypy { + self = pypy36; sourceVersion = { major = "7"; - minor = "0"; - patch = "0"; + minor = "1"; + patch = "1"; }; - sha256 = "0hbv9ziv8n9lqnr6cndrw70p6g40c00w1ds7lmzgrr153myxkp7w"; - pythonVersion = "3.5"; + sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1"; + pythonVersion = "3.6"; db = db.override { dbmSupport = true; }; python = python27; inherit passthruFun; @@ -143,26 +143,26 @@ in { # Not included at top-level self = pythonInterpreters.pypy27_prebuilt; sourceVersion = { - major = "6"; - minor = "0"; - patch = "0"; + major = "7"; + minor = "1"; + patch = "1"; }; - sha256 = "0rxgnp3fm18b87ln8bbjr13g2fsf4ka4abkaim6m03y9lwmr9gvc"; # linux64 + sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64 pythonVersion = "2.7"; inherit passthruFun; ncurses = ncurses5; }; - pypy35_prebuilt = callPackage ./pypy/prebuilt.nix { - # Not included at top-level - self = pythonInterpreters.pypy35_prebuilt; + pypy36_prebuilt = callPackage ./pypy/prebuilt.nix { + # Not included at top-level + self = pythonInterpreters.pypy36_prebuilt; sourceVersion = { - major = "6"; - minor = "0"; - patch = "0"; + major = "7"; + minor = "1"; + patch = "1"; }; - sha256 = "0j3h08s7wpglghasmym3baycpif5jshvmk9rpav4pwwy5clzmzsc"; # linux64 - pythonVersion = "3.5"; + sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64 + pythonVersion = "3.6"; inherit passthruFun; ncurses = ncurses5; }; diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index db7e51a51f32..7ec476b1ea49 100644 --- a/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -88,7 +88,9 @@ in with passthru; stdenv.mkDerivation rec { setupHook = python-setup-hook sitePackages; - doCheck = true; + # TODO: A bunch of tests are failing as of 7.1.1, please feel free to + # fix and re-enable if you have the patience and tenacity. + doCheck = false; checkPhase = let disabledTests = [ # disable shutils because it assumes gid 0 exists @@ -139,7 +141,7 @@ in with passthru; stdenv.mkDerivation rec { echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py # Include a sitecustomize.py file - cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py ''; inherit passthru; @@ -149,8 +151,7 @@ in with passthru; stdenv.mkDerivation rec { homepage = http://pypy.org/; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ andersk ]; - broken = true; # TODO: Tests are failing! }; } diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix index 1ac779ed25e3..af933f0a4bd0 100644 --- a/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -56,7 +56,7 @@ in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url= "https://bitbucket.org/pypy/pypy/downloads/pypy${majorVersion}-v${version}-linux64.tar.bz2"; + url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; inherit sha256; }; @@ -123,4 +123,4 @@ in with passthru; stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix index d48cf841b048..2c45ba589767 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr +{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages , libobjc }: +with stdenv.lib; + stdenv.mkDerivation rec { version = "38.8.0"; name = "spidermonkey-${version}"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "10lrync6cxnjlnadc0j3vg8r2dq9b3wwanw8qj1h6ncxwb7asxcl"; }; - buildInputs = [ libffi readline icu zlib nspr ] + buildInputs = [ libffi readline icu zlib ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; @@ -19,13 +21,13 @@ stdenv.mkDerivation rec { preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out - export PYTHON="${python2.interpreter}" + export PYTHON="${buildPackages.python2.interpreter}" ''; configureFlags = [ "--enable-threadsafe" "--with-system-ffi" - "--with-system-nspr" + "--enable-posix-nspr-emulation" "--with-system-zlib" "--with-system-icu" "--enable-readline" @@ -34,8 +36,17 @@ stdenv.mkDerivation rec { # not be good defaults for other uses. "--enable-gcgenerational" "--enable-shared-js" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Spidermonkey seems to use different host/build terminology for cross + # compilation here. + "--host=${stdenv.buildPlatform.config}" + "--target=${stdenv.hostPlatform.config}" ]; + configurePlatforms = []; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + # This addresses some build system bug. It's quite likely to be safe # to re-enable parallel builds if the source revision changes. enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix index 1dfaf9a22860..518fc5f77b72 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, buildPackages , which, readline, zlib, icu }: +with stdenv.lib; + let version = "60.4.0"; in stdenv.mkDerivation rec { @@ -24,7 +26,7 @@ in stdenv.mkDerivation rec { preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out - export PYTHON="${python2.interpreter}" + export PYTHON="${buildPackages.python2.interpreter}" # We can't build in js/src/, so create a build dir mkdir obj @@ -45,8 +47,17 @@ in stdenv.mkDerivation rec { # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e "--enable-optimize" "--enable-release" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Spidermonkey seems to use different host/build terminology for cross + # compilation here. + "--host=${stdenv.buildPlatform.config}" + "--target=${stdenv.hostPlatform.config}" ]; + configurePlatforms = []; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + # Remove unnecessary static lib preFixup = '' rm $out/lib/libjs_static.ajs diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/nixpkgs/pkgs/development/interpreters/wasmtime/cargo-lock.patch index be5bd0ab3d3e..854798865704 100644 --- a/nixpkgs/pkgs/development/interpreters/wasmtime/cargo-lock.patch +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/cargo-lock.patch @@ -1,9 +1,11 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..f702de1 +index 0000000..b961a31 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1475 @@ +@@ -0,0 +1,1608 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. +[[package]] +name = "aho-corasick" +version = "0.7.3" @@ -33,27 +35,26 @@ index 0000000..f702de1 +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "autocfg" -+version = "0.1.2" ++version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "backtrace" -+version = "0.3.15" ++version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -61,35 +62,35 @@ index 0000000..f702de1 +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bindgen" -+version = "0.49.0" ++version = "0.49.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bitflags" -+version = "1.0.4" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -110,7 +111,7 @@ index 0000000..f702de1 +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -120,7 +121,7 @@ index 0000000..f702de1 + +[[package]] +name = "cc" -+version = "1.0.35" ++version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -133,7 +134,7 @@ index 0000000..f702de1 + +[[package]] +name = "cfg-if" -+version = "0.1.7" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -141,8 +142,8 @@ index 0000000..f702de1 +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -152,8 +153,8 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -163,7 +164,7 @@ index 0000000..f702de1 +dependencies = [ + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -175,15 +176,15 @@ index 0000000..f702de1 +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cmake" -+version = "0.1.38" ++version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -274,7 +275,7 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -287,7 +288,7 @@ index 0000000..f702de1 +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -296,9 +297,9 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -306,13 +307,13 @@ index 0000000..f702de1 +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -338,8 +339,8 @@ index 0000000..f702de1 + "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -350,8 +351,8 @@ index 0000000..f702de1 + "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -360,7 +361,7 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -370,7 +371,7 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -385,8 +386,8 @@ index 0000000..f702de1 + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string-interner 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -395,7 +396,7 @@ index 0000000..f702de1 +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)", + "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -404,10 +405,10 @@ index 0000000..f702de1 +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -430,6 +431,14 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "fxhash" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "gcc" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -480,7 +489,7 @@ index 0000000..f702de1 +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -498,14 +507,6 @@ index 0000000..f702de1 + +[[package]] +name = "itertools" -+version = "0.7.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "itertools" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ @@ -514,7 +515,7 @@ index 0000000..f702de1 + +[[package]] +name = "itoa" -+version = "0.4.3" ++version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -524,15 +525,15 @@ index 0000000..f702de1 + +[[package]] +name = "libc" -+version = "0.2.51" ++version = "0.2.58" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "libloading" -+version = "0.5.0" ++version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -563,7 +564,7 @@ index 0000000..f702de1 +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -571,15 +572,7 @@ index 0000000..f702de1 +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "matrixmultiply" -+version = "0.1.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rawpointer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -592,7 +585,7 @@ index 0000000..f702de1 +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -615,14 +608,15 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "ndarray" -+version = "0.12.1" ++name = "nix" ++version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matrixmultiply 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-complex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -640,35 +634,36 @@ index 0000000..f702de1 +] + +[[package]] -+name = "num-complex" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "num-integer" -+version = "0.1.39" ++version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-traits" -+version = "0.2.6" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "num_cpus" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "numtoa" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "owning_ref" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -698,7 +693,7 @@ index 0000000..f702de1 + +[[package]] +name = "proc-macro2" -+version = "0.4.27" ++version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -725,7 +720,7 @@ index 0000000..f702de1 +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -735,12 +730,39 @@ index 0000000..f702de1 +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -762,19 +784,70 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "raw-cpuid" -+version = "6.1.0" ++name = "rand_hc" ++version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "rawpointer" -+version = "0.1.0" ++name = "rand_isaac" ++version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "raw-cpuid" ++version = "6.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "rayon" @@ -793,11 +866,19 @@ index 0000000..f702de1 +dependencies = [ + "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "redox_syscall" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -812,7 +893,7 @@ index 0000000..f702de1 + +[[package]] +name = "regex" -+version = "1.1.5" ++version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -835,15 +916,15 @@ index 0000000..f702de1 +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rustc-demangle" -+version = "0.1.14" ++version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -856,7 +937,7 @@ index 0000000..f702de1 + +[[package]] +name = "ryu" -+version = "0.2.7" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -878,9 +959,9 @@ index 0000000..f702de1 +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -898,20 +979,20 @@ index 0000000..f702de1 + +[[package]] +name = "serde" -+version = "1.0.90" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_derive" -+version = "1.0.90" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -919,9 +1000,9 @@ index 0000000..f702de1 +version = "1.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -944,7 +1025,7 @@ index 0000000..f702de1 +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -954,51 +1035,47 @@ index 0000000..f702de1 + +[[package]] +name = "strsim" -+version = "0.9.1" ++version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ndarray 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "structopt" -+version = "0.2.15" ++version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "structopt-derive" -+version = "0.2.15" ++version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syn" -+version = "0.15.31" ++version = "0.15.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "synstructure" -+version = "0.10.1" ++version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1019,7 +1096,7 @@ index 0000000..f702de1 + +[[package]] +name = "termcolor" -+version = "1.0.4" ++version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1027,10 +1104,11 @@ index 0000000..f702de1 + +[[package]] +name = "termion" -+version = "1.5.1" ++version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1056,7 +1134,7 @@ index 0000000..f702de1 +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1081,7 +1159,7 @@ index 0000000..f702de1 + +[[package]] +name = "unicode-segmentation" -+version = "1.2.1" ++version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1118,12 +1196,17 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "wabt" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", + "wabt-sys 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1133,12 +1216,35 @@ index 0000000..f702de1 +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "wasi-common" ++version = "0.1.0" ++source = "git+https://github.com/CraneStation/wasi-common#9a66400cd8cb31badaf4e43d0e27afd76639b3ac" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi-common-cbindgen 0.1.0 (git+https://github.com/CraneStation/wasi-common)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasi-common-cbindgen" ++version = "0.1.0" ++source = "git+https://github.com/CraneStation/wasi-common#9a66400cd8cb31badaf4e43d0e27afd76639b3ac" ++dependencies = [ ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "wasmparser" +version = "0.29.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1147,6 +1253,33 @@ index 0000000..f702de1 +] + +[[package]] ++name = "wasmtime" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-debug 0.1.0", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-jit 0.1.0", ++ "wasmtime-obj 0.1.0", ++ "wasmtime-runtime 0.1.0", ++ "wasmtime-wasi 0.0.0", ++ "wasmtime-wasi-c 0.0.0", ++ "wasmtime-wast 0.1.0", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "wasmtime-debug" +version = "0.1.0" +dependencies = [ @@ -1211,9 +1344,9 @@ index 0000000..f702de1 +name = "wasmtime-runtime" +version = "0.1.0" +dependencies = [ -+ "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1222,50 +1355,40 @@ index 0000000..f702de1 + "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.1.0", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "wasmtime-tools" -+version = "0.1.0" ++name = "wasmtime-wasi" ++version = "0.0.0" +dependencies = [ + "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-debug 0.1.0", ++ "wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common)", + "wasmtime-environ 0.1.0", + "wasmtime-jit 0.1.0", -+ "wasmtime-obj 0.1.0", + "wasmtime-runtime 0.1.0", -+ "wasmtime-wasi 0.0.0", -+ "wasmtime-wast 0.1.0", +] + +[[package]] -+name = "wasmtime-wasi" ++name = "wasmtime-wasi-c" +version = "0.0.0" +dependencies = [ -+ "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.1.0", @@ -1296,7 +1419,7 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1340,23 +1463,23 @@ index 0000000..f702de1 +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" +"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -+"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" -+"checksum backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637" ++"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" ++"checksum backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)" = "ada4c783bb7e7443c14e0480f429ae2cc99da95065aeab7ee1b81ada0419404f" +"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" -+"checksum bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33e1b67a27bca31fd12a683b2a3618e275311117f48cfcc892e18403ff889026" -+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)" = "846a1fba6535362a01487ef6b10f0275faa12e5c5d835c5c1c627aabc46ccbd6" ++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" +"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" +"checksum capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00be9d203fa0e078b93b24603633fb081851dfe0c1086364431f52587a47157e" +"checksum capstone-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc8d32bc5c1e6d0fcde10af411c98b07d93498d51654f678757f08fa2acd6a6" +"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" -+"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83" ++"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" +"checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af" -+"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" +"checksum clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4227269cec09f5f83ff160be12a1e9b0262dd1aa305302d5ba296c2ebd291055" +"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "96210eec534fc3fbfc0452a63769424eaa80205fda6cea98e5b61cb3d97bcec8" ++"checksum cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "2ca4386c8954b76a8415b63959337d940d724b336cabd3afe189c2b51a7e1ff0" +"checksum cranelift-bforest 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5a357d20666bf4a8c2d626a19f1b59dbca66cd844fb1e66c5612254fd0f7505" +"checksum cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab00cb149a5bb0f7e6dd391357356a5d71c335a431e8eece94f32da2d5a043f7" +"checksum cranelift-codegen-meta 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3797a2f450ac71297e083dd440d0cdd0d3bceabe4a3ca6bcb9e4077e9c0327d" @@ -1381,6 +1504,7 @@ index 0000000..f702de1 +"checksum fallible-iterator 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eb7217124812dc5672b7476d0c2d20cfe9f7c0f1ba0904b674a9762a0212f72e" +"checksum file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8505b75b31ef7285168dd237c4a7db3c1f3e0927e7d314e670bc98e854272fe9" +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" +"checksum gimli 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb3243218ca3773e9aa00d27602f35bd1daca3be1b7112ea5fc23b2899f1a4f3" +"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" @@ -1390,88 +1514,97 @@ index 0000000..f702de1 +"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" +"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" -+"checksum itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0d47946d458e94a1b7bcabbf6521ea7c037062c81f534615abcad76e84d4970d" +"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" -+"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" ++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" +"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" -+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917" -+"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" ++"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" ++"checksum libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5692f82b51823e27c4118b3e5c0d98aee9be90633ebc71ad12afef380b50219" +"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" +"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" -+"checksum matrixmultiply 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "dcad67dcec2d58ff56f6292582377e6921afdf3bfbd533e26fb8900ae575e002" +"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" +"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" +"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" +"checksum memoffset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7efacc914ca612fc1022f27b7dc51585e1a9f94c08fd5d322cfd741399260ce0" +"checksum multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "816df386e5557ac1843a96f1ba8a7cbf4ab175d05ccc15c87a3cda27b4fbdece" -+"checksum ndarray 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7cf380a8af901ad627594013a3bbac903ae0a6f94e176e47e46b5bbc1877b928" ++"checksum nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46f0f3210768d796e8fa79ec70ee6af172dacbe7147f5e69be5240a47778302b" +"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" +"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -+"checksum num-complex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "107b9be86cd2481930688277b675b0114578227f034674726605b8a482d8baf8" -+"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" -+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" ++"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" ++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" +"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" ++"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" +"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" +"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +"checksum pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61" -+"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" +"checksum quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4537d3e4edf73a15dd059b75bed1c292d17d3ea7517f583cebe716794fcf816" +"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" +"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372" +"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +"checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d" -+"checksum rawpointer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebac11a9d2e11f2af219b8b8d833b76b1ea0e054aa0e8d8e9e4cbde353bdf019" +"checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473" +"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" +"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -+"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0" ++"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58" +"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" +"checksum region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ace21a7fc79cffefeb66f2cc3ef22c7687015023bf7f85bec8840f0d46cb51cc" -+"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" ++"checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" +"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" ++"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" +"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" +"checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383" +"checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb" +"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4" -+"checksum serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79" ++"checksum serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "32746bf0f26eab52f06af0d0aa1984f641341d06d8d673c693871da2d188c9be" ++"checksum serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "46a3223d0c9ba936b61c0d2e3e559e3217dbfb8d65d06d26e8b3c25de38bae3e" +"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" +"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" +"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" +"checksum string-interner 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "abb38a0d8fe673c40b10b6b75abcb076a958cc10fb894f14993d9737c4c87000" +"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum strsim 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34ac666ab1423aa93bbd4cd47b6e62db5a846df4e28b959d823776eed5b57643" -+"checksum structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "3d0760c312538987d363c36c42339b55f5ee176ea8808bbe4543d484a291c8d1" -+"checksum structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "528aeb7351d042e6ffbc2a6fb76a86f9b622fdf7c25932798e7a82cb03bc94c6" -+"checksum syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b4cfac95805274c6afdb12d8f770fa2d27c045953e7b630a81801953699a9a" -+"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" ++"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" ++"checksum structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" ++"checksum structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" ++"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" ++"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" +"checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" +"checksum target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6923974ce4eb5bd28814756256d8ab71c28dd6e7483313fe7ab6614306bf633" -+"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" -+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" ++"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" ++"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" +"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" +"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" -+"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1" ++"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" +"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" +"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +"checksum wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "74e463a508e390cc7447e70f640fbf44ad52e1bd095314ace1fdf99516d32add" +"checksum wabt-sys 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a6265b25719e82598d104b3717375e37661d41753e2c84cde3f51050c7ed7e3c" ++"checksum wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common)" = "<none>" ++"checksum wasi-common-cbindgen 0.1.0 (git+https://github.com/CraneStation/wasi-common)" = "<none>" +"checksum wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)" = "981a8797cf89762e0233ec45fae731cb79a4dfaee12d9f0fe6cee01e4ac58d00" +"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" +"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 33d00afd9e70..90fc38afa061 100644 --- a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -1,18 +1,18 @@ { rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }: rustPlatform.buildRustPackage rec { - name = "wasmtime-${version}"; - version = "0.1.0"; + pname = "wasmtime"; + version = "20190521"; src = fetchFromGitHub { owner = "CraneStation"; repo = "wasmtime"; - rev = "07a6ca8f4e1136ecd9f4af8d1f03a01aade60407"; - sha256 = "1cq6nz90kaf023mcyblca90bpvbzhq8xjq01laa28v7r50lagcn5"; + rev = "e530a582afe6a2b5735fd7cdf5e2e88391e58669"; + sha256 = "13lqf9dp1cnw7ms7hcgirmlfkr0v7nrn3p5g7yacfasrqgnwsyl8"; fetchSubmodules = true; }; - cargoSha256 = "0xy8vazb4nc4q1098ws92j1yfwp9w7q30z0yk2gindkn898603bc"; + cargoSha256 = "1jbpq09czm295316gdv3y0pfapqs0ynj3qbarwlnrv7valq5ak13"; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/ace/default.nix b/nixpkgs/pkgs/development/libraries/ace/default.nix index e0c46acb6303..75c942d4d487 100644 --- a/nixpkgs/pkgs/development/libraries/ace/default.nix +++ b/nixpkgs/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.5"; + version = "6.5.6"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "1r1bvy65n50l6lbxm1k1bscqcv29mpkgp0pgr5cvvv7ldisrjl39"; + sha256 = "15lfjc8r854hvjfvimhnqc3987b3cdngilhkii9rwpzginbyipi4"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix index b6208eeeb510..4d071251ee8e 100644 --- a/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "1.0.1"; + version = "1.1"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "0ia7mgxs5g9849r26yrx07lrx65vhlrxqqh5b6d69gfi1pykb4j2"; + sha256 = "190bxsy92ffmvwpmyyg3lxs91vyss2z25rqz1w79gkj56484cy64"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index f2b038aa3795..3b93a351f7f9 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.600.5"; + version = "9.600.6"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1gy2rb3klvzx833851qgsbh5k1ds5zffwk0rmy1k8b1g51jdd76x"; + sha256 = "0wlk1yv9531vpvgja4cpy0sxykrn0p5w376kx86vl45b50yamx7g"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index c4cbd970d411..7660ea81eaf8 100644 --- a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -4,29 +4,30 @@ let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "8991d0b58d5a59925c87dd2a0bdb59a5a4a16bd4"; - sha256 = "00js5d1s98y3ianrvh1ggrd157yfmia4g55jx9xmfcz4a8mcbawx"; - }; - - # Enable non-bundled uriparser - # Introduced in https://github.com/apache/arrow/pull/4092 - Finduriparser_cmake = fetchurl { - url = https://raw.githubusercontent.com/apache/arrow/af4f52961209a5f1b43a19483536285c957e3bed/cpp/cmake_modules/Finduriparser.cmake; - sha256 = "1cylrw00n2nkc2c49xk9j3rrza351rpravxgpw047vimcw0sk93s"; + rev = "a277dc4e55ded3e3ea27dab1e4faf98c112442df"; + sha256 = "1yh5a8l4ship36hwmgmp2kl72s5ac9r8ly1qcs650xv2g9q7yhnq"; }; in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.13.0"; + version = "0.14.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "06irh5zx6lc7jjf6hpz1vzk0pvbdx08lcirc8cp8ksb8j7fpfamc"; + sha256 = "0a0xrsbr7dd1yp34yw82jw7psfkfvm935jhd5mam32vrsjvdsj4r"; }; sourceRoot = "apache-arrow-${version}/cpp"; + ARROW_JEMALLOC_URL = fetchurl { + # From + # ./cpp/cmake_modules/ThirdpartyToolchain.cmake + # ./cpp/thirdparty/versions.txt + url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2"; + sha256 = "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl"; + }; + patches = [ # patch to fix python-test ./darwin.patch @@ -42,8 +43,6 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - cp ${Finduriparser_cmake} cmake_modules/Finduriparser.cmake - patchShebangs build-support/ # Fix build for ARROW_USE_SIMD=OFF @@ -64,7 +63,7 @@ stdenv.mkDerivation rec { PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; installCheckInputs = [ perl which ]; installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin '' - for f in release/*-test; do + for f in release/*test; do install_name_tool -add_rpath "$out"/lib "$f" done '') + '' diff --git a/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix b/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix index 0e1445ca9ee1..3552e335feda 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix @@ -1,32 +1,38 @@ { stdenv, unzip, fetchurl }: -let - version = "24"; +# Upstream changes files in-place, to update: +# 1. Check latest version at http://www.un4seen.com/ +# 2. Update `version`s and `sha256` sums. +# See also http://www.un4seen.com/forum/?topic=18614.0 +let allBass = { bass = { h = "bass.h"; + version = "2.4.14"; so = { i686_linux = "libbass.so"; x86_64-linux = "x64/libbass.so"; }; - urlpath = "bass${version}-linux.zip"; - sha256 = "1hjxp1akj8367qlglv5rqpwq2dimfz3bkllwq39abavz4sp8smjz"; + urlpath = "bass24-linux.zip"; + sha256 = "1nyzs08z0djyvz6jx1y9y99y0ksp4sxz9l2x43k1c9irls24xpfy"; }; bass_fx = { h = "C/bass_fx.h"; + version = "2.4.12.1"; so = { i686_linux = "libbass_fx.so"; x86_64-linux = "x64/libbass_fx.so"; }; - urlpath = "z/0/bass_fx${version}-linux.zip"; + urlpath = "z/0/bass_fx24-linux.zip"; sha256 = "1q0g74z7iyhxqps5b3gnnbic8v2jji1r0mkvais57lsx8y21sbin"; }; }; dropBass = name: bass: stdenv.mkDerivation { - name = "lib${name}-${version}"; + pname = "lib${name}"; + inherit (bass) version; src = fetchurl { url = "https://www.un4seen.com/files/${bass.urlpath}"; diff --git a/nixpkgs/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix index bab0a84ca79a..3e6e62e5a967 100644 --- a/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "2.6.7"; + version = "2.7.0"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "1jjsyq6ljpprak8l76aym1p28j9y7djxl73pdh1kpkw85ac23h6m"; + sha256 = "1la6332cppyciyn3pflbchxa3av72a70p0n1c9sm1hgfbjlydqnv"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/crc32c/default.nix b/nixpkgs/pkgs/development/libraries/crc32c/default.nix new file mode 100644 index 000000000000..916ec5b703bb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/crc32c/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, gflags }: +stdenv.mkDerivation rec { + pname = "crc32c"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "crc32c"; + rev = version; + sha256 = "1sazkis9rzbrklfrvk7jn1mqywnq4yghmzg94mxd153h8b1sb149"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ gflags ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isAarch64 "-march=armv8-a+crc"; + + meta = with stdenv.lib; { + homepage = https://github.com/google/crc32c; + description = "CRC32C implementation with support for CPU-specific acceleration instructions"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/cre2/default.nix b/nixpkgs/pkgs/development/libraries/cre2/default.nix index 74619cbaaaed..d8130d0b8f91 100644 --- a/nixpkgs/pkgs/development/libraries/cre2/default.nix +++ b/nixpkgs/pkgs/development/libraries/cre2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cre2-${version}"; - version = "0.3.0"; - + version = "0.3.6"; + src = fetchFromGitHub { owner = "marcomaggi"; repo = "cre2"; - rev = version; - sha256 = "12yrdad87jjqrhbqm02hzsayan2402vf61a9x1b2iabv6d1c1bnj"; + rev = "v${version}"; + sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/nixpkgs/pkgs/development/libraries/flatpak/bubblewrap-paths.patch index 79257fd6be50..407811736f83 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/bubblewrap-paths.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/bubblewrap-paths.patch @@ -1,8 +1,8 @@ diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 6e23d9f2..8c621ec4 100644 +index 9e885070..d02eeb8c 100644 --- a/icon-validator/validate-icon.c +++ b/icon-validator/validate-icon.c -@@ -149,8 +149,8 @@ rerun_in_sandbox (const char *arg_width, +@@ -156,8 +156,8 @@ rerun_in_sandbox (const char *arg_width, "--unshare-ipc", "--unshare-net", "--unshare-pid", diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 4c4949b37be8..d29be4cb9304 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit -, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }: stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.2.4"; + version = "1.4.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1qf3ys84fzv11z6f6li59rxjdjbyrv7cyi9539k73r9i9pckjr8v"; + sha256 = "08nmpp26mgv0vp3mlwk97rnp0j7i108h4hr9nllja19sjxnrlygj"; }; patches = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xorg.libXau + libsoup lzma ostree polkit python3 systemd xorg.libXau fuse gsettings-desktop-schemas glib-networking librsvg # for flatpak-validate-icon ]; diff --git a/nixpkgs/pkgs/development/libraries/flatpak/fix-paths.patch b/nixpkgs/pkgs/development/libraries/flatpak/fix-paths.patch index 49fcaa2b3f9b..746b4382864b 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/fix-paths.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/fix-paths.patch @@ -1,6 +1,8 @@ +diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c +index 5dd7629e..ddc71a4c 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c -@@ -624,7 +624,7 @@ +@@ -693,7 +693,7 @@ start_p11_kit_server (const char *flatpak_dir) g_auto(GStrv) stdout_lines = NULL; int i; char *p11_argv[] = { @@ -9,7 +11,7 @@ /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support * this flag. This is good, because those earlier versions did not properly daemonize and caused * the spawn_sync to hang forever, waiting for the pipe to close. -@@ -770,7 +770,7 @@ +@@ -836,7 +836,7 @@ main (int argc, exit (1); } diff --git a/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch b/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch index f987899e3bcb..85b222152d0a 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,6 +1,8 @@ +diff --git a/tests/libtest.sh b/tests/libtest.sh +index 46bcefb3..0134425e 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -328,7 +328,7 @@ +@@ -352,7 +352,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then # running installed-tests: assume we know what we're doing _flatpak_bwrap_works=true elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -9,7 +11,7 @@ _flatpak_bwrap_works=false else _flatpak_bwrap_works=true -@@ -309,12 +309,12 @@ +@@ -426,12 +426,12 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -24,9 +26,11 @@ gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true fusermount -u $XDG_RUNTIME_DIR/doc || : if test -n "${TEST_SKIP_CLEANUP:-}"; then +diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh +index 0a0a28f1..16fd51fe 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh -@@ -114,13 +114,13 @@ msgid "Hello world" +@@ -129,13 +129,13 @@ msgid "Hello world" msgstr "Hallo Welt" EOF mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES @@ -42,9 +46,11 @@ flatpak build-finish ${DIR} mkdir -p repos +diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh +index 57899b75..9236996f 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh -@@ -26,6 +26,7 @@ +@@ -28,6 +28,7 @@ EOF PATH="$PATH:/usr/sbin:/sbin" # Add bash and dependencies @@ -52,7 +58,7 @@ mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -35,48 +36,27 @@ +@@ -37,48 +38,23 @@ if test -f /sbin/ldconfig.real; then else cp `which ldconfig` ${DIR}/usr/bin fi @@ -105,21 +111,20 @@ -# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but -# the real en_US locale is often not available, because its in the -# local archive. +-mkdir -p ${DIR}/usr/lib/locale/ +-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US +mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store +chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed +find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths +find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets -+ -+# We copy the whole locale archive because we do not have C.UTF8 locale - mkdir -p ${DIR}/usr/lib/locale/ --cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US -+cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive if [ x$COLLECTION_ID != x ]; then collection_args=--collection-id=${COLLECTION_ID} +diff --git a/tests/testlibrary.c b/tests/testlibrary.c +index f2773dc8..3af9026f 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -584,7 +584,7 @@ +@@ -1053,7 +1053,7 @@ check_bwrap_support (void) { gint exit_code = 0; char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", @@ -128,6 +133,8 @@ g_autofree char *argv_str = g_strjoinv (" ", argv); g_test_message ("Spawning %s", argv_str); g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error); +diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger +index 711cfab2..10c220ec 100755 --- a/triggers/gtk-icon-cache.trigger +++ b/triggers/gtk-icon-cache.trigger @@ -1,7 +1,7 @@ diff --git a/nixpkgs/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch b/nixpkgs/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch index 0e259aebd8a5..4cee60be2d07 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch @@ -1,6 +1,8 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 92ec3985..b3fccf1d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -40,8 +40,8 @@ +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], [ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) diff --git a/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch b/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch index 798e388b23c2..63ce0d12fe07 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,6 +1,8 @@ +diff --git a/common/flatpak-run.c b/common/flatpak-run.c +index 8d52d3a5..81700183 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = { +@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = { {"PERLLIB", NULL}, {"PERL5LIB", NULL}, {"XCURSOR_PATH", NULL}, diff --git a/nixpkgs/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/nixpkgs/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch index 408198bda5cb..01363ffb7b34 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch @@ -1,6 +1,8 @@ +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index 8f9dc66c..d3ab6e5f 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c -@@ -5758,7 +5758,7 @@ export_desktop_file (const char *app, +@@ -6701,7 +6701,7 @@ export_desktop_file (const char *app, new_exec = g_string_new (""); g_string_append_printf (new_exec, @@ -9,7 +11,7 @@ escaped_branch, escaped_arch); -@@ -6935,8 +6935,8 @@ flatpak_dir_deploy (FlatpakDir *self, +@@ -7891,8 +7891,8 @@ flatpak_dir_deploy (FlatpakDir *self, error)) return FALSE; @@ -21,28 +23,28 @@ G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) return FALSE; diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh -index 6937b041..01f8add7 100755 +index dff17f33..a9857adc 100755 --- a/tests/test-bundle.sh +++ b/tests/test-bundle.sh @@ -59,7 +59,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" +-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" ++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/tests/test-run.sh b/tests/test-run.sh -index 9d83d82e..234e4ec6 100755 +index 233df9ad..76e0b23b 100644 --- a/tests/test-run.sh +++ b/tests/test-run.sh -@@ -42,7 +42,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files - assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export +@@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files + assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" +-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" ++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch index 5b8cc2d0383f..086114e11c30 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch @@ -1,8 +1,8 @@ diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 6e23d9f2..f0659a78 100644 +index 9e885070..44fea035 100644 --- a/icon-validator/validate-icon.c +++ b/icon-validator/validate-icon.c -@@ -193,6 +193,8 @@ rerun_in_sandbox (const char *arg_width, +@@ -200,6 +200,8 @@ rerun_in_sandbox (const char *arg_width, add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL); if (g_getenv ("G_MESSAGES_PREFIXED")) add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index 3fba3db7a338..a2c3d41d35d1 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2019.07.22.00"; + version = "2019.08.05.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1vh5jrqz0lp6rc5fr6vk3yqss5vaycdsyap12mcr0cniv419fdxa"; + sha256 = "03arl9hg06rzbyaf3fzyk7q8d5mfbzfwmhqnfnvqcgzlqdj0gaa5"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/g2o/default.nix b/nixpkgs/pkgs/development/libraries/g2o/default.nix index 1486b5bfc55a..909c504870f0 100644 --- a/nixpkgs/pkgs/development/libraries/g2o/default.nix +++ b/nixpkgs/pkgs/development/libraries/g2o/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse, libGLU, qt5 +, libsForQt5, makeWrapper }: stdenv.mkDerivation rec { pname = "g2o"; @@ -11,8 +12,33 @@ stdenv.mkDerivation rec { sha256 = "1rgrz6zxiinrik3lgwgvsmlww1m2fnpjmvcx1mf62xi1s2ma5w2i"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen suitesparse ]; + # Removes a reference to gcc that is only used in a debug message + patches = [ ./remove-compiler-reference.patch ]; + + separateDebugInfo = true; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ eigen suitesparse libGLU qt5.qtbase libsForQt5.libqglviewer ]; + + cmakeFlags = [ + # Detection script is broken + "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" + "-DG2O_BUILD_EXAMPLES=OFF" + ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { + "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; + "westmere" = [ "-DDISABLE_SSE4_A=ON" ]; + "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ]; + "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ]; + "haswell" = [ "-DDISABLE_SSE4_A=ON" ]; + "broadwell" = [ "-DDISABLE_SSE4_A=ON" ]; + "skylake" = [ "-DDISABLE_SSE4_A=ON" ]; + "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); + + postInstall = '' + wrapProgram $out/bin/g2o_viewer \ + --prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" + ''; meta = { description = "A General Framework for Graph Optimization"; diff --git a/nixpkgs/pkgs/development/libraries/g2o/remove-compiler-reference.patch b/nixpkgs/pkgs/development/libraries/g2o/remove-compiler-reference.patch new file mode 100644 index 000000000000..347c57802403 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/g2o/remove-compiler-reference.patch @@ -0,0 +1,25 @@ +From b9bfed09e4e3c481b7eb36bee1ff4202ccf69dee Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer <benwolsieffer@gmail.com> +Date: Fri, 17 May 2019 19:05:36 -0400 +Subject: [PATCH] Remove reference to compiler. + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3f66dd..bb05bd0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -371,7 +371,7 @@ set(G2O_HAVE_CHOLMOD ${CHOLMOD_FOUND}) + set(G2O_HAVE_CSPARSE ${CSPARSE_FOUND}) + set(G2O_SHARED_LIBS ${BUILD_SHARED_LIBS}) + set(G2O_LGPL_SHARED_LIBS ${BUILD_LGPL_SHARED_LIBS}) +-set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER}") ++set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} unknown") + + configure_file(config.h.in "${PROJECT_BINARY_DIR}/g2o/config.h") + install(FILES ${PROJECT_BINARY_DIR}/g2o/config.h DESTINATION ${INCLUDES_DESTINATION}/g2o) +-- +2.21.0 + diff --git a/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/nixpkgs/pkgs/development/libraries/gnutls/default.nix index e0a54052c23e..1b17f4c800f5 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.6.8"; + version = "3.6.9"; # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "10ry71sy8zbksa905bjryphafcg25gkmfa3pf48ripimar7990da"; + sha256 = "1jqz5s3lv8sa53348cfi9nr5pw5l55n8m40b8msdvv0pb2jzqca3"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix new file mode 100644 index 000000000000..7dd075e440e5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -0,0 +1,65 @@ +{ stdenv, grpc, curl, cmake, pkgconfig, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, nlohmann_json, fetchurl }: +let + googleapis_rev = "a8ee1416f4c588f2ab92da72e7c1f588c784d3e6"; + googleapis = fetchurl { + name = "${googleapis_rev}.tar.gz"; + url = "https://github.com/googleapis/googleapis/archive/${googleapis_rev}.tar.gz"; + sha256 = "1kxi27r034p7jfldhvgpbn6rqqqddycnja47m6jyjxj4rcmrp2kb"; + }; +in stdenv.mkDerivation rec { + pname = "google-cloud-cpp"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "googleapis"; + repo = "google-cloud-cpp"; + rev = "v${version}"; + sha256 = "1w942gzyv01ym1cv2a417x92zxra9s2v3xz5crcv84j919f616f8"; + }; + + buildInputs = [ curl grpc protobuf nlohmann_json crc32c c-ares c-ares.cmake-config ]; + nativeBuildInputs = [ cmake pkgconfig doxygen ]; + + outputs = [ "out" "dev" ]; + + postPatch = '' + NLOHMANN_SHA256=$(sha256sum ${nlohmann_json}/include/nlohmann/json.hpp | cut -f1 -d' ') + sed -e 's,https://github.com/nlohmann/json/releases/download/.*,file://${nlohmann_json}/include/nlohmann/json.hpp"),' \ + -e "s,JSON_SHA256 .*,JSON_SHA256 ''${NLOHMANN_SHA256}," \ + -i cmake/DownloadNlohmannJson.cmake + + sed -e 's,https://github.com/googleapis/googleapis/archive/${googleapis_rev}.tar.gz,file://${googleapis},' \ + -i cmake/external/googleapis.cmake + + # Fixup the library path. It would build a path like /build/external//nix/store/…-foo/lib/foo.so for each library instead of /build/external/lib64/foo.so + sed -e 's,''${CMAKE_INSTALL_LIBDIR},lib64,g' \ + -e 's,;lib64,lib,g' \ + -i cmake/ExternalProjectHelper.cmake + ''; + + preFixup = '' + mv --no-clobber $out/lib64/cmake/* $out/lib/cmake + mv --no-clobber $out/lib64/pkgconfig/* $out/lib/pkgconfig + rmdir $out/lib64/cmake $out/lib64/pkgconfig + find $out/lib64 + + for file in $out/lib/pkgconfig/*; do + sed -e 's,\''${prefix}//,/,g' -i $file + done + ''; + + cmakeFlags = [ + "-DGOOGLE_CLOUD_CPP_BIGTABLE_ENABLE_INSTALL=no" + "-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package" + "-DGOOGLE_CLOUD_CPP_GOOGLEAPIS_PROVIDER=external" + "-DBUILD_SHARED_LIBS:BOOL=ON" + "-DGOOGLE_CLOUD_CPP_INSTALL_RPATH=$(out)/lib" + ]; + + meta = with stdenv.lib; { + license = with licenses; [ asl20 ]; + homepage = https://github.com/googleapis/google-cloud-cpp; + description = "C++ Idiomatic Clients for Google Cloud Platform services"; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch b/nixpkgs/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch new file mode 100644 index 000000000000..4607f8b8ee09 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch @@ -0,0 +1,37 @@ +From 8c67f314de2684d77315eecd99ef091d441f17dd Mon Sep 17 00:00:00 2001 +From: Matthew Bauer <mjbauer95@gmail.com> +Date: Wed, 24 Jul 2019 15:35:18 -0400 +Subject: [PATCH] Make hunspell look in XDG_DATA_DIRS for dictionaries + +Some dictionaries may exist but only show up under XDG_DATA_DIRS. For +instance, $HOME/.local/share/hunspell could contain some dictionaries. + +This patch adds each directory in the hunspell subdir of each +XDG_DATA_DIRS to the lookup path. + +Upstream pr is available at: https://github.com/hunspell/hunspell/pull/637 +--- + src/tools/hunspell.cxx | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/tools/hunspell.cxx b/src/tools/hunspell.cxx +index 690e34a..6cd127e 100644 +--- a/src/tools/hunspell.cxx ++++ b/src/tools/hunspell.cxx +@@ -2044,6 +2044,13 @@ int main(int argc, char** argv) { + if (getenv("DICPATH")) { + path_std_str.append(getenv("DICPATH")).append(PATHSEP); + } ++ if (getenv("XDG_DATA_DIRS")) { ++ char* dir = strtok(getenv("XDG_DATA_DIRS"), ":"); ++ while (dir != NULL) { ++ path_std_str.append(dir).append("/hunspell:"); ++ dir = strtok(NULL, ":"); ++ } ++ } + path_std_str.append(LIBDIR).append(PATHSEP); + if (HOME) { + const char * userooodir[] = USEROOODIR; +-- +2.22.0 + diff --git a/nixpkgs/pkgs/development/libraries/hunspell/default.nix b/nixpkgs/pkgs/development/libraries/hunspell/default.nix index 3728c05e516c..18e32585ce2a 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; nativeBuildInputs = [ autoreconfHook ]; + patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ]; + postPatch = '' patchShebangs tests ''; diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index b8de133f5025..1c86830f2582 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -286,10 +286,11 @@ let }; }; -in { +in rec { /* ENGLISH */ + en_US = en-us; en-us = mkDictFromWordlist { shortName = "en-us"; shortDescription = "English (United States)"; @@ -300,6 +301,7 @@ in { }; }; + en_CA = en-ca; en-ca = mkDictFromWordlist { shortName = "en-ca"; shortDescription = "English (Canada)"; @@ -310,6 +312,7 @@ in { }; }; + en_GB-ise = en-gb-ise; en-gb-ise = mkDictFromWordlist { shortName = "en-gb-ise"; shortDescription = "English (United Kingdom, 'ise' ending)"; @@ -320,6 +323,7 @@ in { }; }; + en_GB-ize = en-gb-ize; en-gb-ize = mkDictFromWordlist { shortName = "en-gb-ize"; shortDescription = "English (United Kingdom, 'ize' ending)"; @@ -332,126 +336,147 @@ in { /* SPANISH */ + es_ANY = es-any; es-any = mkDictFromRla { shortName = "es-any"; shortDescription = "Spanish (any variant)"; dictFileName = "es_ANY"; }; + es_AR = es-ar; es-ar = mkDictFromRla { shortName = "es-ar"; shortDescription = "Spanish (Argentina)"; dictFileName = "es_AR"; }; + es_BO = es-bo; es-bo = mkDictFromRla { shortName = "es-bo"; shortDescription = "Spanish (Bolivia)"; dictFileName = "es_BO"; }; + es_CL = es-cl; es-cl = mkDictFromRla { shortName = "es-cl"; shortDescription = "Spanish (Chile)"; dictFileName = "es_CL"; }; + es_CO = es-co; es-co = mkDictFromRla { shortName = "es-co"; shortDescription = "Spanish (Colombia)"; dictFileName = "es_CO"; }; + es_CR = es-cr; es-cr = mkDictFromRla { shortName = "es-cr"; shortDescription = "Spanish (Costra Rica)"; dictFileName = "es_CR"; }; + es_CU = es-cu; es-cu = mkDictFromRla { shortName = "es-cu"; shortDescription = "Spanish (Cuba)"; dictFileName = "es_CU"; }; + es_DO = es-do; es-do = mkDictFromRla { shortName = "es-do"; shortDescription = "Spanish (Dominican Republic)"; dictFileName = "es_DO"; }; + es_EC = es-ec; es-ec = mkDictFromRla { shortName = "es-ec"; shortDescription = "Spanish (Ecuador)"; dictFileName = "es_EC"; }; + es_ES = es-es; es-es = mkDictFromRla { shortName = "es-es"; shortDescription = "Spanish (Spain)"; dictFileName = "es_ES"; }; + es_GT = es-gt; es-gt = mkDictFromRla { shortName = "es-gt"; shortDescription = "Spanish (Guatemala)"; dictFileName = "es_GT"; }; + es_HN = es-hn; es-hn = mkDictFromRla { shortName = "es-hn"; shortDescription = "Spanish (Honduras)"; dictFileName = "es_HN"; }; + es_MX = es-mx; es-mx = mkDictFromRla { shortName = "es-mx"; shortDescription = "Spanish (Mexico)"; dictFileName = "es_MX"; }; + es_NI = es-ni; es-ni = mkDictFromRla { shortName = "es-ni"; shortDescription = "Spanish (Nicaragua)"; dictFileName = "es_NI"; }; + es_PA = es-pa; es-pa = mkDictFromRla { shortName = "es-pa"; shortDescription = "Spanish (Panama)"; dictFileName = "es_PA"; }; + es_PE = es-pe; es-pe = mkDictFromRla { shortName = "es-pe"; shortDescription = "Spanish (Peru)"; dictFileName = "es_PE"; }; + es_PR = es-pr; es-pr = mkDictFromRla { shortName = "es-pr"; shortDescription = "Spanish (Puerto Rico)"; dictFileName = "es_PR"; }; + es_PY = es-py; es-py = mkDictFromRla { shortName = "es-py"; shortDescription = "Spanish (Paraguay)"; dictFileName = "es_PY"; }; + es_SV = es-sv; es-sv = mkDictFromRla { shortName = "es-sv"; shortDescription = "Spanish (El Salvador)"; dictFileName = "es_SV"; }; + es_UY = es-uy; es-uy = mkDictFromRla { shortName = "es-uy"; shortDescription = "Spanish (Uruguay)"; dictFileName = "es_UY"; }; + es_VE = es-ve; es-ve = mkDictFromRla { shortName = "es-ve"; shortDescription = "Spanish (Venezuela)"; @@ -505,6 +530,7 @@ in { /* ITALIAN */ + it_IT = it-it; it-it = mkDictFromLinguistico rec { shortName = "it-it"; dictFileName = "it_IT"; @@ -517,6 +543,7 @@ in { /* BASQUE */ + eu_ES = eu-es; eu-es = mkDictFromXuxen { shortName = "eu-es"; dictFileName = "eu_ES"; @@ -549,6 +576,7 @@ in { /* HUNGARIAN */ + hu_HU = hu-hu; hu-hu = mkDictFromLibreOffice { shortName = "hu-hu"; dictFileName = "hu_HU"; @@ -557,7 +585,8 @@ in { }; /* SWEDISH */ - + + sv_SE = sv-se; sv-se = mkDictFromDSSO rec { shortName = "sv-se"; dictFileName = "sv_SE"; @@ -565,26 +594,30 @@ in { }; # Finlandian Swedish (hello Linus Torvalds) + sv_FI = sv-fi; sv-fi = mkDictFromDSSO rec { shortName = "sv-fi"; dictFileName = "sv_FI"; shortDescription = "Swedish (Finland)"; }; - + /* GERMAN */ + de_DE = de-de; de-de = mkDictFromJ3e { shortName = "de-de"; shortDescription = "German (Germany)"; dictFileName = "de_DE"; }; + de_AT = de-at; de-at = mkDictFromJ3e { shortName = "de-at"; shortDescription = "German (Austria)"; dictFileName = "de_AT"; }; + de_CH = de-ch; de-ch = mkDictFromJ3e { shortName = "de-ch"; shortDescription = "German (Switzerland)"; @@ -593,6 +626,7 @@ in { /* UKRAINIAN */ + uk_UA = uk-ua; uk-ua = mkDict rec { name = "hunspell-dict-uk-ua-${version}"; version = "4.2.5"; diff --git a/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix index 8616a0146755..cbedd97b2eec 100644 --- a/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "gphoto"; repo = "libgphoto2"; rev = "${meta.tag}"; - sha256 = "0pbfg89817qkb35mmajsw2iz6j9nhkkj67m419f8x8yxpqkaa0wb"; + sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2"; }; patches = []; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.17"; - tag = "libgphoto2-2_5_17-release"; + version = "2.5.23"; + tag = "libgphoto2-2_5_23-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 371d7b838d40..191c375f3be8 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ]; - cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" "-DENABLE_STATIC=0" ]; + cmakeFlags = [ + "-DENABLE_STATIC=0" + ]; doInstallCheck = true; installCheckTarget = "test"; diff --git a/nixpkgs/pkgs/development/libraries/libmodulemd/1.nix b/nixpkgs/pkgs/development/libraries/libmodulemd/1.nix new file mode 100644 index 000000000000..174296375e08 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libmodulemd/1.nix @@ -0,0 +1,21 @@ +{ libmodulemd, fetchurl }: + +libmodulemd.overrideAttrs(old: rec { + name = "libmodulemd-${version}"; + version = "1.8.15"; + + # Removes py output since there's no overrides here + outputs = [ "out" "devdoc" ]; + + patches = [ + # Checks for glib docs in glib's prefix + # but they're installed to another + ./dont-check-docs.patch + ]; + + src = fetchurl { + url = "https://github.com/fedora-modularity/libmodulemd/releases/download/${name}/modulemd-${version}.tar.xz"; + sha256 = "0gz8p3qzji3cx0r57sy3gn4dhigg4k7pcxj3lmjcjn13vxh5rm7z"; + }; + +}) diff --git a/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix new file mode 100644 index 000000000000..ba77c7806b53 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, meson +, ninja +, gobject-introspection +, python3 +, libyaml +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, glib +}: + +stdenv.mkDerivation rec { + pname = "libmodulemd"; + version = "2.6.0"; + + outputs = [ "out" "devdoc" "py" ]; + + src = fetchFromGitHub { + owner = "fedora-modularity"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0gizfmzs6jrzb29lwcimm5dq3027935xbzwgkbvbp67zcmjd3y5i"; + }; + + patches = [ + ./pygobject-dir.patch + ]; + + nativeBuildInputs = [ + pkgconfig + meson + ninja + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + gobject-introspection + ]; + + buildInputs = [ + libyaml + glib + ]; + + mesonFlags = [ + "-Ddeveloper_build=false" + "-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + ]; + + meta = with stdenv.lib; { + description = "C Library for manipulating module metadata files"; + homepage = "https://github.com/fedora-modularity/libmodulemd"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libmodulemd/dont-check-docs.patch b/nixpkgs/pkgs/development/libraries/libmodulemd/dont-check-docs.patch new file mode 100644 index 000000000000..38ad5683692b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libmodulemd/dont-check-docs.patch @@ -0,0 +1,29 @@ +diff --git a/meson.build b/meson.build +index 155c9e7..9125372 100644 +--- a/meson.build ++++ b/meson.build +@@ -60,15 +60,15 @@ sh = find_program('sh') + sed = find_program('sed') + test = find_program('test') + +-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) +-if ret.returncode() != 0 +- error('Missing documentation for GLib.') +-endif +- +-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) +-if ret.returncode() != 0 +- error('Missing documentation for GObject.') +-endif ++# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) ++# if ret.returncode() != 0 ++# error('Missing documentation for GLib.') ++# endif ++ ++# ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) ++# if ret.returncode() != 0 ++# error('Missing documentation for GObject.') ++# endif + + python_name = get_option('python_name') + diff --git a/nixpkgs/pkgs/development/libraries/libmodulemd/pygobject-dir.patch b/nixpkgs/pkgs/development/libraries/libmodulemd/pygobject-dir.patch new file mode 100644 index 000000000000..a367872eec65 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libmodulemd/pygobject-dir.patch @@ -0,0 +1,45 @@ +diff --git a/bindings/python/meson.build b/bindings/python/meson.build +index 4358b79..61fd5a5 100644 +--- a/bindings/python/meson.build ++++ b/bindings/python/meson.build +@@ -1,3 +1,5 @@ ++pygobject_override_dir = get_option('pygobject_override_dir') ++ + get_overridedir = ''' + import os + import sysconfig +@@ -21,7 +23,7 @@ print(overridedir) + ''' + + # Python 3 +-if (get_option('with_py3_overrides')) ++if (get_option('with_py3_overrides')) and pygobject_override_dir == '' + ret = run_command([python3, '-c', get_overridedir]) + + if ret.returncode() != 0 +@@ -34,7 +36,7 @@ if (get_option('with_py3_overrides')) + endif + + # Python 2 +-if (get_option('with_py2_overrides')) ++if (get_option('with_py2_overrides')) and pygobject_override_dir == '' + ret2 = run_command([python2, '-c', get_overridedir]) + + if ret2.returncode() != 0 +@@ -45,3 +47,7 @@ if (get_option('with_py2_overrides')) + + install_data('gi/overrides/Modulemd.py', install_dir: pygobject2_override_dir) + endif ++ ++if pygobject_override_dir != '' ++ install_data('gi/overrides/Modulemd.py', install_dir: pygobject_override_dir) ++endif +diff --git a/meson_options.txt b/meson_options.txt +index 147419f..9071a04 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -18,3 +18,4 @@ option('skip_introspection', type : 'boolean', value : false) + option('python_name', type : 'string') + option('with_py2_overrides', type : 'boolean', value : false) + option('with_py3_overrides', type : 'boolean', value : true) ++option('pygobject_override_dir', type : 'string', value : '', description: 'Path to pygobject overrides directory') diff --git a/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix b/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix index e68c5052beb8..34b396a71026 100644 --- a/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: +{ stdenv, fetchurl, qmake, qtbase, libGLU, AGL }: stdenv.mkDerivation rec { - name = "libqglviewer-2.6.3"; - version = "2.6.3"; + pname = "libqglviewer"; + version = "2.7.1"; src = fetchurl { url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; - sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; + sha256 = "08f10yk22kjdsvrqhd063gqa8nxnl749c20mwhaxij4f7rzdkixz"; }; - buildInputs = [ qt4 qmake4Hook ] + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase libGLU ] ++ stdenv.lib.optional stdenv.isDarwin AGL; - postPatch = - '' - cd QGLViewer - ''; + postPatch = '' + cd QGLViewer + ''; meta = with stdenv.lib; { description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers"; - homepage = http://libqglviewer.com/; + homepage = "http://libqglviewer.com"; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix index 5aa26a749e4f..6bfb694a41b7 100644 --- a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests - # TODO: move the following to CMake setup hook - "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" - "-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libversion/default.nix b/nixpkgs/pkgs/development/libraries/libversion/default.nix index 0ace54582ebc..3c7ed207703b 100644 --- a/nixpkgs/pkgs/development/libraries/libversion/default.nix +++ b/nixpkgs/pkgs/development/libraries/libversion/default.nix @@ -1,10 +1,8 @@ { stdenv, fetchFromGitHub, cmake }: -let - version = "2.8.1"; -in -stdenv.mkDerivation { - name = "libversion-${version}"; +stdenv.mkDerivation rec { + pname = "libversion"; + version = "2.9.0"; src = fetchFromGitHub { owner = "repology"; diff --git a/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix index 9c35d3373505..29692c41c930 100644 --- a/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix @@ -1,31 +1,78 @@ -{ stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3 }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, libX11 +, glib +, gtk3 +, pango +, cairo +, libXres +, libstartup_notification +, gettext +, gobject-introspection +, gnome3 +}: -let +stdenv.mkDerivation rec{ pname = "libwnck"; - version = "3.30.0"; -in stdenv.mkDerivation rec{ - name = "${pname}-${version}"; + version = "3.32.0"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f9lvhm3w25046dqq8xyg7nzggxpmdriwrb661nng05a8qk0svdc"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1jp3p1lnwnwi6fxl2rz3166cmwzwy9vqz896anpwc3wdy9f875cm"; }; - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; + patches = [ + # https://gitlab.gnome.org/GNOME/libwnck/issues/139 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/libwnck/commit/0d9ff7db63af568feef8e8c566e249058ccfcb4e.patch; + sha256 = "18f78aayq9jma54v2qz3rm2clmz1cfq5bngxw8p4zba7hplyqsl9"; + }) + # https://gitlab.gnome.org/GNOME/libwnck/merge_requests/12 + ./fix-pc-file.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; - configureFlags = [ "--enable-introspection" ]; + buildInputs = [ + libX11 + libstartup_notification + pango + cairo + libXres + ]; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - propagatedBuildInputs = [ libX11 gtk3 ]; + propagatedBuildInputs = [ + glib + gtk3 + ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + mesonFlags = [ + "-Dgtk_doc=true" + ]; passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "${pname}${stdenv.lib.versions.major version}"; }; }; diff --git a/nixpkgs/pkgs/development/libraries/libwnck/fix-pc-file.patch b/nixpkgs/pkgs/development/libraries/libwnck/fix-pc-file.patch new file mode 100644 index 000000000000..42017a993b51 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libwnck/fix-pc-file.patch @@ -0,0 +1,24 @@ +diff --git a/meson.build b/meson.build +index 28799d8..047e523 100644 +--- a/meson.build ++++ b/meson.build +@@ -72,11 +72,15 @@ + pc_conf = configuration_data() + pc_conf.set('prefix', get_option('prefix')) + pc_conf.set('exec_prefix', '${prefix}') +-pc_conf.set('libdir', '${exec_prefix}/' + get_option('libdir')) +-pc_conf.set('includedir', '${prefix}/' + get_option('includedir')) +-pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE) ++pc_conf.set('libdir', '${exec_prefix}' / get_option('libdir')) ++pc_conf.set('includedir', '${prefix}' / get_option('includedir')) ++if conf.has('HAVE_' + STARTUP_NOTIFICATION_PACKAGE.to_upper().underscorify()) ++ pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE) ++endif + pc_conf.set('X11_PACKAGE', X11_PACKAGE) +-pc_conf.set('XRES_PACKAGE', XRES_PACKAGE) ++if conf.has('HAVE_' + XRES_PACKAGE.to_upper().underscorify()) ++ pc_conf.set('XRES_PACKAGE', XRES_PACKAGE) ++endif + pc_conf.set('VERSION', meson.project_version()) + + foreach pc: [PACKAGE_NAME, PACKAGE_NAME + '-uninstalled'] diff --git a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix new file mode 100644 index 000000000000..d1a20552ff76 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr }: + +stdenv.mkDerivation rec { + pname = "openxr-loader"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "OpenXR-SDK-Source"; + rev = "release-${version}"; + sha256 = "1sif2w2vm793j6493364i6pp6s6yqi7fwa6iky5abzmzda51cg5q"; + }; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ libX11 libXxf86vm libXrandr ]; + enableParallelBuilding = true; + + cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + + outputs = [ "out" "dev" "layers" ]; + + postInstall = '' + mkdir -p "$layers/share" + mv "$out/share/openxr" "$layers/share" + # Use absolute paths in manifests so no LD_LIBRARY_PATH shenanigans are necessary + for file in "$layers/share/openxr/1/api_layers/explicit.d/"*; do + substituteInPlace "$file" --replace '"library_path": "lib' "\"library_path\": \"$layers/lib/lib" + done + mkdir -p "$layers/lib" + mv "$out/lib/libXrApiLayer"* "$layers/lib" + ''; + + meta = with stdenv.lib; { + description = "Khronos OpenXR loader"; + homepage = https://www.khronos.org/openxr; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/ptex/default.nix b/nixpkgs/pkgs/development/libraries/ptex/default.nix index aa17771ec9f2..b4571d07fbf3 100644 --- a/nixpkgs/pkgs/development/libraries/ptex/default.nix +++ b/nixpkgs/pkgs/development/libraries/ptex/default.nix @@ -1,36 +1,27 @@ -{ stdenv, fetchFromGitHub, zlib, python, cmake }: +{ stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }: stdenv.mkDerivation rec { - name = "ptex-${version}"; - version = "2.3.0"; + pname = "ptex"; + version = "2.3.2"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; rev = "v${version}"; - sha256 = "0nfz0y66bmi6xckn1whi4sfd8i3ibln212fgm4img2z98b6vccyg"; + sha256 = "1c3pdqszn4y3d86qzng8b0hqdrchnl39adq5ab30wfnrgl2hnm4z"; }; outputs = [ "bin" "dev" "out" "lib" ]; - buildInputs = [ zlib python cmake ]; + buildInputs = [ zlib python cmake pkg-config ]; enableParallelBuilding = true; - buildPhase = '' - mkdir -p $out - - make prefix=$out - - mkdir -p $bin/bin - mkdir -p $dev/include - mkdir -p $lib/lib - ''; - - installPhase = '' - make install - mv $out/bin $bin/ + # Can be removed in the next release + # https://github.com/wdas/ptex/pull/42 + patchPhase = '' + echo v${version} >version ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/pth/default.nix b/nixpkgs/pkgs/development/libraries/pth/default.nix index c315cb8f72b4..b2173ec21ee1 100644 --- a/nixpkgs/pkgs/development/libraries/pth/default.nix +++ b/nixpkgs/pkgs/development/libraries/pth/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") + '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' + configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") ''; meta = with stdenv.lib; { @@ -17,6 +19,5 @@ stdenv.mkDerivation rec { homepage = https://www.gnu.org/software/pth; license = licenses.lgpl21Plus; platforms = platforms.all; - broken = stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isAarch64; }; } diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix index de6457db98b2..f833d130fbba 100644 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { + "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff"; sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; }) - (fetchpatch { - name = "qt4-gcc6.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; - sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; - }) + # Patch is no longer available from here, so vendoring it for now. + #(fetchpatch { + # name = "qt4-gcc6.patch"; + # url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; + # sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; + #}) + ./qt4-gcc6.patch ] ++ lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch new file mode 100644 index 000000000000..000e345cf132 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch @@ -0,0 +1,33 @@ +--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500 ++++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500 +@@ -7744,7 +7744,7 @@ + *-g++*) + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 5*|4*|3.4*) ++ 8*|7*|6*|5*|4*|3.4*) + ;; + 3.3*) + canBuildWebKit="no" +@@ -8060,7 +8060,7 @@ + 3.*) + COMPILER_VERSION="3.*" + ;; +- 5*|4.*) ++ 8*|7*|6*|5*|4.*) + COMPILER_VERSION="4" + ;; + *) +--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500 +@@ -70,8 +70,8 @@ + ForegroundShift = 10, + BackgroundShift = 20, + SpecialShift = 20, +- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift, +- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift ++ ForegroundMask = 0x1f << ForegroundShift, ++ BackgroundMask = 0x7 << BackgroundShift + }; + + public: diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix index 67c5047e5078..7f0937db30f0 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix @@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -32,7 +31,7 @@ with stdenv.lib; let - qtCompatVersion = "5.11"; + qtCompatVersion = srcs.qtbase.version; stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index 1fbf7b57289f..1bc63d0e2b9d 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -32,7 +31,7 @@ with stdenv.lib; let - qtCompatVersion = "5.12"; + qtCompatVersion = srcs.qtbase.version; stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.6/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.6/default.nix index 4f739b57ffec..d45b014b765e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/default.nix @@ -18,9 +18,8 @@ existing packages here and modify it as necessary. 1. Update the URL in `./fetch.sh`. 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/` from the top of the Nixpkgs tree. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -40,7 +39,7 @@ with stdenv.lib; let - qtCompatVersion = "5.6"; + qtCompatVersion = srcs.qtbase.version; mirror = "http://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix index f36f86e26ffe..52c763263b53 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix @@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -31,7 +30,7 @@ with stdenv.lib; let - qtCompatVersion = "5.9"; + qtCompatVersion = srcs.qtbase.version; mirror = "http://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix index b94cdd22f7f0..dd50e6ec0398 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, pkgconfig, gtk2 }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "qtstyleplugins-2017-03-11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/readline/readline-8.0-patches.nix b/nixpkgs/pkgs/development/libraries/readline/readline-8.0-patches.nix index b8019fb33502..433da83dab95 100644 --- a/nixpkgs/pkgs/development/libraries/readline/readline-8.0-patches.nix +++ b/nixpkgs/pkgs/development/libraries/readline/readline-8.0-patches.nix @@ -1,4 +1,5 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ +(patch "001" "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq") ] diff --git a/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix b/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix new file mode 100644 index 000000000000..953f5a70b8aa --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, gfortran, perl }: + +stdenv.mkDerivation rec { + pname = "spooles"; + version = "2.2"; + + src = fetchurl { + url = "http://www.netlib.org/linalg/spooles/spooles.${version}.tgz"; + sha256 = "1pf5z3vvwd8smbpibyabprdvcmax0grzvx2y0liy98c7x6h5jid8"; + }; + + sourceRoot = "."; + + patches = [ + ./spooles.patch + ]; + + buildPhase = '' + make lib + ''; + + installPhase = '' + mkdir -p $out/lib $out/include/spooles + cp libspooles.a libspooles.so.2.2 $out/lib/ + ln -s libspooles.so.2.2 $out/lib/libspooles.so.2 + ln -s libspooles.so.2 $out/lib/libspooles.so + for h in *.h; do + if [ $h != 'MPI.h' ]; then + cp $h $out/include/spooles + d=`basename $h .h` + if [ -d $d ]; then + mkdir $out/include/spooles/$d + cp $d/*.h $out/include/spooles/$d + fi + fi + done + ''; + + nativeBuildInputs = [ perl ]; + + meta = with stdenv.lib; { + homepage = "http://www.netlib.org/linalg/spooles/"; + description = "Library for solving sparse real and complex linear systems of equations"; + license = licenses.publicDomain; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch b/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch new file mode 100644 index 000000000000..c0c93c9365c9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch @@ -0,0 +1,188 @@ +diff --git a/I2Ohash/src/util.c b/I2Ohash/src/util.c +index 72d082e..f32f667 100644 +--- a/I2Ohash/src/util.c ++++ b/I2Ohash/src/util.c +@@ -39,9 +39,10 @@ fflush(stdout) ; + */ + loc1 = (key1 + 1) % hashtable->nlist ; + loc2 = (key2 + 1) % hashtable->nlist ; +-loc = (loc1*loc2) % hashtable->nlist ; ++long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; ++loc =(int) loc3; + #if MYDEBUG > 0 +-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; ++fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; + fflush(stdout) ; + #endif + /* +@@ -158,9 +159,10 @@ fflush(stdout) ; + #endif + loc1 = (key1 + 1) % hashtable->nlist ; + loc2 = (key2 + 1) % hashtable->nlist ; +-loc = (loc1*loc2) % hashtable->nlist ; ++long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; ++loc =(int) loc3; + #if MYDEBUG > 0 +-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; ++fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; + fflush(stdout) ; + #endif + /* +diff --git a/MPI/makefile b/MPI/makefile +index 0c09f86..d25e70a 100644 +--- a/MPI/makefile ++++ b/MPI/makefile +@@ -2,7 +2,7 @@ all_drivers : + cd drivers ; make drivers + + lib : +- cd src ; make spoolesMPI.a ++ cd src ; make makeLib + + clean : + cd src ; make clean +diff --git a/MPI/src/makefile b/MPI/src/makefile +index f7650b7..71e4c49 100644 +--- a/MPI/src/makefile ++++ b/MPI/src/makefile +@@ -42,3 +42,8 @@ $(OBJ).a : \ + + clean : + - rm -f *.a *.o ++ ++makeLib : ++ perl ../../makeLib > makeG ++ make -f makeG ++ rm -f makeG +diff --git a/MT/makefile b/MT/makefile +index 9b86a32..d25e70a 100644 +--- a/MT/makefile ++++ b/MT/makefile +@@ -2,7 +2,7 @@ all_drivers : + cd drivers ; make drivers + + lib : +- cd src ; make spoolesMT.a ++ cd src ; make makeLib + + clean : + cd src ; make clean +diff --git a/Make.inc b/Make.inc +index f99eb8f..2de8a25 100644 +--- a/Make.inc ++++ b/Make.inc +@@ -12,7 +12,7 @@ + # for solaris + # + # CC = gcc +- CC = /usr/lang-4.0/bin/cc ++# CC = /usr/lang-4.0/bin/cc + # + # for sgi + # +@@ -28,7 +28,7 @@ + # + # OPTLEVEL = + # OPTLEVEL = -g -v +- OPTLEVEL = -O ++ OPTLEVEL = -O3 + # OPTLEVEL = -xO5 -v + # OPTLEVEL = -O3 + # OPTLEVEL = -O4 +@@ -43,7 +43,7 @@ + # set any load flags + # + # LDFLAGS = -Wl,+parallel -Wl,+tm,spp2000 # for hp exemplar +- LDFLAGS = ++# LDFLAGS = + # + #--------------------------------------------------------------------- + # +@@ -103,7 +103,7 @@ + # MPI install library + # + # MPI_INSTALL_DIR = +- MPI_INSTALL_DIR = /usr/local/mpich-1.0.13 ++# MPI_INSTALL_DIR = /usr/lib/openmpi + # + #--------------------------------------------------------------------- + # +@@ -142,6 +142,6 @@ + # MPI include path + # + # MPI_INCLUDE_DIR = +- MPI_INCLUDE_DIR = -I$(MPI_INSTALL_DIR)/include ++# MPI_INCLUDE_DIR = -I/usr/include/mpi + # + #--------------------------------------------------------------------- +diff --git a/Utilities/src/iohb.c b/Utilities/src/iohb.c +index ac38f7b..ac34034 100644 +--- a/Utilities/src/iohb.c ++++ b/Utilities/src/iohb.c +@@ -1725,7 +1725,7 @@ static void upcase(char* S) + + static void IOHBTerminate(char* message) + { +- fprintf(stderr,message); ++ fputs(message, stderr); + exit(1); + } + +diff --git a/makeLib b/makeLib +index 1780f39..7697b06 100755 +--- a/makeLib ++++ b/makeLib +@@ -64,14 +64,19 @@ foreach $src ( @srcnames ) { + $srcname = " \\\n " . $src ; + print $srcname ; + } ++print "\n\n.SUFFIXES: .c .o .lo .a .so" ; + print "\n\nOBJ_FILES = \$\{SRC:.c=.o\}" ; ++print "\n\nLOBJ_FILES = \$\{SRC:.c=.lo\}" ; + print "\n\n" ; + print <<'EOF' ; + .c.o : +- $(PURIFY) $(CC) -c $(CFLAGS) $*.c -o $(OBJ)_$*.o ++ $(PURIFY) $(CC) -c $(CFLAGS) $*.c -o $(OBJ)_$*.o $(MPI_INCLUDE_DIR) + +-../../spooles.a : ${OBJ_FILES} +- $(AR) $(ARFLAGS) ../../spooles.a $(OBJ)_*.o ++.c.lo : ++ $(PURIFY) $(CC) -c $(CFLAGS) $*.c -fPIC -DPIC -o $(OBJ)_$*.lo $(MPI_INCLUDE_DIR) ++ ++../../libspooles.a : ${OBJ_FILES} ${LOBJ_FILES} ++ $(AR) $(ARFLAGS) ../../libspooles.a $(OBJ)_*.o + rm -f $(OBJ)_*.o +- $(RANLIB) ../../spooles.a ++ $(RANLIB) ../../libspooles.a + EOF +diff --git a/makefile b/makefile +index f014c7d..7c8042a 100755 +--- a/makefile ++++ b/makefile +@@ -124,7 +124,9 @@ lib : + cd ZV ; make lib + cd misc ; make lib + #cd MPI ; make lib +-#cd MT ; make lib ++ cd MT ; make lib ++ gcc -shared */*/*.lo -Wl,-soname,libspooles.so.2.2 -o libspooles.so.2.2 -lpthread -lm ++ ln -s libspooles.so.2.2 libspooles.so + + global : + cd A2/src ; make -f makeGlobalLib +diff --git a/timings.h b/timings.h +index 23df189..685800b 100644 +--- a/timings.h ++++ b/timings.h +@@ -2,9 +2,8 @@ + #define _TIMINGS_ + #include <sys/time.h> + static struct timeval TV ; +-static struct timezone TZ ; + #define MARKTIME(t) \ +- gettimeofday(&TV, &TZ) ; \ ++ gettimeofday(&TV, NULL) ; \ + t = (TV.tv_sec + 0.000001*TV.tv_usec) + #endif + diff --git a/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/nixpkgs/pkgs/development/libraries/umockdev/default.nix index 07892e970875..866dc48f2704 100644 --- a/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -1,30 +1,46 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gobject-introspection -, pkgconfig, glib, systemd, libgudev, vala }: +{ stdenv, fetchurl, fetchpatch, pkgconfig +, gobject-introspection, glib, systemd, libgudev, vala +, usbutils, which, python3 }: stdenv.mkDerivation rec { name = "umockdev-${version}"; - version = "0.12.1"; + version = "0.13.1"; outputs = [ "bin" "out" "dev" "doc" ]; - src = fetchFromGitHub { - owner = "martinpitt"; - repo = "umockdev"; - rev = version; - sha256 = "0wnmz4jh04mvqzjnqvxrah969gg4x4v8d6ip61zc7jpbwnqb2fpg"; + src = fetchurl { + url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${name}.tar.xz"; + sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla"; }; + patches = [ + ./fix-test-paths.patch + # https://github.com/martinpitt/umockdev/pull/93 + (fetchpatch { + url = "https://github.com/abbradar/umockdev/commit/ce22f893bf50de0b32760238a3e2cfb194db89e9.patch"; + sha256 = "01q3qhs30x8hl23iigimsa2ikbiw8y8y0bpmh02mh1my87shpwnx"; + }) + ]; + # autoreconfHook complains if we try to build the documentation postPatch = '' echo 'EXTRA_DIST =' > docs/gtk-doc.make ''; + preCheck = '' + patchShebangs tests/test-static-code + ''; + buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ autoreconfHook pkgconfig vala gobject-introspection ]; + nativeBuildInputs = [ pkgconfig vala gobject-introspection ]; + + checkInputs = [ python3 which usbutils ]; enableParallelBuilding = true; + doCheck = true; + meta = with stdenv.lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl2; diff --git a/nixpkgs/pkgs/development/libraries/umockdev/fix-test-paths.patch b/nixpkgs/pkgs/development/libraries/umockdev/fix-test-paths.patch new file mode 100644 index 000000000000..53015d662684 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/umockdev/fix-test-paths.patch @@ -0,0 +1,12 @@ +diff -ru3 umockdev-0.13.1/tests/test-umockdev.c umockdev-0.13.1-new/tests/test-umockdev.c +--- umockdev-0.13.1/tests/test-umockdev.c 2019-08-18 20:39:39.708262517 +0300 ++++ umockdev-0.13.1-new/tests/test-umockdev.c 2019-08-18 21:04:27.688761503 +0300 +@@ -1084,7 +1084,7 @@ + + /* sys/ in other dir should not be trapped */ + errno = 0; +- dirfd = open("/run", O_RDONLY | O_DIRECTORY); ++ dirfd = open("/tmp", O_RDONLY | O_DIRECTORY); + g_assert_cmpint(openat(dirfd, "sys", O_RDONLY), <, 0); + g_assert_cmpint(errno, ==, ENOENT); + g_assert_cmpint(openat64(dirfd, "sys", O_RDONLY), <, 0); diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index e7feaabc739a..549e492e944c 100644 --- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "155lmgz81ky0x04c8m2yzlsm58i9jk6hiw1ajc3wizvbpczbca57"; + sha256 = "16d1dzbdx6x7czbxf6i1rlb5mv59yzzpnha7qgwab3yq62rlsgw3"; }; configureFlags = [ "--enable-all" ]; diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index b8cf86999e0b..9b0316023710 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,18 +1,39 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gsettings-desktop-schemas }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, libxml2 +, xdg-desktop-portal +, gtk3 +, glib +, wrapGAppsHook +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j"; + sha256 = "1zryfg6232vz1pmv0zqcxvl4clnbb15kjf55b24cimkcnidklbap"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; - buildInputs = [ glib gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ + autoreconfHook + libxml2 + pkgconfig + wrapGAppsHook + xdg-desktop-portal + ]; + + buildInputs = [ + glib + gsettings-desktop-schemas + gtk3 + ]; meta = with stdenv.lib; { description = "Desktop integration portals for sandboxed apps"; diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index 3f02946c7704..4be7bd1474cf 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.2.0"; + version = "1.4.2"; outputs = [ "out" "installedTests" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71"; + sha256 = "1rs3kmpczkr6nm08kb9njnl7n3rmhh0ral0xav6f0y70pyh8whx6"; }; patches = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas ]; + buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas json-glib ]; doCheck = true; # XXX: investigate! diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch index f884899ecd19..d970f5636ae4 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch @@ -1,10 +1,12 @@ ---- a/src/xdg-desktop-portal.c -+++ b/src/xdg-desktop-portal.c -@@ -177,38 +177,50 @@ - static void - load_installed_portals (void) +diff --git a/src/portal-impl.c b/src/portal-impl.c +index 4fd48ff..346da7c 100644 +--- a/src/portal-impl.c ++++ b/src/portal-impl.c +@@ -116,38 +116,50 @@ sort_impl_by_name (gconstpointer a, + void + load_installed_portals (gboolean opt_verbose) { -- const char *portal_dir = PKGDATADIR "/portals"; +- const char *portal_dir = DATADIR "/xdg-desktop-portal/portals"; - g_autoptr(GFile) dir = g_file_new_for_path (portal_dir); - g_autoptr(GFileEnumerator) enumerator = NULL; @@ -14,7 +16,7 @@ + const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH"); + + if (portal_dir == NULL) -+ portal_dir = PKGDATADIR "/portals"; ++ portal_dir = DATADIR "/portals"; - if (enumerator == NULL) - return; @@ -56,7 +58,7 @@ - path = g_file_get_path (child); + name = g_file_info_get_name (info); -- if (!register_portal (path, &error)) +- if (!register_portal (path, opt_verbose, &error)) - { - g_warning ("Error loading %s: %s", path, error->message); - continue; @@ -66,7 +68,7 @@ + child = g_file_enumerator_get_child (enumerator, info); + path = g_file_get_path (child); + -+ if (!register_portal (path, &error)) ++ if (!register_portal (path, opt_verbose, &error)) + { + g_warning ("Error loading %s: %s", path, error->message); + continue; diff --git a/nixpkgs/pkgs/development/libraries/zlib/default.nix b/nixpkgs/pkgs/development/libraries/zlib/default.nix index 9f5af47c7268..592abea4ea04 100644 --- a/nixpkgs/pkgs/development/libraries/zlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlib/default.nix @@ -1,24 +1,19 @@ { stdenv , fetchurl -# Regarding static/shared libaries, the current behaviour is: -# -# - static=true, shared=true: builds both and moves .a to the .static output; -# in this case `pkg-config` auto detection will -# not work if the .static output is given as -# buildInputs to another package (#66461) -# - static=true, shared=false: builds .a only and leaves it in the main output -# - static=false, shared=true: builds shared only -# -# To get both `.a` and shared libraries in one output, -# you currently have to use -# static=false, shared=true -# and use -# .overrideAttrs (old: { dontDisableStatic = true; }) -# This is because by default, upstream zlib ./configure builds both. -, static ? true +# Note: If `{ static = false; shared = false; }`, upstream's default is used +# (which is building both static and shared as of zlib 1.2.11). , shared ? true +, static ? true +# If true, a separate .static ouput is created and the .a is moved there. +# In this case `pkg-config` will auto detection will currently not work if the +# .static output is given as `buildInputs` to another package (#66461), because +# the `.pc` file lists only the main output's lib dir. +# If false, and if `{ static = true; }`, the .a stays in the main output. +, splitStaticOutput ? static }: +assert splitStaticOutput -> static; + stdenv.mkDerivation (rec { name = "zlib-${version}"; version = "1.2.11"; @@ -41,14 +36,35 @@ stdenv.mkDerivation (rec { ''; outputs = [ "out" "dev" ] - ++ stdenv.lib.optional (shared && static) "static"; + ++ stdenv.lib.optional splitStaticOutput "static"; setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page - configureFlags = stdenv.lib.optional shared "--shared" - ++ stdenv.lib.optional (static && !shared) "--static"; + # For zlib's ./configure (as of verion 1.2.11), the order + # of --static/--shared flags matters! + # `--shared --static` builds only static libs, while + # `--static --shared` builds both. + # So we use the latter order to be able to build both. + # Also, giving just `--shared` builds both, + # giving just `--static` builds only static, + # and giving nothing builds both. + # So we have 3 possible ways to build both: + # `--static --shared`, `--shared` and giving nothing. + # Of these, we choose `--shared`, only because that's + # what we did in the past and we can avoid mass rebuilds this way. + # As a result, we pass `--static` only when we want just static. + configureFlags = stdenv.lib.optional (static && !shared) "--static" + ++ stdenv.lib.optional shared "--shared"; + + # Note we don't need to set `dontDisableStatic`, because static-disabling + # works by grepping for `enable-static` in the `./configure` script + # (see `pkgs/stdenv/generic/setup.sh`), and zlib's handwritten one does + # not have such. + # It wouldn't hurt setting `dontDisableStatic = static && !splitStaticOutput` + # here (in case zlib ever switches to autoconf in the future), + # but we don't do it simply to avoid mass rebuilds. - postInstall = stdenv.lib.optionalString (shared && static) '' + postInstall = stdenv.lib.optionalString splitStaticOutput '' moveToOutput lib/libz.a "$static" '' # jww (2015-01-06): Sometimes this library install as a .so, even on @@ -69,6 +85,8 @@ stdenv.mkDerivation (rec { # to the bootstrap-tools libgcc (as uses to happen on arm/mips) NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; + # We don't strip on static cross-compilation because of reports that native + # stripping corrupted the target library; see commit 12e960f5 for the report. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static; configurePlatforms = []; diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 2e42e8bd23c2..2ddffbf16b7c 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -7,12 +7,15 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + algoliasearch (1.26.1) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) atomos (0.1.3) - claide (1.0.2) - cocoapods (1.7.5) + claide (1.0.3) + cocoapods (1.8.0.beta.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.5) + cocoapods-core (= 1.8.0.beta.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -27,9 +30,10 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.5) + xcodeproj (>= 1.11.1, < 2.0) + cocoapods-core (1.8.0.beta.1) activesupport (>= 4.0.2, < 6) + algoliasearch (~> 1.0) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.4) @@ -48,8 +52,10 @@ GEM fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) + httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) + json (2.2.0) minitest (5.11.3) molinillo (0.6.6) nanaimo (0.2.6) @@ -59,7 +65,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.11.0) + xcodeproj (1.12.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix index 7ae6e50de99f..baa4748fb946 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -10,6 +10,17 @@ }; version = "4.2.11.1"; }; + algoliasearch = { + dependencies = ["httpclient" "json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vlasxdgz49y75p8vjkbdpb4kmc73xv71d7vpn9x9xjgvsar03kp"; + type = "gem"; + }; + version = "1.26.1"; + }; atomos = { groups = ["default"]; platforms = []; @@ -35,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; cocoapods = { dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; @@ -46,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz"; + sha256 = "1gs9ybf1zbajhsn591dwh2papj0bs1dzbnw8shbsm4mfqz976y54"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.0.beta.1"; }; cocoapods-core = { - dependencies = ["activesupport" "fuzzy_match" "nap"]; + dependencies = ["activesupport" "algoliasearch" "fuzzy_match" "nap"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4"; + sha256 = "02c0415b7iridf0gypajm4i3vqpq8zs6vx8bw49rm70l554jp14j"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.0.beta.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -194,6 +205,16 @@ }; version = "1.1.3"; }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; i18n = { dependencies = ["concurrent-ruby"]; groups = ["default"]; @@ -205,6 +226,16 @@ }; version = "0.9.5"; }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + type = "gem"; + }; + version = "2.2.0"; + }; minitest = { groups = ["default"]; platforms = []; @@ -292,9 +323,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; + sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix new file mode 100644 index 000000000000..8ae1f4a9d47c --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "mmap"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/mirage/mmap/releases/download/v${version}/mmap-v${version}.tbz"; + sha256 = "0l6waidal2n8mkdn74avbslvc10sf49f5d889n838z03pra5chsc"; + }; + + meta = { + homepage = "https://github.com/mirage/mmap"; + description = "Function for mapping files in memory"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 4bc9b7f8629e..1287c9b80b57 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server +{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server , js_of_ocaml-camlp4 , resource-pooling }: -buildOcaml rec -{ - name = "ocsigen-start"; - version = "1.5.0"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocsigen-start-${version}"; + version = "1.8.0"; - buildInputs = [ eliom js_of_ocaml-camlp4 ]; + buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 ]; propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; patches = [ ./templates-dir.patch ]; @@ -16,12 +15,14 @@ buildOcaml rec postPatch = '' substituteInPlace "src/os_db.ml" --replace "citext" "text" ''; + + createFindlibDestdir = true; src = fetchFromGitHub { owner = "ocsigen"; - repo = name; + repo = "ocsigen-start"; rev = version; - sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha"; + sha256 = "0h5gp06vxy6jpppz1x840gyf9viiy7lic7spx7fxldpy2jpv058s"; }; meta = { @@ -31,6 +32,7 @@ buildOcaml rec An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. ''; license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 4e46c1534d80..6c9e72f95d75 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.0.0"; + version = "2.2.0"; propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; buildInputs = [ ocaml findlib opaline ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw"; + sha256 = "0qy6501jf81qcmkbicgrb1x4pxsjkhr40plwdn09w37d8vx9va3s"; }; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix index 1d331090a44f..cb90c2005473 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl +{ stdenv, fetchurl , ocaml, findlib, pkgconfig, perl , gmp }: @@ -16,31 +16,27 @@ let source = }; in -buildOcaml rec { - name = "zarith"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-zarith-${version}"; inherit (source) version; src = fetchurl { inherit (source) url sha256; }; - minimumSupportedOcamlVersion = "3.12.1"; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; - # needed so setup-hook.sh sets CAML_LD_LIBRARY_PATH for dllzarith.so - hasSharedObjects = true; - patchPhase = "patchShebangs ./z_pp.pl"; configurePhase = '' ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; - preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib"; + + preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; meta = with stdenv.lib; { description = "Fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; license = licenses.lgpl2; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = with maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix b/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix new file mode 100644 index 000000000000..9e053c718c86 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix @@ -0,0 +1,32 @@ +{ lib, isPy3k, fetchPypi, buildPythonPackage +, atpublic }: + +buildPythonPackage rec { + pname = "aiosmtpd"; + version = "1.2"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1xdfk741pjmz1cm8dsi4n5vq4517i175rm94696m3f7kcgk7xsmp"; + }; + + propagatedBuildInputs = [ + atpublic + ]; + + # Tests need network access + doCheck = false; + + meta = with lib; { + homepage = https://aiosmtpd.readthedocs.io/en/latest/; + description = "Asyncio based SMTP server"; + longDescription = '' + This is a server for SMTP and related protocols, similar in utility to the + standard library's smtpd.py module, but rewritten to be based on asyncio for + Python 3. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix new file mode 100644 index 000000000000..a71ffd853675 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -0,0 +1,38 @@ +{ lib, isPy3k, fetchPypi, fetchpatch, buildPythonPackage +, uvloop, postgresql }: + +buildPythonPackage rec { + pname = "asyncpg"; + version = "0.18.3"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0rrch478ww6ipmh3617sb2jzwsq4w7pjcck869p35zb0mk5fr9aq"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/MagicStack/asyncpg/commit/aaeb7076e5acb045880b46155014c0640624797e.patch"; + sha256 = "0r6g6pvb39vzci8g67mv9rlrvavqvfz6vlv8988wv53bpz1mss3p"; + }) + ]; + + checkInputs = [ + uvloop + postgresql + ]; + + meta = with lib; { + homepage = https://github.com/MagicStack/asyncpg; + description = "An asyncio PosgtreSQL driver"; + longDescription = '' + Asyncpg is a database interface library designed specifically for + PostgreSQL and Python/asyncio. asyncpg is an efficient, clean + implementation of PostgreSQL server binary protocol for use with Python’s + asyncio framework. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/atpublic/default.nix b/nixpkgs/pkgs/development/python-modules/atpublic/default.nix new file mode 100644 index 000000000000..6657b41cc784 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/atpublic/default.nix @@ -0,0 +1,38 @@ +{ lib, isPy3k, fetchPypi, buildPythonPackage +, pytest }: + +buildPythonPackage rec { + pname = "atpublic"; + version = "1.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0i3sbxkdlbb4560rrlmwwd5y4ps7k73lp4d8wnmd7ag9k426gjkx"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest --pyargs public + ''; + + meta = with lib; { + homepage = https://public.readthedocs.io/en/latest/; + description = "A decorator and function which populates a module's __all__ and globals"; + longDescription = '' + This is a very simple decorator and function which populates a module's + __all__ and optionally the module globals. + + This provides both a pure-Python implementation and a C implementation. It is + proposed that the C implementation be added to builtins_ for Python 3.6. + + This proposal seems to have been rejected, for more information see + https://bugs.python.org/issue26632. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix index d93703c00c41..a2d19e9ee3c5 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.11.1"; + version = "0.12.6"; src = fetchPypi { inherit pname version; - sha256 = "07m797jc5lpaj6m8469d67l2s43jf8w0mfhy0hfvbfs4mk0cjix0"; + sha256 = "0xvphwpa1n5q7kim4dw6fmsg9h5kkk7nd51bv9b36i3n4hilmq32"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index 7459fc6f981b..c19fc280c7f6 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -3,7 +3,7 @@ sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized, - glibcLocales }: + git, glibcLocales }: let withPlugins = plugins: buildPythonPackage { @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0qzr6my8zvaj0a1jwyaf254rdgm1xcyq8zp4b6fa5aqigfld4dfg"; + sha256 = "141ad2g1j5y0n5cdnd18m55ss0gqjlz5ky85rb6qfn73dgw42vmz"; }; propagatedBuildInputs = [ @@ -37,7 +37,6 @@ let twisted jinja2 zope_interface - future sqlalchemy sqlalchemy_migrate dateutil @@ -65,6 +64,7 @@ let buildbot-worker buildbot-pkg parameterized + git glibcLocales ]; @@ -95,7 +95,7 @@ let meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index 8de1572b48c0..dababe48e996 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0bpqiih15b5kzx1r542m8j7ydbnmgzhdnkaxv0z7gjv21k78m5i5"; + sha256 = "0na336jwibgbix8fr4jki1gqys44kkm0a8q32llcr2z08igs4mvy"; }; postPatch = '' @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Packaging Helper"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index e03524ea5ada..e31085a24988 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -1,23 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, buildbot, buildbot-pkg }: +{ lib, buildPythonPackage, fetchPypi, buildbot, buildbot-pkg, mock }: { www = buildPythonPackage rec { - pname = "buildbot_www"; + pname = "buildbot-www"; inherit (buildbot-pkg) version; - # NOTE: wheel is used due to buildbot circular dependency - format = "wheel"; - src = fetchPypi { - inherit pname version format; - python = "py3"; - sha256 = "1ii01py78wkda9x4lqm0bxqmb4dhvbdmmz7sncm1lw7bhmhqh84w"; + inherit pname version; + sha256 = "0g3m5z8yska245r1x9n85b4br8b63i4zca2qn3qspf62b1wzmxmd"; }; + buildInputs = [ buildbot buildbot-pkg mock ]; + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot UI"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -28,16 +26,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1y523hadw3398jwfpmi2f4g0s6dp9y191qzycrsbvbj147dp0qra"; + sha256 = "0p7az9mb09c4bl0j37w28wflzygq9vy8rjbbnhlfbs6py6mjdagr"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Console View Plugin"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -48,16 +46,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1prfr03igcmagydvxqhrh6k6wz16vk6fwgrm143jh3xmml6f16ll"; + sha256 = "0ba0a7q7ii7sipvifxs9ldkcs4b975skndarmirbphc797993hj1"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Waterfall View Plugin"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -68,16 +66,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1xkqiwxjppyns2s0239zzvbnr8b7vdakypj95mca89mmnyniflxj"; + sha256 = "0dvchhjzmfbbrxqm8dlmwck22z99pgnflxk3cyn0wbb1qskhd9cv"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Grid View Plugin"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ nand0p lopsided98 ]; license = licenses.gpl2; }; }; @@ -88,16 +86,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1jhvq61x0bzh03nd2ac11swdjn0ndnx3ac7x9v3m3v0pgr08rc28"; + sha256 = "0w9p3y89rqsmqiacwj2avir42r0xjr2yri14v3ay6yar5391r8wa"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot WSGI dashboards Plugin"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lopsided98 ]; license = licenses.gpl2; }; }; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index 0ca2570496a0..8cfc56678c02 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -3,11 +3,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0lvgqcayd4f32895g3cwrbnjw6p94nrggbq7wfz5mwbhpgg6hv52"; + sha256 = "04dk1jg0yq0rcm7j7pn7l1pqqjhiyvwppnhc1b7106sx2cdj2yb2"; }; propagatedBuildInputs = [ twisted future ]; @@ -22,7 +22,7 @@ buildPythonPackage (rec { meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Worker Daemon"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }) diff --git a/nixpkgs/pkgs/development/python-modules/capstone/default.nix b/nixpkgs/pkgs/development/python-modules/capstone/default.nix index 91e00ed7e43c..2bd22ebf0d9b 100644 --- a/nixpkgs/pkgs/development/python-modules/capstone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/capstone/default.nix @@ -6,11 +6,15 @@ buildPythonPackage rec { pname = "capstone"; - version = "3.0.4"; + version = "3.0.5.post1"; + + setupPyBuildFlags = [ + "--plat-name x86_64-linux" + ]; src = fetchPypi { inherit pname version; - sha256 = "945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225"; + sha256 = "3c0f73db9f8392f7048c8a244809f154d7c39f354e2167f6c477630aa517ed04"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/click-default-group/default.nix b/nixpkgs/pkgs/development/python-modules/click-default-group/default.nix index daf522fe6534..eeee7370b7e3 100644 --- a/nixpkgs/pkgs/development/python-modules/click-default-group/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-default-group/default.nix @@ -1,20 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, click, pytest_3 }: +{ lib, buildPythonPackage, fetchFromGitHub, click, pytest }: buildPythonPackage rec { pname = "click-default-group"; - version = "1.2"; + version = "1.2.1"; # No tests in Pypi tarball src = fetchFromGitHub { owner = "click-contrib"; repo = "click-default-group"; rev = "v${version}"; - sha256 = "0lm2k4jvy4ilvv91niawklfnp5mp7wa8c1bicsqdfzrxmw7jliwp"; + sha256 = "1wdmabfpmzxpiww0slinvxm9xjyxql250dn1pvjijq675pxafiz4"; }; propagatedBuildInputs = [ click ]; - checkInputs = [ pytest_3 ]; + checkInputs = [ pytest ]; meta = with lib; { homepage = https://github.com/click-contrib/click-default-group; diff --git a/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix b/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix new file mode 100644 index 000000000000..905b274a0552 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchPypi +, rPackages +, rWrapper +, buildPythonPackage +, biopython +, numpy +, scipy +, pandas +, matplotlib +, reportlab +, pysam +, future +, pillow +, pomegranate +, pyfaidx +}: + +buildPythonPackage rec { + pname = "CNVkit"; + version = "0.9.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hj8c98s538i0hg5mrz4bw4v07qmcl51rhxq611rj2nglnc9r25y"; + }; + + propagatedBuildInputs = [ + biopython + numpy + scipy + pandas + matplotlib + reportlab + pyfaidx + pysam + future + pillow + pomegranate + ]; + + meta = with lib; { + homepage = "https://cnvkit.readthedocs.io"; + description = "A Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data"; + license = licenses.asl20; + maintainers = [ maintainers.jbedo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/deprecated/default.nix b/nixpkgs/pkgs/development/python-modules/deprecated/default.nix new file mode 100644 index 000000000000..ee7c89d8167d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/deprecated/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchPypi, buildPythonPackage, + wrapt, pytest, tox }: + +buildPythonPackage rec { + pname = "Deprecated"; + version = "1.2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hcw9y7dvhwg5flk6wy8aa4kkgpvcqq3q4jd53h54586fp7w85d5"; + }; + + postPatch = '' + # odd broken tests, don't appear in GitHub repo + rm tests/demo_classic_usage*.py + ''; + + propagatedBuildInputs = [ wrapt ]; + checkInputs = [ pytest ]; + meta = with stdenv.lib; { + homepage = "https://github.com/tantale/deprecated"; + description = "Python @deprecated decorator to deprecate old python classes, functions or methods"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ tilpner ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django-csp/default.nix b/nixpkgs/pkgs/development/python-modules/django-csp/default.nix new file mode 100644 index 000000000000..1eed9578a8a2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-csp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchPypi, buildPythonPackage, django }: + +buildPythonPackage rec { + pname = "django-csp"; + version = "3.5"; + + src = fetchPypi { + inherit version; + pname = "django_csp"; + sha256 = "0ks4zszbjx5lyqlc34pjica8hfcjzw4i5m6pivvnyv8yf0vh4q04"; + }; + + # too complicated to setup - needs a running django instance + doCheck = false; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Adds Content-Security-Policy headers to Django"; + homepage = "https://github.com/mozilla/django-csp"; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix b/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix new file mode 100644 index 000000000000..d9734ff4a220 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: + +buildPythonPackage rec { + pname = "django-logentry-admin"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "yprez"; + repo = pname; + rev = "v${version}"; + sha256 = "1ji04qklzhjb7fx6644vzikjb2196rxyi8hrwf2knsz41ndvq1l9"; + }; + + checkInputs = [ pytest pytest-django ]; + checkPhase = '' + rm -r logentry_admin __init__.py + pytest + ''; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Show all LogEntry objects in the Django admin site"; + homepage = "https://github.com/yprez/django-logentry-admin"; + license = licenses.isc; + maintainers = with maintainers; [ mrmebelman ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix b/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix new file mode 100644 index 000000000000..0e5db1de3e92 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, buildPythonPackage +, python, isPy3k }: + +buildPythonPackage rec { + pname = "emailthreads"; + version = "0.1.0"; + disabled = !isPy3k; + + # pypi is missing files for tests + src = fetchFromGitHub { + owner = "emersion"; + repo = "python-emailthreads"; + rev = "v${version}"; + sha256 = "17pfal8kbxhs025apkijqbkppw2lljca8x1cwcx49jv60h05c3cn"; + }; + + PKGVER = version; + + checkPhase = '' + ${python.interpreter} -m unittest discover test + ''; + + meta = with lib; { + homepage = https://github.com/emersion/python-emailthreads; + description = "Python library to parse and format email threads"; + license = licenses.mit; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fastpair/default.nix b/nixpkgs/pkgs/development/python-modules/fastpair/default.nix index 090f9dd82601..e9e6316bb61e 100644 --- a/nixpkgs/pkgs/development/python-modules/fastpair/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest_3, scipy }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: buildPythonPackage { pname = "fastpair"; @@ -11,14 +11,17 @@ buildPythonPackage { sha256 = "1pv9sxycxdk567s5gs947rhlqngrb9nn9yh4dhdvg1ix1i8dca71"; }; - nativeBuildInputs = [ (pytestrunner.override { pytest = pytest_3; }) ]; + nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pytest_3 ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ scipy ]; + # Does not support pytest 4 https://github.com/carsonfarmer/fastpair/issues/14 + doCheck = false; + checkPhase = '' pytest fastpair ''; diff --git a/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix new file mode 100644 index 000000000000..070e69970106 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchPypi, buildPythonPackage +, flake8 +, mock, pep8, pytest }: + +buildPythonPackage rec { + pname = "flake8-polyfill"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4"; + }; + + postPatch = '' + # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. + substituteInPlace setup.cfg \ + --replace pytest 'tool:pytest' + ''; + + propagatedBuildInputs = [ + flake8 + ]; + + checkInputs = [ + mock + pep8 + pytest + ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + homepage = https://gitlab.com/pycqa/flake8-polyfill; + description = "Polyfill package for Flake8 plugins"; + license = licenses.mit; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 60a6caace5ec..e81f82740869 100644 --- a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.7.10"; + version = "1.7.11"; src = fetchPypi { inherit pname version; - sha256 = "1mlx5dvkh6rjkvkd91flyhrmji2kw9rlr05n8n4wccv2np3sam9f"; + sha256 = "137vwb9544vjxkwnbr98x0f4p6ri5i678wxxxgbsx4kdyrs83a58"; }; # No tests included in archive diff --git a/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/nixpkgs/pkgs/development/python-modules/gspread/default.nix index a2597b2e6e77..2a20d6104853 100644 --- a/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, requests }: buildPythonPackage rec { @@ -12,10 +13,15 @@ buildPythonPackage rec { sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d"; }; + propagatedBuildInputs = [ requests ]; + meta = with stdenv.lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; license = licenses.mit; }; + # No tests included + doCheck = false; + } diff --git a/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix b/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix new file mode 100644 index 000000000000..d5492b3b6414 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchFromGitHub +, lxml +, pillow +, reportlab +, stdenv +}: +buildPythonPackage rec { + pname = "hocr-tools"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "tmbdev"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p"; + }; + + # hocr-tools uses a test framework that requires internet access + doCheck = false; + + propagatedBuildInputs = [ pillow lxml reportlab ]; + + meta = with stdenv.lib; { + description = " +Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML"; + homepage = https://github.com/tmbdev/hocr-tools; + license = licenses.asl20; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ipdb/default.nix b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix index f31b9013d94b..18a2d570497d 100644 --- a/nixpkgs/pkgs/development/python-modules/ipdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.12"; + version = "0.12.2"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "dce2112557edfe759742ca2d0fee35c59c97b0cc7a05398b791079d78f1519ce"; + sha256 = "0mzfv2sa8qabqzh2vqgwhavb15gsmcgqn6i3jgq6b5q9i9wxsgs7"; }; propagatedBuildInputs = [ ipython ]; diff --git a/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix b/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix new file mode 100644 index 000000000000..44944c03500b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonschema +}: + +buildPythonPackage rec { + pname = "jsonmerge"; + version = "1.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "03l2j1lrcwcp7af4x8agxnkib0ndybfrbhn2gi7mnk6gbxfw1aw3"; + }; + + propagatedBuildInputs = [ jsonschema ]; + + meta = with lib; { + description = "Merge a series of JSON documents"; + homepage = https://github.com/avian2/jsonmerge; + changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog"; + license = licenses.mit; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/kconfiglib/default.nix b/nixpkgs/pkgs/development/python-modules/kconfiglib/default.nix new file mode 100644 index 000000000000..7d83d2c4338f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/kconfiglib/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "kconfiglib"; + version = "10.36.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qhy4vv1rpgx4r1la14symxv3cpz7klqakn1rqdagwyaqp667g9b"; + }; + + # doesnt work out of the box but might be possible + doCheck = false; + + meta = with lib; { + description = "A flexible Python 2/3 Kconfig implementation and library"; + homepage = https://github.com/ulfalizer/Kconfiglib; + license = licenses.isc; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/matchpy/default.nix b/nixpkgs/pkgs/development/python-modules/matchpy/default.nix index a9f37b52c1b4..2a0544cf6d8f 100644 --- a/nixpkgs/pkgs/development/python-modules/matchpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matchpy/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , hopcroftkarp , multiset -, pytest_3 +, pytest , pytestrunner , hypothesis , setuptools_scm @@ -20,12 +21,23 @@ buildPythonPackage rec { sha256 = "1vvf1cd9kw5z1mzvypc9f030nd18lgvvjc8j56b1s9b7dyslli2r"; }; + patches = [ + # Fix tests for pytest 4. Remove with the next release + (fetchpatch { + url = "https://github.com/HPAC/matchpy/commit/b405a2717a7793d58c47b2e2197d9d00c06fb13c.patch"; + includes = [ "tests/conftest.py" ]; + sha256 = "1b6gqf2vy9qxg384nqr9k8il335afhbdmlyx4vhd8r8rqpv7gax9"; + }) + ]; + postPatch = '' - substituteInPlace setup.cfg --replace "hypothesis>=3.6,<4.0" "hypothesis" + substituteInPlace setup.cfg \ + --replace "hypothesis>=3.6,<4.0" "hypothesis" \ + --replace "pytest>=3.0,<4.0" "pytest" ''; buildInputs = [ setuptools_scm pytestrunner ]; - checkInputs = [ pytest_3 hypothesis ]; + checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ hopcroftkarp multiset ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/osc/default.nix b/nixpkgs/pkgs/development/python-modules/osc/default.nix index 7e6207697595..def8ecb8458e 100644 --- a/nixpkgs/pkgs/development/python-modules/osc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osc/default.nix @@ -1,28 +1,22 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, isPy3k -, pkgs -, urlgrabber -, m2crypto -, pyyaml -, lxml +{ stdenv, buildPythonPackage , fetchFromGitHub +, bashInteractive , urlgrabber, m2crypto }: -buildPythonPackage { +buildPythonPackage rec { pname = "osc"; - version = "0.163.0-40-gb4b1ec7"; - disabled = isPy3k; # urlgrabber doesn't support python-3.x + version = "0.165.4"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; - rev = "b4b1ec7b64d4f9bb42f140754519221b810e232c"; - sha256 = "01z1b15x9vzhd7j94f6n3g50h5br7lwz86akgic0wpp41zv37jad"; + rev = version; + sha256 = "1f8q65wlgchzwzarwrv6a0p60gw0ykpf4d5s7cks835hyawgcbyl"; }; - buildInputs = [ pkgs.bashInteractive ]; # needed for bash-completion helper - propagatedBuildInputs = [ urlgrabber m2crypto pyyaml lxml ]; + buildInputs = [ bashInteractive ]; # needed for bash-completion helper + propagatedBuildInputs = [ urlgrabber m2crypto ]; + + doCheck = false; postInstall = '' ln -s $out/bin/osc-wrapper.py $out/bin/osc diff --git a/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix b/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix new file mode 100644 index 000000000000..20da40560e20 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchPypi, buildPythonPackage +, flake8-polyfill }: + +buildPythonPackage rec { + pname = "pep8-naming"; + version = "0.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1aff4g3i2z08cx7z17nbxbf32ddrnvqlk16h6d8h9s9w5ymivjq1"; + }; + + propagatedBuildInputs = [ + flake8-polyfill + ]; + + meta = with lib; { + homepage = https://github.com/PyCQA/pep8-naming; + description = "Check PEP-8 naming conventions, plugin for flake8"; + license = licenses.mit; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pgpy/default.nix b/nixpkgs/pkgs/development/python-modules/pgpy/default.nix new file mode 100644 index 000000000000..50220bb3993d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pgpy/default.nix @@ -0,0 +1,48 @@ +{ lib, isPy3k, fetchFromGitHub, buildPythonPackage +, six, enum34, pyasn1, cryptography, singledispatch +, fetchPypi +, gpgme, flake8, pytest, pytestcov, pep8-naming, pytest-ordering }: + +buildPythonPackage rec { + pname = "pgpy"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "SecurityInnovation"; + repo = "PGPy"; + rev = version; + sha256 = "1v2b1dyq1sl48d2gw7vn4hv6sasd9ihpzzcq8yvxj9dgfak2y663"; + }; + + propagatedBuildInputs = [ + six + pyasn1 + cryptography + singledispatch + ] ++ lib.optional (!isPy3k) enum34; + + checkInputs = [ + gpgme + flake8 + pytest + pytestcov + pep8-naming + pytest-ordering + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = https://github.com/SecurityInnovation/PGPy; + description = "Pretty Good Privacy for Python 2 and 3"; + longDescription = '' + PGPy is a Python (2 and 3) library for implementing Pretty Good Privacy + into Python programs, conforming to the OpenPGP specification per RFC + 4880. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix new file mode 100644 index 000000000000..c2662915b12d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -0,0 +1,73 @@ +{ attrs +, buildPythonPackage +, defusedxml +, fetchPypi +, hypothesis +, isPy3k +, lxml +, pillow +, pybind11 +, pytest +, pytest-helpers-namespace +, pytest-timeout +, pytest_xdist +, pytestrunner +, python-xmp-toolkit +, python3 +, qpdf +, setuptools-scm-git-archive +, setuptools_scm +, stdenv +}: + +buildPythonPackage rec { + pname = "pikepdf"; + version = "1.1.0"; + disabled = ! isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my"; + }; + + buildInputs = [ + pybind11 + qpdf + ]; + + nativeBuildInputs = [ + setuptools-scm-git-archive + setuptools_scm + ]; + + checkInputs = [ + attrs + hypothesis + pillow + pytest + pytest-helpers-namespace + pytest-timeout + pytest_xdist + pytestrunner + python-xmp-toolkit + ]; + + propagatedBuildInputs = [ defusedxml lxml ]; + + postPatch = '' + substituteInPlace requirements/test.txt \ + --replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5" + ''; + + preBuild = '' + HOME=$TMPDIR + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/pikepdf/pikepdf"; + description = "Read and write PDFs with Python, powered by qpdf"; + license = licenses.mpl20; + maintainers = [ maintainers.kiwi ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix index e611e2ea5b10..7054485f3021 100644 --- a/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose }: +{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: buildPythonPackage rec { pname = "pomegranate"; - version = "0.8.1"; - + version = "0.11.0"; + src = fetchFromGitHub { repo = pname; owner = "jmschrei"; rev = "v${version}"; - sha256 = "085nka5bh88bxbd5vl1azyv9cfpp6grz2ngclc85f9kgccac1djr"; + sha256 = "0gf7z343ag4g7pfccn1sdap3ihkaxrc9ca75awjhmsa2cyqs66df"; }; - propagatedBuildInputs = [ numpy scipy cython networkx joblib ]; + propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; checkInputs = [ nose ]; @@ -20,9 +20,5 @@ buildPythonPackage rec { homepage = https://github.com/jmschrei/pomegranate; license = licenses.mit; maintainers = with maintainers; [ rybern ]; - - # "pomegranate does not yet work with networkx 2.0" - # see https://github.com/jmschrei/pomegranate/issues/209 - broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix new file mode 100644 index 000000000000..6b65af073f42 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix @@ -0,0 +1,47 @@ +{ lib, fetchPypi, buildPythonApplication, pythonOlder +, aspy-yaml +, cached-property +, cfgv +, futures +, identify +, importlib-metadata +, importlib-resources +, nodeenv +, six +, toml +, virtualenv +}: + +buildPythonApplication rec { + pname = "pre-commit"; + version = "1.18.1"; + + src = fetchPypi { + inherit version; + pname = "pre_commit"; + sha256 = "0d9ja186g41kw3gmhbi6xjvaslz6z4xis4qn1q6jabkka6jz4qhp"; + }; + + propagatedBuildInputs = [ + aspy-yaml + cached-property + cfgv + identify + nodeenv + six + toml + virtualenv + importlib-metadata + ] ++ lib.optional (pythonOlder "3.7") importlib-resources + ++ lib.optional (pythonOlder "3.2") futures; + + # slow and impure + doCheck = false; + + meta = with lib; { + description = "A framework for managing and maintaining multi-language pre-commit hooks"; + homepage = https://pre-commit.com/; + license = licenses.mit; + maintainers = with maintainers; [ borisbabic ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix b/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix index be409e348ea3..a4e3cada1fc1 100644 --- a/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix @@ -1,23 +1,20 @@ { stdenv, fetchFromGitHub -, buildPythonPackage, python-jose, pyjwt }: +, buildPythonPackage, python-jose, pyjwt, requests, deprecated, httpretty }: buildPythonPackage rec { pname = "PyGithub"; - version = "1.36"; - name = pname + "-" + version; + version = "1.43.8"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "0yb74f9hg2vdsy766m850hfb1ss17lbgcdvvklm4qf72w12nxc5w"; + sha256 = "1625v558xga5mwhl9jqmibywy5qafmg1vqrirqz6zfq1la1d22mw"; }; - postPatch = '' - # requires network - echo "" > github/tests/Issue142.py - ''; - propagatedBuildInputs = [ python-jose pyjwt ]; + propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/PyGithub/PyGithub; description = "A Python (2 and 3) library to access the GitHub API v3"; diff --git a/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix b/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix new file mode 100644 index 000000000000..26c36e70d0cc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +}: + +buildPythonPackage rec { + pname = "pyfaidx"; + version = "0.5.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1akc8hk8rlw7sv07bv1n2r471acvmxwc57gb69frjpcwggf2phls"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with lib; { + homepage = "https://github.com/mdshw5/pyfaidx"; + description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index"; + license = licenses.bsd3; + maintainers = [ maintainers.jbedo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pylibgen/default.nix b/nixpkgs/pkgs/development/python-modules/pylibgen/default.nix index ce0df266332e..559b75eec412 100644 --- a/nixpkgs/pkgs/development/python-modules/pylibgen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylibgen/default.nix @@ -1,31 +1,33 @@ -{ buildPythonPackage, lib, fetchPypi -, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub +, pythonOlder , requests , pytest +, pre-commit }: buildPythonPackage rec { pname = "pylibgen"; - version = "2.0.1"; + version = "2.0.2"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e"; + src = fetchFromGitHub { + owner = "joshuarli"; + repo = pname; + rev = "v${version}"; + sha256 = "1a9vhkgnkiwkicr2s287254mrkpnw9jq5r63q820dp3h74ba4kl1"; }; - disabled = !isPy3k; - propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pre-commit ]; - # no tests in PyPI tarball + # literally every tests does a network call doCheck = false; - meta = { + meta = with lib; { description = "Python interface to Library Genesis"; homepage = https://pypi.org/project/pylibgen/; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.nico202 ]; + license = licenses.mit; + maintainers = [ maintainers.nico202 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/nixpkgs/pkgs/development/python-modules/pyprof2calltree/default.nix index a2d98bcf2387..198445177c41 100644 --- a/nixpkgs/pkgs/development/tools/profiling/pyprof2calltree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "pyprof2calltree"; version = "1.4.4"; diff --git a/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix b/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix index d8609ca07766..974ac4499ac8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix @@ -2,28 +2,15 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "18-08-3"; + version = "19-05-0"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; rev = version; - sha256 = "1rymx106xa99wd4n44s7jw0w41spg39y1ji4fgn01yk7wjfrdrwg"; + sha256 = "1lfb4q81y96syz5an1lzscfcvmfvlkf4cfl3i5zllw9r3gbarl2r"; }; - # Needed for patch below to apply - prePatch = '' - sed -i -e '/__max_slurm_hex_version__ = "0x1208/c__max_slurm_hex_version__ = "0x120804"' setup.py - ''; - - patches = [ - # Implements a less strict slurm version check - (fetchpatch { - url = "https://github.com/PySlurm/pyslurm/commit/d3703f2d58b5177d29092fe1aae1f7a96da61765.diff"; - sha256 = "1s41z9bhzhplgg08p1llc3i8zw20r1479s04y0l1vx0ak51b6w0k"; - }) - ]; - buildInputs = [ cython slurm ]; setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index 3f4ee6fea28a..ad0db8dc8bcb 100644 --- a/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -7,28 +7,32 @@ , ifaddr # Test dependencies -, pytest_3, pylint, flake8, graphviz +, pytest, pylint, flake8, graphviz , mock, sphinx, sphinx_rtd_theme }: buildPythonPackage rec { pname = "pysonos"; - version = "0.0.21"; + version = "0.0.22"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0x2nznjnm721qw9nys5ap3b6hq9s48bsd1yj5xih50pvn0rf0nz2"; + sha256 = "4a4fe630b97c81261246a448fe9dd2bdfaacd7df4453cf72f020599171416442"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; checkInputs = [ - pytest_3 pylint flake8 graphviz + pytest pylint flake8 graphviz mock sphinx sphinx_rtd_theme ]; + checkPhase = '' + pytest --deselect=tests/test_discovery.py::TestDiscover::test_discover + ''; + meta = { homepage = https://github.com/amelchio/pysonos; description = "A SoCo fork with fixes for Home Assistant"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix new file mode 100644 index 000000000000..a4e0cb809aec --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchFromGitHub +, pytest +, stdenv +}: + +buildPythonPackage rec { + pname = "pytest-helpers-namespace"; + version = "2019.1.8"; + + src = fetchFromGitHub { + owner = "saltstack"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "0z9f25d2wpf3lnqzmmnrlvl5b1f7kqwjjf4nzs9x2bpf91s5zny1"; + }; + + buildInputs = [ pytest ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + + # The tests fail with newest pytest. They passed with pytest_3, which no longer exists + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/saltstack/pytest-helpers-namespace"; + description = "PyTest Helpers Namespace"; + license = licenses.asl20; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix new file mode 100644 index 000000000000..ec340806964b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildPythonPackage +, pytest }: + +buildPythonPackage rec { + pname = "pytest-ordering"; + version = "unstable-2019-06-19"; + + # Pypi lacks tests/ + # Resolves PytestUnknownMarkWarning from pytest + src = fetchFromGitHub { + owner = "ftobia"; + repo = pname; + rev = "492697ee26633cc31d329c1ceaa468375ee8ee9c"; + sha256 = "1xim0kj5g37p1skgvp8gdylpx949krmx60w3pw6j1m1h7sakmddn"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + homepage = https://github.com/ftobia/pytest-ordering; + description = "Pytest plugin to run your tests in a specific order"; + license = licenses.mit; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix b/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix new file mode 100644 index 000000000000..e6425c300478 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "python-unshare"; + # pypi version doesn't support Python 3 and the package didn't update for a long time: + # https://github.com/TheTincho/python-unshare/pull/8 + version = "unstable-2018-05-20"; + + src = fetchFromGitHub { + owner = "TheTincho"; + repo = "python-unshare"; + rev = "4e98c177bdeb24c5dcfcd66c457845a776bbb75c"; + sha256 = "1h9biinhy5m7r2cj4abhvsg2hb6xjny3n2dxnj1336zpa082ys3h"; + }; + + meta = with stdenv.lib; { + description = "Python bindings for the Linux unshare() syscall"; + homepage = "https://github.com/thetincho/python-unshare"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; + +} diff --git a/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix new file mode 100644 index 000000000000..93fa36fa2fcf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, exempi +, fetchFromGitHub +, mock +, pythonOlder +, pytz +, stdenv +}: + +buildPythonPackage rec { + pname = "python-xmp-toolkit"; + version = "2.0.2"; + + # PyPi has version 2.0.1; the tests fail + # There are commits for a 2.0.2 release that was never published + # Not to github, not to PyPi + # This is the latest commit from Jun 29, 2017 (as of Mar 13, 2019) + # It includes the commits for the unreleased version 2.0.2 and more + # Tests pass with this version + src = fetchFromGitHub { + owner = "python-xmp-toolkit"; + repo = "python-xmp-toolkit"; + rev = "5692bdf8dac3581a0d5fb3c5aeb29be0ab6a54fc"; + sha256 = "16bylcm183ilzp7mrpdzw0pzp6csv9v5v247914qsv2abg0hgl5y"; + }; + + buildInputs = [ exempi ]; + + checkInputs = stdenv.lib.optionals (pythonOlder "3.3") [ mock ]; + + propagatedBuildInputs = [ pytz ]; + + postPatch = '' + substituteInPlace libxmp/exempi.py \ + --replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/python-xmp-toolkit/python-xmp-toolkit; + description = "Python XMP Toolkit for working with metadata"; + license = licenses.bsd3; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ruffus/default.nix b/nixpkgs/pkgs/development/python-modules/ruffus/default.nix new file mode 100644 index 000000000000..1b3b271fb61f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ruffus/default.nix @@ -0,0 +1,53 @@ +{ gevent +, buildPythonPackage +, fetchFromGitHub +, hostname +, pytest +, python +, stdenv +}: + +buildPythonPackage rec { + pname = "ruffus"; + version = "2.8.1"; + + src = fetchFromGitHub { + owner = "cgat-developers"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "1gyabqafq4s2sy0prh3k1m8859shzjmfxr7fimx10liflvki96a9"; + }; + + propagatedBuildInputs = [ gevent ]; + + postPatch = '' + sed -i -e 's|/bin/bash|${stdenv.shell}|' ruffus/test/Makefile + sed -i -e 's|\tpytest|\t${pytest}/bin/pytest|' ruffus/test/Makefile + sed -i -e 's|\tpython|\t${python.interpreter}|' ruffus/test/Makefile + sed -i -e 's|/usr/bin/env bash|${stdenv.shell}|' ruffus/test/run_all_unit_tests.cmd + sed -i -e 's|python3|${python.interpreter}|' ruffus/test/run_all_unit_tests3.cmd + sed -i -e 's|python %s|${python.interpreter} %s|' ruffus/test/test_drmaa_wrapper_run_job_locally.py + ''; + + makefile = "ruffus/test/Makefile"; + + checkInputs = [ + gevent + hostname + pytest + ]; + + checkPhase = '' + export HOME=$TMPDIR + cd ruffus/test + make all PYTEST_OPTIONS="-q --disable-warnings" + ''; + + meta = with stdenv.lib; { + description = "Light-weight Python Computational Pipeline Management"; + homepage = http://www.ruffus.org.uk; + license = licenses.mit; + maintainers = [ maintainers.kiwi ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/simplefix/default.nix b/nixpkgs/pkgs/development/python-modules/simplefix/default.nix new file mode 100644 index 000000000000..8b84d6a248ee --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/simplefix/default.nix @@ -0,0 +1,25 @@ +{ lib, python, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "simplefix"; + version = "1.0.12"; + + src = fetchFromGitHub { + repo = "simplefix"; + owner = "da4089"; + rev = "v${version}"; + sha256 = "0pnyqxpki1ija0kha7axi6irgiifcz4w77libagkv46b1z11cc4r"; + }; + + checkPhase = '' + cd test + ${python.interpreter} -m unittest all + ''; + + meta = with lib; { + description = "Simple FIX Protocol implementation for Python"; + homepage = https://github.com/da4089/simplefix; + license = licenses.mit; + maintainers = with maintainers; [ catern ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/simplejson/default.nix b/nixpkgs/pkgs/development/python-modules/simplejson/default.nix index 9e80830f4380..abd4854c73fd 100644 --- a/nixpkgs/pkgs/development/python-modules/simplejson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplejson/default.nix @@ -1,18 +1,20 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , stdenv , pytest }: buildPythonPackage rec { pname = "simplejson"; - version = "3.16.0"; + version = "3.16.1"; doCheck = !stdenv.isDarwin; - src = fetchPypi { - inherit pname version; - sha256 = "b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1v80dbk3ajhgz7q5cc8k0dd22zj9rrlz838c90l5g3w1i280r1iq"; }; # Package does not need pytest, but its a bit easier debugging. diff --git a/nixpkgs/pkgs/development/python-modules/snscrape/default.nix b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix index 40b2626bade0..a97d2e82c348 100644 --- a/nixpkgs/pkgs/development/python-modules/snscrape/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy3k , fetchPypi +, setuptools_scm , requests , lxml , beautifulsoup4 @@ -9,13 +10,13 @@ buildPythonPackage rec { pname = "snscrape"; - version = "0.2.0"; + version = "0.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "02mlpzkvpl2mv30cknq6ngw02y7gj2614qikq25ncrpg5vb903d9"; + sha256 = "1f3lyq06l8s4kcsmwbxcwcxnv6mvz9c3zj70np8vnx149p3zi983"; }; # There are no tests; make sure the executable works. @@ -24,6 +25,7 @@ buildPythonPackage rec { snscrape --help ''; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ requests lxml beautifulsoup4 ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix new file mode 100644 index 000000000000..1212b6c94b0c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -0,0 +1,50 @@ +{ lib, fetchPypi, buildPythonPackage +, six, sqlalchemy +, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, dateutil +, docutils, flexmock, psycopg2, pygments }: + +buildPythonPackage rec { + pname = "sqlalchemy-utils"; + version = "0.34.0"; + + src = fetchPypi { + inherit version; + pname = "SQLAlchemy-Utils"; + sha256 = "0rlixs084isgxsvvpz96njqzikvg8x021sgjp4yj71jpd8blvg8f"; + }; + + propagatedBuildInputs = [ + six + sqlalchemy + ]; + + # Attempts to access localhost and there's also no database access + doCheck = false; + checkInputs = [ + mock + pytz + isort + flake8 + jinja2 + pg8000 + pyodbc + pytest + pymysql + dateutil + docutils + flexmock + psycopg2 + pygments + ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + homepage = https://github.com/kvesteri/sqlalchemy-utils; + description = "Various utility functions and datatypes for SQLAlchemy"; + license = licenses.bsd3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index 43134fb746d8..70488a0d9dcb 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -267,9 +267,9 @@ let # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "1rbzvir569ch33bpvm47byx954vr80rjnzrbgs4rg3bqww73hr3k" + "19ll3f1i5qzd7ngz3m2jbxzgcrdjx5sv6kv2j5mcb8g3xsws8j5x" else - "1wnhma450zh72raiq7ddd9lyq3a056cjqiy6i7y4sidiy09ncvcg"; + "0y9kw3k4yvrxwdy7zry7nip9mdiwyv35r6mx65g4w7qajiypfc7i"; }; buildAttrs = { diff --git a/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix b/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix new file mode 100644 index 000000000000..ec34a451156d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.0.1"; + pname = "unittest-data-provider"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gn2ka4vqpayx4cpbp8712agqjh3wdpk9smdxnp709ccc2v7zg46"; + }; + + meta = with lib; { + description = "PHPUnit-like @dataprovider decorator for unittest"; + homepage = https://github.com/yourlabs/unittest-data-provider; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix b/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix index 528846d72381..ffd99734f932 100644 --- a/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix @@ -1,18 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, pycurl, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi, pycurl, six }: buildPythonPackage rec { pname = "urlgrabber"; - version = "3.10.2"; + version = "4.0.0"; name = "${pname}-${version}"; - disabled = isPy3k; - src = fetchPypi { inherit pname version; - sha256 = "0w1h7hlsq406bxfy2pn4i9bd003bwl0q9b7p03z3g6yl0d21ddq5"; + sha256 = "0fazs574fgixd525cn2dh027f4qf0c0gbwcfyfkhc6fkblfa1ibr"; }; - propagatedBuildInputs = [ pycurl ]; + propagatedBuildInputs = [ pycurl six ]; meta = with stdenv.lib; { homepage = http://urlgrabber.baseurl.org; @@ -21,4 +19,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ qknight ]; }; } - diff --git a/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix b/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix deleted file mode 100644 index 19b7c42558ec..000000000000 --- a/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, beautifulsoup4 -, requests -, python -}: - -buildPythonPackage rec { - pname = "wikipedia"; - version = "1.4.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "db0fad1829fdd441b1852306e9856398204dc0786d2996dd2e0c8bb8e26133b2"; - }; - - propagatedBuildInputs = [ - beautifulsoup4 - requests - ]; - - checkPhase = '' - runHook preCheck - - ${python.interpreter} -m unittest discover tests/ '*test.py' - - runHook postCheck - ''; - - meta = with lib; { - description = "Wikipedia API for Python"; - homepage = https://github.com/goldsmith/Wikipedia; - license = licenses.mit; - maintainers = [ maintainers.worldofpeace ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix b/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix index c953fe9fe1e3..9f6e9866cef3 100644 --- a/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix +++ b/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix @@ -1,8 +1,11 @@ { lib +, stdenv +, openglSupport ? true +, libX11 +, pyopengl , buildPythonPackage , fetchPypi , pkgconfig -, gtk3 , libjpeg , libtiff , SDL @@ -11,6 +14,16 @@ , freeglut , xorg , which +, cairo +, requests +, pango +, pathlib2 +, python +, doxygen +, ncurses +, libpng +, gstreamer +, wxGTK }: buildPythonPackage rec { @@ -22,14 +35,43 @@ buildPythonPackage rec { sha256 = "35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37"; }; - nativeBuildInputs = [ - pkgconfig - ]; + doCheck = false; - buildInputs = [ - gtk3 libjpeg libtiff SDL gst-plugins-base libnotify freeglut xorg.libSM - which - ]; + nativeBuildInputs = [ pkgconfig which doxygen wxGTK ]; + + buildInputs = [ libjpeg libtiff SDL + gst-plugins-base libnotify freeglut xorg.libSM ncurses + requests libpng gstreamer libX11 + pathlib2 + (wxGTK.gtk) + ] + ++ lib.optional openglSupport pyopengl; + + hardeningDisable = [ "format" ]; + + DOXYGEN = "${doxygen}/bin/doxygen"; + + preConfigure = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ + --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' + substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ + --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ + ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"), + ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), + ("appsvc", None) + ]}' + ''; + + buildPhase = '' + ${python.interpreter} build.py -v --use_syswx dox etg --nodoc sip build_py + ''; + + installPhase = '' + ${python.interpreter} setup.py install --skip-build --prefix=$out + wrapPythonPrograms + ''; + + passthru = { inherit wxGTK openglSupport; }; meta = { @@ -38,4 +80,4 @@ buildPythonPackage rec { license = lib.licenses.wxWindows; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/python-modules/zeep/default.nix b/nixpkgs/pkgs/development/python-modules/zeep/default.nix index da6bdcde463f..1aa03983f68a 100644 --- a/nixpkgs/pkgs/development/python-modules/zeep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeep/default.nix @@ -18,7 +18,7 @@ , freezegun , mock , pretend -, pytest_3 +, pytest , pytestcov , requests-mock , aioresponses @@ -54,12 +54,15 @@ buildPythonPackage rec { mock pretend pytestcov - pytest_3 + pytest requests-mock ] ++ lib.optional isPy3k aioresponses; checkPhase = '' runHook preCheck + # fix compatibility with pytest 4 + substituteInPlace tests/conftest.py \ + --replace 'request.node.get_marker("requests")' 'request.node.get_closest_marker("requests")' # ignored tests requires xmlsec python module HOME=$(mktemp -d) pytest tests --ignore tests/test_wsse_signature.py runHook postCheck diff --git a/nixpkgs/pkgs/development/python-modules/zetup/default.nix b/nixpkgs/pkgs/development/python-modules/zetup/default.nix index ee9270f3596d..dcebf7d4ecf9 100644 --- a/nixpkgs/pkgs/development/python-modules/zetup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zetup/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi , setuptools_scm, pathpy, nbconvert -, pytest_3 }: +, pytest }: buildPythonPackage rec { pname = "zetup"; - version = "0.2.48"; + version = "0.2.52"; src = fetchPypi { inherit pname version; - sha256 = "41af61e8e103656ee633f89ff67d6a94848b9b9a836d351bb813b87a139a7c46"; + sha256 = "9ce97276acf0425499251c5eb700f6a3820adc52859df1e03c6d0f0b88a452cd"; }; # Python 3.7 compatibility @@ -19,10 +19,10 @@ buildPythonPackage rec { ''; checkPhase = '' - py.test test -k "not TestObject" + py.test test -k "not TestObject" --deselect=test/test_zetup_config.py::test_classifiers ''; - checkInputs = [ pytest_3 pathpy nbconvert ]; + checkInputs = [ pytest pathpy nbconvert ]; propagatedBuildInputs = [ setuptools_scm ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index c26a5d8e0c8b..85ce733892f9 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.105.0"; + version = "0.105.2"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0p79v65h580vxm6j5nlrcxpkk4bxgn8wcvwmlfs70pbmdsj0hzwx"; + sha256 = "1zvg4yz9rpibvai66lb781qivgx9gr8222z3dix673dns06rd4nf"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/avro-tools/default.nix b/nixpkgs/pkgs/development/tools/avro-tools/default.nix index ee2367d28bba..678988480ece 100644 --- a/nixpkgs/pkgs/development/tools/avro-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/avro-tools/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, lib }: stdenv.mkDerivation rec { + pname = "avro-tools"; version = "1.9.0"; - name = "avro-tools-${version}"; src = fetchurl { url = - "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${name}.jar"; + "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; sha256 = "164mcz7ljd2ikwsq9ba98galcjar4g4n6ag7kkh466nwrpbmd2zi"; }; @@ -19,11 +19,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mkdir -p $out/libexec/avro-tools - mv $src ${name}.jar - cp ${name}.jar $out/libexec/avro-tools + cp $src $out/libexec/avro-tools/${pname}.jar makeWrapper ${jre}/bin/java $out/bin/avro-tools \ - --add-flags "-jar $out/libexec/avro-tools/${name}.jar" + --add-flags "-jar $out/libexec/avro-tools/${pname}.jar" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix index 51aeebb82e52..62ecc47b17bd 100644 --- a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix +++ b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix @@ -62,7 +62,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "1i3b6kn9kq70a34wkpm8zjqj1skawdxs3r01b7r6ws1rbdnfj6mp"; + sha256 = "0g2y283glx2ykxxqc3vsg520a6s2w5d937wndhgpfajc5yjgiz43"; }; buildAttrs = { diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix index f67d8e761b43..1007f4df8cad 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix @@ -323,7 +323,7 @@ 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 - patchShebangs src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt \ + substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt \ --replace "#!/usr/bin/env python" "#!${python3}/bin/python" # md5sum is part of coreutils diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index e0cfe59b0516..cf19862b0056 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let - rev = "a47a965e00ecd66793832e2a12a1972d25e6f734"; - version = "2019-04-05"; + rev = "53f1edc685d8f269ac551336809e34faf7cd29a6"; + version = "2019-08-14"; in stdenv.mkDerivation { name = "sbt-extras-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1hrz7kg0k2iqq18bg6ll2bdj487p0987880dz0c0g35ah70ps2hj"; + sha256 = "1fyfwcnr30c0rgq6xfd2is9a8j1hsrl2p0xqicwqi4bzijy4r6gw"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix index ce15de8678d6..08644def517d 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.0.5"; - sha256 = "0gn7fgxvx94bjm4cim29cdz91ar1rmfxk2f39wwgljvdvhinyryz"; + version = "3.1.0"; + sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk"; }; } diff --git a/nixpkgs/pkgs/development/tools/castxml/default.nix b/nixpkgs/pkgs/development/tools/castxml/default.nix index 653d0d4505e7..1011f95cce7f 100644 --- a/nixpkgs/pkgs/development/tools/castxml/default.nix +++ b/nixpkgs/pkgs/development/tools/castxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pythonPackages , cmake , llvmPackages @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + clangVersion = lib.getVersion llvmPackages.clang; + cmakeFlags = [ - "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}" + "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${clangVersion}/" "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}" ]; diff --git a/nixpkgs/pkgs/development/tools/cppclean/default.nix b/nixpkgs/pkgs/development/tools/cppclean/default.nix index 99f8d55bd87e..85d49667a9af 100644 --- a/nixpkgs/pkgs/development/tools/cppclean/default.nix +++ b/nixpkgs/pkgs/development/tools/cppclean/default.nix @@ -3,14 +3,14 @@ with python3Packages; buildPythonApplication rec { - name = "cppclean-unstable-${version}"; - version = "2018-05-12"; + pname = "cppclean"; + version = "0.13"; src = fetchFromGitHub { owner = "myint"; repo = "cppclean"; - rev = "e7da41eca5e1fd2bd1dddd6655e50128bb96dc28"; - sha256 = "0pymh6r7y19bwcypfkmgwyixrx36pmz338jd83yrjflsbjlriqm4"; + rev = "v${version}"; + sha256 = "081bw7kkl7mh3vwyrmdfrk3fgq8k5laacx7hz8fjpchrvdrkqph0"; }; postUnpack = '' diff --git a/nixpkgs/pkgs/development/tools/electron/6.x.nix b/nixpkgs/pkgs/development/tools/electron/6.x.nix new file mode 100644 index 000000000000..5d412848d2d6 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/electron/6.x.nix @@ -0,0 +1,86 @@ +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core}: + +let + version = "6.0.1"; + name = "electron-${version}"; + + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + meta = with stdenv.lib; { + description = "Cross platform desktop application shell"; + homepage = https://github.com/electron/electron; + license = licenses.mit; + maintainers = with maintainers; [ travisbhartwell manveru ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; + }; + + linux = { + inherit name version meta; + src = { + i686-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; + sha256 = "0ly6mjcljw0axkkrz7dsvfywmjb3pmspalfk2259gyqqxj8a37pb"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; + sha256 = "0l8k6v16ynikf6x59w5byzhji0d6mqp2q0kjlrby56546qzyfkh6"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; + sha256 = "0c2xl8dm9fmj0d92w53zbn2np2fiwr88hw0dqjdn1rwczhw7zqss"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; + sha256 = "0iyq229snm7z411xxfsv7f0bqg6hbw2l8y6ymys110f83hp01f8a"; + }; + }.${stdenv.hostPlatform.system} or throwSystem; + + buildInputs = [ gtk3 ]; + + nativeBuildInputs = [ + unzip + makeWrapper + wrapGAppsHook + ]; + + dontWrapGApps = true; # electron is in lib, we need to wrap it manually + + buildCommand = '' + mkdir -p $out/lib/electron $out/bin + unzip -d $out/lib/electron $src + ln -s $out/lib/electron/electron $out/bin + + fixupPhase + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at-spi2-core ]}:$out/lib/electron" \ + $out/lib/electron/electron + + wrapProgram $out/lib/electron/electron \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ + "''${gappsWrapperArgs[@]}" + ''; + }; + + darwin = { + inherit name version meta; + + src = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; + sha256 = "0m8v5fs69kanrd1yk6smbmaaj9gb5j3q487z3wicifry0xn381i2"; + }; + + buildInputs = [ unzip ]; + + buildCommand = '' + mkdir -p $out/Applications + unzip $src + mv Electron.app $out/Applications + mkdir -p $out/bin + ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + ''; + }; +in + + stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux) diff --git a/nixpkgs/pkgs/development/tools/icestorm/default.nix b/nixpkgs/pkgs/development/tools/icestorm/default.nix index c287e40d823a..851acd17b7ea 100644 --- a/nixpkgs/pkgs/development/tools/icestorm/default.nix +++ b/nixpkgs/pkgs/development/tools/icestorm/default.nix @@ -1,23 +1,26 @@ { stdenv, fetchFromGitHub , pkgconfig, libftdi , python3, pypy3 -}: -let - pypyCompatible = stdenv.isx86_64; /* pypy3 seems broken on i686 */ - pythonPkg = if pypyCompatible then pypy3 else python3; - pythonInterp = pythonPkg.interpreter; -in +# PyPy yields large improvements in build time and runtime performance, +# and IceStorm isn't intended to be used as a library other than by the +# nextpnr build process (which is also sped up by using PyPy), so we +# use it by default. See 18839e1 for more details. +, usePyPy ? stdenv.isx86_64 /* pypy3 seems broken on i686 */ +}: stdenv.mkDerivation rec { - name = "icestorm-${version}"; - version = "2019.04.16"; + pname = "icestorm"; + version = "2019.08.08"; + + pythonPkg = if usePyPy then pypy3 else python3; + pythonInterp = pythonPkg.interpreter; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "d9ea2e15fccebbbce59409b0ae7a1481d78aab86"; - sha256 = "1qa37p7hm7c2ga26xcvsd8xkqrp4hm0w6yh7cvz2q988yjzal5ky"; + rev = "2ccae0d3864fd7268118287a85963c0116745cff"; + sha256 = "1vlk5k7x6c1bjp19niyl0shljj8il94q2brjmda1rwhqxz81g9s7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix index 44df2b1e1534..43cb6e6c2c75 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix @@ -1,29 +1,77 @@ -{stdenv, fetchurl, gawk}: - -stdenv.mkDerivation { - name = "noweb-2.11b"; - src = fetchurl { - urls = [ "http://ftp.de.debian.org/debian/pool/main/n/noweb/noweb_2.11b.orig.tar.gz" - "ftp://www.eecs.harvard.edu/pub/nr/noweb.tgz" - ]; - sha256 = "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9"; +{ stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }: + +let noweb = stdenv.mkDerivation rec { + pname = "noweb"; + version = "2.12"; + + src = fetchFromGitHub { + owner = "nrnrnr"; + repo = "noweb"; + rev = "v${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; }; + + patches = [ ./no-FAQ.patch ]; + + nativeBuildInputs = [ groff ] ++ stdenv.lib.optionals (!isNull icon-lang) [ icon-lang ]; + preBuild = '' - mkdir -p $out/lib/noweb + mkdir -p "$out/lib/noweb" cd src - makeFlags="BIN=$out/bin LIB=$out/lib/noweb MAN=$out/share/man TEXINPUTS=$out/share/texmf/tex/latex" ''; - preInstall=''mkdir -p $out/share/texmf/tex/latex''; - postInstall= '' - substituteInPlace $out/bin/cpif --replace "PATH=/bin:/usr/bin" "" - for f in $out/bin/{noweb,nountangle,noroots,noroff,noindex} \ - $out/lib/noweb/{toroff,btdefn,totex,noidx,unmarkup,toascii,tohtml,emptydefn}; do - substituteInPlace $f --replace "nawk" "${gawk}/bin/awk" + + makeFlags = stdenv.lib.optionals (!isNull icon-lang) [ + "LIBSRC=icon" + "ICONC=icont" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "CC=clang" + ]; + + installFlags = [ + "BIN=$(out)/bin" + "ELISP=$(out)/share/emacs/site-lisp" + "LIB=$(out)/lib/noweb" + "MAN=$(out)/share/man" + "TEXINPUTS=$(tex)/tex/latex/noweb" + ]; + + preInstall = '' + mkdir -p "$tex/tex/latex/noweb" + ''; + + installTargets = "install-code install-tex install-elisp"; + + postInstall = '' + substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" "" + + for f in $out/bin/no{index,roff,roots,untangle,web} \ + $out/lib/noweb/to{ascii,html,roff,tex} \ + $out/lib/noweb/{bt,empty}defn \ + $out/lib/noweb/{noidx,unmarkup}; do + # NOTE: substituteInPlace breaks Icon binaries, so make sure the script + # uses (n)awk before calling. + if grep -q nawk "$f"; then + substituteInPlace "$f" --replace "nawk" "${gawk}/bin/awk" + fi done + + # HACK: This is ugly, but functional. + PATH=$out/bin:$PATH make -BC xdoc + make $installFlags install-man + + ln -s "$tex" "$out/share/texmf" ''; - patches = [ ./no-FAQ.patch ]; - meta = { - platforms = stdenv.lib.platforms.linux; + outputs = [ "out" "tex" ]; + + tlType = "run"; + passthru.pkgs = [ noweb.tex ]; + + meta = with stdenv.lib; { + description = "A simple, extensible literate-programming tool"; + homepage = https://www.cs.tufts.edu/~nr/noweb; + license = licenses.bsd2; + maintainers = with maintainers; [ yurrriq ]; + platforms = with platforms; linux ++ darwin; }; -} +}; in noweb diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix index 281463528354..ddc15f856b53 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,28 +1,30 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, binutils-arm-embedded, libftdi +, gcc-arm-embedded, libftdi1 , python, pythonPackages }: with lib; stdenv.mkDerivation rec { - name = "blackmagic-${version}"; - version = "1.6.1"; + pname = "blackmagic"; + version = "unstable-2019-08-13"; + # `git describe --always` + firmwareVersion = "v1.6.1-317-gc9c8b08"; src = fetchFromGitHub { owner = "blacksphere"; repo = "blackmagic"; - rev = "29386aee140e5e99a958727358f60980418b4c88"; - sha256 = "05x19y80mixk6blpnfpfngy5d41jpjvdqgjzkmhv1qc03bhyhc82"; + rev = "c9c8b089f716c31433432f5ee54c5c206e4945cf"; + sha256 = "0175plba7h3r1p584ygkjlvg2clvxa2m0xfdcb2v8jza2vzc8ywd"; fetchSubmodules = true; }; nativeBuildInputs = [ - gcc-arm-embedded binutils-arm-embedded + gcc-arm-embedded ]; buildInputs = [ - libftdi + libftdi1 python pythonPackages.intelhex ]; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { postPatch = '' # Prevent calling out to `git' to generate a version number: substituteInPlace src/Makefile \ - --replace '`git describe --always --dirty`' '${version}' + --replace '$(shell git describe --always --dirty)' '${firmwareVersion}' # Fix scripts that generate headers: for f in $(find scripts libopencm3/scripts -type f); do @@ -41,6 +43,8 @@ stdenv.mkDerivation rec { buildPhase = "${stdenv.shell} ${./helper.sh}"; installPhase = ":"; # buildPhase does this. + enableParallelBuilding = true; + meta = { description = "In-application debugger for ARM Cortex microcontrollers"; longDescription = '' @@ -56,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/blacksphere/blackmagic; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pjones ]; + maintainers = with maintainers; [ pjones emily ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh b/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh index b4c7558885bb..991d0249e169 100755 --- a/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh +++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh @@ -10,6 +10,8 @@ out=${out:-/tmp} ################################################################################ export CFLAGS=$NIX_CFLAGS_COMPILE +export MAKEFLAGS="\ + ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}" ################################################################################ PRODUCTS="blackmagic.bin blackmagic.hex blackmagic_dfu.bin blackmagic_dfu.hex" diff --git a/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix index 31e720b13f29..6de69a34b290 100644 --- a/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cgdb-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://cgdb.me/files/${name}.tar.gz"; - sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz"; + sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv"; }; buildInputs = [ ncurses readline flex texinfo ]; diff --git a/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix b/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix index 0fb3dfed7445..0424b9012519 100644 --- a/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix @@ -2,10 +2,11 @@ }: stdenv.mkDerivation rec { - name = "libtool-2.4.6"; + pname = "libtool"; + version = "2.4.6"; src = fetchurl { - url = "mirror://gnu/libtool/${name}.tar.gz"; + url = "mirror://gnu/libtool/${pname}-${version}.tar.gz"; sha256 = "1qq61k6lp1fp75xs398yzi6wvbx232l7xbyn3p13cnh27mflvgg3"; }; @@ -23,13 +24,14 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = false; + enableParallelBuilding = true; + # Don't run the native `strip' when cross-compiling. This breaks at least # with `.a' files for MinGW. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = { + meta = with stdenv.lib; { description = "GNU Libtool, a generic library support script"; - longDescription = '' GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries behind a consistent, @@ -39,12 +41,9 @@ stdenv.mkDerivation rec { your Makefile, Makefile.in, or Makefile.am. See the documentation for details. ''; - homepage = https://www.gnu.org/software/libtool/; - - license = stdenv.lib.licenses.gpl2Plus; - + license = licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch index a5e4ac461b48..013ac5180afa 100644 --- a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch +++ b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch @@ -10,7 +10,7 @@ index f93e67a..2eb2db9 100644 + defaults.variables.STAT = "stat" defaults.variables.STATFLAG = "-f '%A'" - local version = util.popen_read("sw_vers -productVersion") -+ local version = "10.10" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch index 7ef1c7a319ca..4ba883f01130 100644 --- a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch +++ b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch @@ -7,7 +7,7 @@ index c5af5a2..1949fdc 100644 defaults.arch = "macosx-"..target_cpu defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" - local version = util.popen_read("sw_vers -productVersion") -+ local version = "10.10" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 diff --git a/nixpkgs/pkgs/development/tools/misc/tinyprog/default.nix b/nixpkgs/pkgs/development/tools/misc/tinyprog/default.nix new file mode 100644 index 000000000000..10d067e2c618 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/tinyprog/default.nix @@ -0,0 +1,42 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +with python3Packages; buildPythonApplication rec { + pname = "tinyprog"; + # `python setup.py --version` from repo checkout + version = "1.0.24.dev99+ga77f828"; + + src = fetchFromGitHub { + owner = "tinyfpga"; + repo = "TinyFPGA-Bootloader"; + rev = "a77f828d3d6ae077e323ec96fc3925efab5aa9d7"; + sha256 = "0jg47q0n1qkdrzri2q6n9a7czicj0qk58asz0xhzkajx1k9z3g5q"; + }; + + sourceRoot = "source/programmer"; + + propagatedBuildInputs = [ + pyserial + jsonmerge + intelhex + tqdm + six + packaging + pyusb + ]; + + nativeBuildInputs = [ setuptools_scm ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + ''; + + meta = with lib; { + homepage = https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer; + description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; + maintainers = with maintainers; [ emily ]; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 32cd368fb04d..0a36efa79eb4 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,18 +1,22 @@ -{ stdenv, rustPlatform, fetchFromGitHub, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0m57v7mh7wdl0rdbad7vkvcgy93p9gcb971wap8i5nzjvzmp4wlb"; + sha256 = "0s3xd9dr0n64j0m38gd4cafrdr5vnpl557ks4wr0jszyhldnlfkz"; }; - cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz"; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + cargoSha256 = "13zz3n1p75267h3qrmvpmd8agnkbk8vfbr8s38wcyysck81pr4px"; + + buildInputs = [ llvmPackages.libclang ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with stdenv.lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 56f550e37a21..92e21bfc00e3 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.21.0"; + version = "0.22.0"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "02hxf0mbk4nj9ja1z70k8fskh1kl3pixwy7gx0si5fbp9rmn04wk"; + sha256 = "13nl370immbhjarc0vfzrsflml3alh2f2zrh4znbks4yc3yp790z"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/b6017fd825b52987ac7c3b65620917e5d567312b/cargo-make-Cargo.lock"; - sha256 = "15ajxza58bbviwjxl98c0z89w4430902j0z46b594nbm02kv2ad9"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/d31cfb3598d0a2886abd4d2ed43a02d493c8de8c/cargo-make-Cargo.lock"; + sha256 = "08fzl98d277n9xn3hrg9jahkqwdjfi5saajsppwzdbb3l7xw4jh2"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1fsfjavad1cbq1xvck2j5vyppxck606cpmqrwbs4fjvdmlbgx3gp"; + cargoSha256 = "0gj4a15slxnp31mlfgh57h3cwv0lnw5gdmkrmmj79migi96i5i6y"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/nixpkgs/pkgs/development/tools/skaffold/default.nix b/nixpkgs/pkgs/development/tools/skaffold/default.nix index d5a6f3915f2e..61d47cf907bc 100644 --- a/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.30.0"; - # rev is the 0.30.0 commit, mainly for skaffold version command output - rev = "fe31429012110e6fd70f97971288bd266ba95bed"; + version = "0.35.0"; + # rev is the 0.35.0 commit, mainly for skaffold version command output + rev = "1da7608f9eb21ebe722bc054584e591e4223a3dc"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; diff --git a/nixpkgs/pkgs/development/tools/trellis/default.nix b/nixpkgs/pkgs/development/tools/trellis/default.nix index a348e295933e..0888130c2d45 100644 --- a/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -7,22 +7,22 @@ let boostWithPython3 = boost.override { python = python3; enablePython = true; }; in stdenv.mkDerivation rec { - name = "trellis-${version}"; - version = "2019.04.22"; + pname = "trellis"; + version = "2019.08.09"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "5eb0ad870f30422b95d090ac9a476343809c62b9"; - sha256 = "10jkjfhqdr2bff41mh3w8a7kszf2whqqgk5s1z5z07mlh6zfdjlg"; + rev = "a67379179985bb12a611c75d975548cdf6e7d12e"; + sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35"; name = "trellis"; }) (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis-db"; - rev = "d0b219af41ae3da6150645fbc5cc5613b530603f"; - sha256 = "1mnzvrqrcbfypvbagwyf6arv3kmj6q7n27gcmyk6ap2xnavkx4bq"; + rev = "b4d626b6402c131e9a035470ffe4cf33ccbe7986"; + sha256 = "0k26lq6c049ja8hhqcljwjb1y5k4gcici23l2n86gyp83jr03ilx"; name = "database"; }) ]; |