diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
commit | 0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea (patch) | |
tree | ad528e0ffd64d471f2bf250670c0732bff57e86b /nixpkgs/pkgs/development | |
parent | 373507e28edeacd168b5c240840db2dac854882a (diff) | |
parent | 2ec5e9595becf05b052ce4c61a05d87ce95d19af (diff) | |
download | nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.gz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.bz2 nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.lz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.xz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.zst nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.zip |
Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'
Diffstat (limited to 'nixpkgs/pkgs/development')
433 files changed, 9007 insertions, 3400 deletions
diff --git a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index b62dc2def7f1..cca0f0d4adbc 100644 --- a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -90,26 +90,7 @@ rec { echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags - '' - + lib.optionalString stdenv.targetPlatform.isAarch32 (let - p = stdenv.targetPlatform.platform.gcc or {} - // stdenv.targetPlatform.parsed.abi; - flags = lib.concatLists [ - (lib.optional (p ? arch) "-march=${p.arch}") - (lib.optional (p ? cpu) "-mcpu=${p.cpu}") - (lib.optional (p ? abi) "-mabi=${p.abi}") - (lib.optional (p ? fpu) "-mfpu=${p.fpu}") - (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}") - (lib.optional (p ? mode) "-mmode=${p.mode}") - ]; - in '' - sed -E -i \ - $out/bin/${stdenv.targetPlatform.config}-cc \ - $out/bin/${stdenv.targetPlatform.config}-c++ \ - $out/bin/${stdenv.targetPlatform.config}-clang \ - $out/bin/${stdenv.targetPlatform.config}-clang++ \ - -e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|' - ''); + ''; }; # Bionic lib C and other libraries. diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 32ace2a817a0..03febb6aa355 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -5,7 +5,7 @@ "hotspot": { "aarch64": { "build": "7", - "sha256": "ac367f3261fb53508c07f7eeb767b11ab53681b7613b81b6b7030c4db00b1aa8", + "sha256": "894a846600ddb0df474350037a2fb43e3343dc3606809a20c65e750580d8f2b9", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz", "version": "11.0.3" }, @@ -33,7 +33,7 @@ "hotspot": { "aarch64": { "build": "7", - "sha256": "4af5b7d6678d03f2207029a7c610d81b1f016462c1dfcd8153a227b1df973a42", + "sha256": "de31fab70640c6d5099de5fc8fa8b4d6b484a7352fa48a9fafbdc088ca708564", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.3_7.tar.gz", "version": "11.0.3" }, diff --git a/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/nixpkgs/pkgs/development/compilers/binaryen/default.nix index 48661ba407c9..7c3203fe62eb 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 = "45"; + defaultVersion = "83"; # Map from git revs to SHA256 hashes sha256s = { - "version_45" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc"; + "version_83" = "0vggd9n6anfxsdk4kiyylysi4cfm2rp39f66sq9zkg0h7vw5x5sm"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in diff --git a/nixpkgs/pkgs/development/compilers/fasm/bin.nix b/nixpkgs/pkgs/development/compilers/fasm/bin.nix index 1efa100e61df..7b23d4f6bcc1 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.10"; + version = "1.73.11"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "1lk8vlr0vg7h8lhiav99paa5a1mi0r2m8agxjmczhhavqhx44c32"; + sha256 = "1zhbs72qc8bw5158zh6mvzznfamcx5a1bsmbmq9ci0d7wb58sxmg"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix index ba6d5912fe88..f3cdce411939 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix @@ -4,7 +4,7 @@ let p = targetPlatform.platform.gcc or {} // targetPlatform.parsed.abi; in lib.concatLists [ - (lib.optional (p ? arch) "--with-arch=${p.arch}") + (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64 (lib.optional (p ? cpu) "--with-cpu=${p.cpu}") (lib.optional (p ? abi) "--with-abi=${p.abi}") (lib.optional (p ? fpu) "--with-fpu=${p.fpu}") diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix index 1cbfa7e65936..e891ff42ff60 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix @@ -84,12 +84,12 @@ let in stdenv.mkDerivation (rec { - version = "8.6.4.20190406"; + version = "8.6.5"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.6.5-rc1/ghc-${version}-src.tar.xz"; - sha256 = "1zschidlaj80fl9flnlfhvlvy75cks3hz31cfxyyz935m3xyayxv"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0qg3zsmbk4rkwkc3jpas3zs74qaxmw4sp4v1mhsbj0a0dzls2jjd"; }; enableParallelBuilding = true; @@ -228,7 +228,7 @@ stdenv.mkDerivation (rec { inherit enableShared; # Our Cabal compiler name - haskellCompilerName = "ghc-8.6.4.20190406"; + haskellCompilerName = "ghc-${version}"; }; meta = { diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix new file mode 100644 index 000000000000..9772d045b765 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix @@ -0,0 +1,230 @@ +{ stdenv, pkgsBuildTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx + +, libiconv ? null, ncurses + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whetherto build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + ++ [libffi] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation (rec { + version = "8.8.0.20190424"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/8.8.1-alpha1/ghc-${version}-src.tar.xz"; + sha256 = "1lwzy4q9hhaayamr1ij3lk8l7zdwfqza5b2racylp7xn2y9wanl9"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index 62934dd9eeb3..08e3ec4f445f 100644 --- a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt , libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo -, gdk_pixbuf, atk }: +, gdk_pixbuf, atk, zlib }: # TODO: Investigate building from source instead of patching binaries. # TODO: Binary patching for not just x86_64-linux but also x86_64-darwin i686-linux let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "202b1483.37"; + version = "164"; name = pname + "-" + version; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk8u${version}_linux_x64.tar.gz"; - sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7"; + url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz"; + sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi"; } else throw "unsupported system: ${stdenv.hostPlatform.system}"; @@ -29,16 +29,7 @@ let drv = stdenv.mkDerivation rec { jrePath=$out/jre ''; - postFixup = let - arch = "amd64"; - rSubPaths = [ - "lib/${arch}/jli" - "lib/${arch}/server" - "lib/${arch}/xawt" - "lib/${arch}" - ]; - in '' - rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}" + postFixup = '' find $out -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; @@ -47,10 +38,11 @@ let drv = stdenv.mkDerivation rec { rpath = lib.makeLibraryPath ([ stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL - alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk + alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib + (placeholder "out") ] ++ (with xorg; [ libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm - ])); + ])) + ":${placeholder "out"}/lib/jli"; passthru.home = drv; diff --git a/nixpkgs/pkgs/development/compilers/julia/shared.nix b/nixpkgs/pkgs/development/compilers/julia/shared.nix index ffa5e3ba55d0..6706cf1e2bd4 100644 --- a/nixpkgs/pkgs/development/compilers/julia/shared.nix +++ b/nixpkgs/pkgs/development/compilers/julia/shared.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { makeFlags = let arch = head (splitString "-" stdenv.system); - march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" + march = { "x86_64" = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; "i686" = "pentium4"; }."${arch}" or (throw "unsupported architecture: ${arch}"); # Julia requires Pentium 4 (SSE2) or better cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" diff --git a/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix index cb5cf2c18a55..87c798c8d382 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.30"; + version = "1.3.31"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1v5x64srafg7j3d31qhwhxv4hm2vg8vlbfncri3s5h3y6lcj4p1x"; + sha256 = "0sldhjxh2ghzwkabgziyiq4609iws0vninr8zxclzbqmcgajawqh"; }; propagatedBuildInputs = [ jre ] ; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index 47c8b7bd59f5..2b591cc94aff 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index 3503e6b83d2e..48cf9e5e589c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -97,13 +97,17 @@ let targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt + ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix index d0a5c37c4148..3d67c37dcdd7 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version +, enableShared ? true }: stdenv.mkDerivation rec { name = "libc++-${version}"; @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -30,8 +32,13 @@ stdenv.mkDerivation rec { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"; + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; enableParallelBuilding = true; @@ -46,6 +53,6 @@ stdenv.mkDerivation rec { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix index 0eb5ebca5159..bb5b368267f2 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -1,4 +1,5 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: +{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version +, enableShared ? true }: stdenv.mkDerivation { name = "libc++abi-${version}"; @@ -6,13 +7,20 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1k875f977ybdkpdnr9105wa6hccy9qvpd9xd42n75h7p56bdxmn2"; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + ] ++ stdenv.lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; + patches = [ ./libcxxabi-no-threads.patch ]; + postUnpack = '' unpackFile ${libcxx.src} unpackFile ${llvm.src} @@ -21,6 +29,8 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch} ''; installPhase = if stdenv.isDarwin @@ -39,8 +49,9 @@ stdenv.mkDerivation { else '' install -d -m 755 $out/include $out/lib install -m 644 lib/libc++abi.a $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib install -m 644 ../include/cxxabi.h $out/include + '' + stdenv.lib.optionalString enableShared '' + install -m 644 lib/libc++abi.so.1.0 $out/lib ln -s libc++abi.so.1.0 $out/lib/libc++abi.so ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 ''; @@ -50,6 +61,6 @@ stdenv.mkDerivation { description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch b/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch new file mode 100644 index 000000000000..787f3e16500e --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4138acf..41b4763 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS) + " is also set to ON.") + endif() + add_definitions(-D_LIBCXXABI_HAS_NO_THREADS) ++ add_definitions(-D_LIBCPP_HAS_NO_THREADS) + endif() + + if (LIBCXXABI_HAS_EXTERNAL_THREAD_API) diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch b/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch new file mode 100644 index 000000000000..4ebfe46aa813 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index 15497d405e0..33f7f18193a 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake ++++ b/cmake/modules/HandleLLVMOptions.cmake +@@ -127,7 +127,10 @@ else(WIN32) + set(LLVM_HAVE_LINK_VERSION_SCRIPT 1) + endif() + else(FUCHSIA OR UNIX) +- MESSAGE(SEND_ERROR "Unable to determine platform") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi") ++ else() ++ MESSAGE(SEND_ERROR "Unable to determine platform") ++ endif() + endif(FUCHSIA OR UNIX) + endif(WIN32) + diff --git a/nixpkgs/pkgs/development/compilers/matter-compiler/Gemfile.lock b/nixpkgs/pkgs/development/compilers/matter-compiler/Gemfile.lock index 2eefe96ec63b..ab1833b3cfe9 100644 --- a/nixpkgs/pkgs/development/compilers/matter-compiler/Gemfile.lock +++ b/nixpkgs/pkgs/development/compilers/matter-compiler/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES matter_compiler BUNDLED WITH - 1.10.6 + 1.17.2 diff --git a/nixpkgs/pkgs/development/compilers/matter-compiler/default.nix b/nixpkgs/pkgs/development/compilers/matter-compiler/default.nix index 63e5b50c3d47..4b3ff844977e 100644 --- a/nixpkgs/pkgs/development/compilers/matter-compiler/default.nix +++ b/nixpkgs/pkgs/development/compilers/matter-compiler/default.nix @@ -1,11 +1,9 @@ +{ lib, bundlerApp }: -{ lib, bundlerEnv, ruby }: - -bundlerEnv { - name = "matter_compiler-0.5.1"; - - inherit ruby; +bundlerApp { + pname = "matter_compiler"; gemdir = ./.; + exes = [ "matter_compiler" ]; meta = with lib; { description = '' @@ -14,7 +12,7 @@ bundlerEnv { ''; homepage = https://github.com/apiaryio/matter_compiler/; license = licenses.mit; - maintainers = with maintainers; [ rvlander ]; + maintainers = with maintainers; [ rvlander manveru ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix b/nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix index 9ac7ae8d20e4..014fc226607a 100644 --- a/nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix +++ b/nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix @@ -1,9 +1,12 @@ { - "matter_compiler" = { - version = "0.5.1"; + matter_compiler = { + groups = ["default"]; + platforms = []; source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "16501zdiqxk34v2d0nlbwrcrjm6g57hrsmsw0crwssn29v5zbykf"; + type = "gem"; }; + version = "0.5.1"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/compilers/mint/default.nix b/nixpkgs/pkgs/development/compilers/mint/default.nix index de7e3bd6a07e..1c8e9fb7eb20 100644 --- a/nixpkgs/pkgs/development/compilers/mint/default.nix +++ b/nixpkgs/pkgs/development/compilers/mint/default.nix @@ -33,13 +33,13 @@ let }; in stdenv.mkDerivation rec { - version = "0.3.1"; + version = "0.5.0"; name = "mint-${version}"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "1f49ax045zdjj0ypc2j4ms9gx80rl63qcsfzm3r0k0lcavfp57zr"; + sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; }; nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ]; diff --git a/nixpkgs/pkgs/development/compilers/mint/shards.nix b/nixpkgs/pkgs/development/compilers/mint/shards.nix index fbf85ef80426..dc6866e3af3d 100644 --- a/nixpkgs/pkgs/development/compilers/mint/shards.nix +++ b/nixpkgs/pkgs/development/compilers/mint/shards.nix @@ -8,8 +8,8 @@ ameba = { owner = "veelenga"; repo = "ameba"; - rev = "v0.8.0"; - sha256 = "0i9vc5xy05kzxgjid2rnvc7ksvxm9gba25qqi6939q2m1s07qjka"; + rev = "v0.9.1"; + sha256 = "05q2ki9dpg23pllalv5p27f1m287kiicp97ziz0z7vv0vg1r8smj"; }; baked_file_system = { owner = "schovi"; @@ -23,23 +23,23 @@ rev = "51962dc36f9bbb1b926d557f7cb8993a6c73cc63"; sha256 = "1nwnsxm8srfw8jg0yfi2v19x6j3dadx62hq0xpxra40qcqz9dbnp"; }; - duktape = { - owner = "jessedoyle"; - repo = "duktape.cr"; - rev = "v0.14.1"; - sha256 = "0fkay3qspzych050xl8xjkrphmxpzaj0dcf9jl22xwz8cx1l89f1"; + dotenv = { + owner = "gdotdesign"; + repo = "cr-dotenv"; + rev = "v0.2.0"; + sha256 = "0zi2y1j2546xjhdzn7icmry0cjv82cx2cqmpgx5ml37c2pnb7kp7"; }; exception_page = { owner = "crystal-loot"; repo = "exception_page"; - rev = "v0.1.1"; - sha256 = "0pimjm64p21cjhp0jhcgdmbgisx7amk8hhbkcprkbr44bj6rv9ay"; + rev = "v0.1.2"; + sha256 = "0j5ishhyriq9p339yaawrmawl9wgmp1paniq30a8d6a0568h3avq"; }; kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "v0.24.0"; - sha256 = "0sg7gy1lbhid9y9wh77m9sd00jygk92njm4mpb7w1fq8bjnm738k"; + rev = "v0.25.1"; + sha256 = "1334i905xj6vlmp8acyybwwlaxsgmf90b59da7brzpnf28wci782"; }; kilt = { owner = "jeromegn"; @@ -50,8 +50,8 @@ radix = { owner = "luislavena"; repo = "radix"; - rev = "v0.3.8"; - sha256 = "1kn2xxj8a8j6f6g1dr0s9mkrj1xqnpzw9wnbq24mbv8ach9a1hva"; + rev = "v0.3.9"; + sha256 = "19pksfr7ddc31hvikb433jg0zav1ar93k6zmsgaf3vsrjnvia3ix"; }; string_inflection = { owner = "mosop"; diff --git a/nixpkgs/pkgs/development/compilers/mono/5.nix b/nixpkgs/pkgs/development/compilers/mono/5.nix index 2b987b08364c..0db13308a5af 100644 --- a/nixpkgs/pkgs/development/compilers/mono/5.nix +++ b/nixpkgs/pkgs/development/compilers/mono/5.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (rec { inherit Foundation libobjc; - version = "5.16.0.220"; - sha256 = "1qwdmxssplfdb5rq86f1j8lskvr9dfk5c8hqz9ic09ml69r8c87l"; - enableParallelBuilding = false; + version = "5.20.1.27"; + sha256 = "15rpwxw642ad1na93k5nj7d2lb24f21kncr924gxr00178a9x0jy"; + enableParallelBuilding = true; }) diff --git a/nixpkgs/pkgs/development/compilers/openjdk/8.nix b/nixpkgs/pkgs/development/compilers/openjdk/8.nix index 832954dd67f2..952c5d1bf6ae 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/8.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/8.nix @@ -95,6 +95,9 @@ let ./swing-use-gtk-jdk8.patch ]; + # Hotspot cares about the host(!) version otherwise + DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok"; + preConfigure = '' chmod +x configure substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 8342c9fd3359..ea6b9d2a9fe7 100644 --- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -89,8 +89,9 @@ let result = stdenv.mkDerivation rec { armv7l-linux = "linux-arm32-vfp-hflt"; aarch64-linux = "linux-arm64-vfp-hflt"; }.${stdenv.hostPlatform.system}; + javadlPlatformName = "linux-i586"; in fetchurl { - url = "http://download.oracle.com/otn-pub/java/jdk/${productVersion}u${patchVersion}-b${buildVersion}/${releaseToken}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; + url = "http://javadl.oracle.com/webapps/download/GetFile/1.${productVersion}.0_${patchVersion}-b${buildVersion}/${releaseToken}/${javadlPlatformName}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; curlOpts = "-b oraclelicense=a"; sha256 = sha256.${stdenv.hostPlatform.system}; }; diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 81f4ef3c7dba..d9ee5010f7cf 100644 --- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -2,13 +2,13 @@ # jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "201"; - buildVersion = "09"; - sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac"; - sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b"; - sha256.armv7l-linux = "0y6bvq93lsf21v6ca536dpfhkk5ljsj7c6di0qzkban37bivj0si"; - sha256.aarch64-linux = "1bybysgg9llqzllsmdszmmb73v5az2l1shxn6lxwv3wwiazpf47q"; - releaseToken = "42970487e3af4f5aa5bca3f542482c60"; + patchVersion = "211"; + buildVersion = "12"; + sha256.i686-linux = "0mdrljs0rw9s4pvaa3sn791nqgdrp8749z3qn80y7hhad74kvsnp"; + sha256.x86_64-linux = "13b6qk4sn8jdhxa22na9d2aazm4yjh6yxrlxr189gxy3619y9dy0"; + sha256.armv7l-linux = "1ij1x925k7lyp5f98gy8r0xfr41qhczf2rb74plwwmrccc1k00p5"; + sha256.aarch64-linux = "041r615qj9qy34a9gxm8968qlmf060ba2as5w97v86mbik4rca05"; + releaseToken = "478a62b7d4e34b78b671c754eaaf38ab"; jceName = "jce_policy-8.zip"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; } diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 0263bdde8d28..9fab02ab5361 100644 --- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -2,13 +2,13 @@ # jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "202"; - buildVersion = "09"; - sha256.i686-linux = "19np392dwdqdq39lmm10607w2h042lrm5953fnsfh1bb9jli1pgj"; - sha256.x86_64-linux = "1q4l8pymjvsvxfwaw0rdcnhryh1la2bvg5f4d4my41ka390k4p4s"; - sha256.armv7l-linux = "06aljl7dqmmhmp7xswgvkcgh9mam71wnqydg9yb3hkcc443cm581"; - sha256.aarch64-linux = "12v9ndv7a2c9zqq6ai2vsgwad0lzmf4c6jxy4p9miapmhjzx5vii"; - releaseToken = "42970487e3af4f5aa5bca3f542482c60"; + patchVersion = "212"; + buildVersion = "10"; + sha256.i686-linux = "03dj9q0bi3ib731f4zl9hylkrgw417h6qlg2wi7nw71b0fqhijn1"; + sha256.x86_64-linux = "1yzddxzfh6h14bpzis1abp52x4jjljg8a3zyqz483q6qm05caq1i"; + sha256.armv7l-linux = "0x333alkqdx8mmiirair7g5iiwif5v9ka4j3qr0f42ilvmk8csnx"; + sha256.aarch64-linux = "0vcbdvcsl8rm47i07s93jmrrs5laibf937d8vacjqqgh9bbhsr2c"; + releaseToken = "59066701cf1a433da9770636fbc4c9aa"; jceName = "jce_policy-8.zip"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; } diff --git a/nixpkgs/pkgs/development/compilers/osl/default.nix b/nixpkgs/pkgs/development/compilers/osl/default.nix index ddfd5d0a3fdf..a498eafd4254 100644 --- a/nixpkgs/pkgs/development/compilers/osl/default.nix +++ b/nixpkgs/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.10.2"; + version = "1.10.4"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.10.2"; - sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7"; + rev = "Release-1.10.4"; + sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; diff --git a/nixpkgs/pkgs/development/compilers/pforth/default.nix b/nixpkgs/pkgs/development/compilers/pforth/default.nix new file mode 100644 index 000000000000..7885582ad125 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/pforth/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "28"; + pname = "pforth"; + src = fetchFromGitHub { + owner = "philburk"; + repo = "pforth"; + rev = "9190005e32c6151b76ac707b30eeb4d5d9dd1d36"; + sha256 = "0k3pmcgybsnwrxy75piyb2420r8d4ij190606js32j99062glr3x"; + }; + + makeFlags = [ "SRCDIR=." ]; + makefile = "build/unix/Makefile"; + + installPhase = '' + install -Dm755 pforth_standalone $out/bin/pforth + ''; + + + meta = { + description = "Portable ANSI style Forth written in ANSI C"; + homepage = http://www.softsynth.com/pforth/; + license = stdenv.lib.licenses.publicDomain; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ yrashk ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix index 0bfb8de0061b..67818bfa1dc9 100644 --- a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -17,20 +17,20 @@ let ''; in stdenv.mkDerivation rec { - name = "purs-simple"; - version = "v0.12.4"; + pname = "purescript"; + version = "0.12.5"; src = if stdenv.isDarwin then fetchurl { - url = "https://github.com/purescript/purescript/releases/download/v0.12.4/macos.tar.gz"; - sha256 = "046b18plakwvqr77x1hybhfiyzrhnnq0q5ixcmypri1mkkdsmczx"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; + sha256 = "15j9lkrl15dicx37bmh0199b3qdixig7w24wvdzi20jqbacz8nkn"; } else fetchurl { - url = "https://github.com/purescript/purescript/releases/download/v0.12.4/linux64.tar.gz"; - sha256 = "18yny533sjfgacxqx1ki306nhznj4q6nv52c83l82gqj8amyj7k0"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; + sha256 = "07dva5gxq77g787krscv4dsz5088fzkvpmm9fwxw9a59jszzs7kq"; }; diff --git a/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix index ee662d39e451..056ad7454600 100644 --- a/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix @@ -3,9 +3,9 @@ let options = rec { x86_64-darwin = rec { - version = "1.1.8"; + version = "1.2.11"; system = "x86-64-darwin"; - sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j"; + sha256 = "0lh4gpvi8hl6g6b9321g5pwh8sk3218i7h4lx7p3vd9z0cf3lz85"; }; x86_64-linux = rec { version = "1.3.16"; diff --git a/nixpkgs/pkgs/development/compilers/sbcl/default.nix b/nixpkgs/pkgs/development/compilers/sbcl/default.nix index bca506169889..469d7847409f 100644 --- a/nixpkgs/pkgs/development/compilers/sbcl/default.nix +++ b/nixpkgs/pkgs/development/compilers/sbcl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1a4c84b6qqi4w4l1zzhnhnywk73j3wb0gjgghzcw0h5syqbqzy8z"; + sha256 = "08z62qba0kmm15k93s2rq7ipi769895g8iwigcp20qjh6amwnwph"; }; buildInputs = [texinfo]; diff --git a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix index 1aea771e4996..97b4a627540c 100644 --- a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix +++ b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchurl, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib +{ stdenv, fetchgit, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib , libXinerama, libarchive, db, pcre, libedit, libossp_uuid, libXft, libXpm , libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin +, git, cacert, cmake, libyaml +, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ] +, extraPacks ? [] }: let - version = "7.6.4"; + version = "8.1.4"; + packInstall = swiplPath: pack: + ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." + ''; in stdenv.mkDerivation { name = "swi-prolog-${version}"; - src = fetchurl { - url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"; - sha256 = "14bq4sqs61maqpnmgy6687jjj0shwc27cpfsqbf056nrssmplg9d"; + src = fetchgit { + url = "https://github.com/SWI-Prolog/swipl-devel"; + rev = "V${version}"; + sha256 = "0qxa6f5dypwczxajlf0l736adbjb17cbak3qsh5g04hpv2bxm6dh"; }; - buildInputs = [ jdk gmp readline openssl libjpeg unixODBC libXinerama - libarchive db pcre libedit libossp_uuid libXft libXpm libSM libXt - zlib freetype pkgconfig fontconfig ] + buildInputs = [ cacert git cmake gmp readline openssl + libarchive libyaml db pcre libedit libossp_uuid + zlib pkgconfig ] + ++ extraLibraries ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; hardeningDisable = [ "format" ]; @@ -27,7 +35,20 @@ stdenv.mkDerivation { "--enable-shared" ]; - buildFlags = "world"; + installPhase = '' + mkdir -p $out + mkdir build + cd build + ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out .. + cd ../ + make + make install + make clean + mkdir -p $out/lib/swipl/pack + '' + + builtins.concatStringsSep "\n" + ( builtins.map (packInstall "$out") extraPacks + ); # For macOS: still not fixed in upstream: "abort trap 6" when called # through symlink, so wrap binary. diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index ff309da41d2d..db7aa06d6de4 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -142,6 +142,7 @@ self: super: { feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; + classy-prelude-yesod = dontHaddock super.classy-prelude-yesod; # https://github.com/haskell/haddock/issues/979 # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; @@ -871,38 +872,17 @@ self: super: { # https://github.com/takano-akio/filelock/issues/5 filelock = dontCheck super.filelock; - # fix GHC 8.6 builds by using irrefutable patterns. jailbreak is also - # required due to a constraint failure for base-compat. - cryptol = doJailbreak (overrideCabal super.cryptol (drv: { - - # the last patch fixes ghc 8.6 builds; the other two (small) patches fix a - # few bugs between them, but are also hard dependencies - patches = drv.patches or [] ++ [ - (pkgs.fetchpatch { - url = https://github.com/GaloisInc/cryptol/commit/634c5a03e757663bf86d1ffad1ce2c6086d4483f.patch; - sha256 = "16dvfihsl2c4jnyfndgrjarkm3z5pyn7rzg2svnidx0qipwrxzm7"; - }) - (pkgs.fetchpatch { - url = https://github.com/GaloisInc/cryptol/commit/515642328aff6d958ff1b534b9effdd726901b60.patch; - sha256 = "1fml71b720igyh8s7mj1z1c2bbv1vk490iy7blvxp625nymzjij6"; - }) - (pkgs.fetchpatch { - url = https://github.com/GaloisInc/cryptol/commit/a8eab11b319f6434f9b01b26d419b8305ff30bc2.patch; - sha256 = "1bbznp3kbj8l83q979gf4gr2khwbyqi85ykwsf2jnkhzda6pr0n8"; - }) - ]; - + # Wrap the generated binaries to include their run-time dependencies in + # $PATH. Also, cryptol needs a version of sbl that's newer than what we have + # in LTS-13.x. + cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_2; }) (drv: { buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ]; - - # make sure the binaries always start up. previously this was in - # all-packages.nix but it's almost certainly better to do it here (e.g. a - # haskell deps may use cryptol in the test suite or something, etc) postInstall = drv.postInstall or "" + '' for b in $out/bin/cryptol $out/bin/cryptol-html; do wrapProgram $b --prefix 'PATH' ':' "${pkgs.lib.getBin pkgs.z3}/bin" done ''; - })); + }); # Tests try to invoke external process and process == 1.4 grakn = dontCheck (doJailbreak super.grakn); @@ -1223,15 +1203,10 @@ self: super: { sha256 = "1qwy8bj6vywhp0075dza8j90zrzsm3144qz3c703s9c4n6pg3gw4"; }); - # These patches contain fixes for 8.6 that should be safe for - # earlier versions, but we need the relaxed version bounds in GHC - # 8.4 builds. beam needs to release a round of updates that relax - # bounds and include the 8.6 fixes: - # https://github.com/tathougies/beam/issues/315 - beam-core = appendPatch super.beam-core ./patches/beam-core-fix-ghc-8.6.x-build.patch; - beam-migrate = appendPatch super.beam-migrate ./patches/beam-migrate-fix-ghc-8.6.x-build.patch; - beam-postgres = appendPatch super.beam-postgres ./patches/beam-postgres-fix-ghc-8.6.x-build.patch; - beam-sqlite = appendPatch super.beam-sqlite ./patches/beam-sqlite-fix-ghc-8.6.x-build.patch; + # Requires pg_ctl command during tests + beam-postgres = overrideCabal super.beam-postgres (drv: { + testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql]; + }); # https://github.com/sighingnow/computations/pull/1 primesieve = appendPatch super.primesieve (pkgs.fetchpatch { @@ -1259,7 +1234,7 @@ self: super: { # Use latest pandoc despite what LTS says. # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. pandoc = doDistribute super.pandoc_2_7_2; - pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_1_3; + pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; # https://github.com/qfpl/tasty-hedgehog/issues/24 tasty-hedgehog = dontCheck super.tasty-hedgehog; @@ -1282,4 +1257,14 @@ self: super: { # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65) yesod-markdown = doJailbreak super.yesod-markdown; + # These packages needs network 3.x, which is not in LTS-13.x. + network-bsd = super.network-bsd.override { network = self.network_3_0_1_1; }; + lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; }); + lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; }); + lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; socks = self.socks_0_6_0; connection = self.connection_0_3_0; haskell-src-exts = self.haskell-src-exts_1_21_0; }); + + # Some tests depend on a postgresql instance + # Haddock failure: https://github.com/haskell/haddock/issues/979 + esqueleto = dontHaddock (dontCheck super.esqueleto); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index b5fe837cec57..8d0582a8d067 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -4,8 +4,8 @@ with haskellLib; self: super: { - # This compiler version needs llvm 5.x. - llvmPackages = pkgs.llvmPackages_5; + # This compiler version needs llvm 6.x. + llvmPackages = pkgs.llvmPackages_6; # Disable GHC 8.6.x core libraries. array = null; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix new file mode 100644 index 000000000000..8693b235211d --- /dev/null +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -0,0 +1,137 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: { + + # This compiler version needs llvm 7.x. + llvmPackages = pkgs.llvmPackages_7; + + # Disable GHC 8.8.x core libraries. + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-heap = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hpc = null; + integer-gmp = null; + libiserv = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + stm = null; + template-haskell = null; + terminfo = null; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + + # Use our native version of the Cabal library. + cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; }); + + # Ignore overly restrictive upper version bounds. + cryptohash-sha256 = doJailbreak super.cryptohash-sha256; + doctest = doJailbreak super.doctest; + split = doJailbreak super.split; + test-framework = doJailbreak super.test-framework; + hashable = doJailbreak super.hashable; + async = doJailbreak super.async; + + # These packages don't work and need patching and/or an update. + primitive = overrideSrc (doJailbreak super.primitive) { + version = "20180530-git"; + src = pkgs.fetchFromGitHub { + owner = "haskell"; + repo = "primitive"; + rev = "97964182881aa0419546e0bb188b2d17e4468324"; + sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q"; + }; + }; + tar = overrideCabal (appendPatch super.tar (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.patch"; + sha256 = "1inbfpamfdpi3yfac59j5xpaq5fvh5g1ca8hlbpic1bizd3s03i0"; + })) (drv: { + configureFlags = ["-f-old-time"]; + editedCabalFile = null; + preConfigure = '' + cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.cabal"; sha256 = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";}} tar.cabal + sed -i -e 's/time < 1.9/time < 2/' tar.cabal + ''; + }); + resolv = overrideCabal (overrideSrc super.resolv { + version = "20180411-git"; + src = pkgs.fetchFromGitHub { + owner = "haskell-hvr"; + repo = "resolv"; + rev = "a22f9dd900cb276b3dd70f4781fb436d617e2186"; + sha256 = "1j2jyywmxjhyk46kxff625yvg5y37knv7q6y0qkwiqdwdsppccdk"; + }; + }) (drv: { + buildTools = with pkgs; [autoconf]; + preConfigure = "autoreconf --install"; + }); + colour = appendPatch super.colour (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/colour-2.3.4.patch"; + sha256 = "1h318dczml9qrmfvlz1d12iji86klaxvz63k9g9awibwz8lw2i79"; + }); + dlist = appendPatch super.dlist (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch"; + sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc"; + }); + QuickCheck = appendPatch super.QuickCheck (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/QuickCheck-2.13.1.patch"; + sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcvbl"; + }); + regex-base = appendPatch super.regex-base (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch"; + sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1"; + }); + regex-posix = appendPatch super.regex-posix (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch"; + sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2"; + }); + exceptions = appendPatch (doJailbreak super.exceptions) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/exceptions-0.10.1.patch"; + sha256 = "0427jg027dcckiy21zk29c49fzx4q866rqbabmh4wvqwwkz8yk37"; + }); + th-abstraction = appendPatch (doJailbreak super.th-abstraction) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/th-abstraction-0.2.11.0.patch"; + sha256 = "0czqfszfblz6bvsybcd1z5jijj79f9czqq6dn992wp2gibsbrgj3"; + }); + logict = appendPatch (doJailbreak super.logict) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/logict-0.6.0.2.patch"; + sha256 = "0my2n0r9pb35994q0xka96fv5jdpjdfwqppi5lily3rgzkajsixn"; + }); + zlib = appendPatch super.zlib (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/zlib-0.6.2.patch"; + sha256 = "13fy730z9ihyc9kw3qkh642mi0bdbd7bz01dksj1zz845pr9jjif"; + }); + optparse-applicative = appendPatch super.optparse-applicative (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch"; + sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y"; + }); + HTTP = appendPatch (doJailbreak super.HTTP) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/HTTP-4000.3.13.patch"; + sha256 = "1fadi529x7dnmbfmls5969qfn9d4z954nc4lbqxmrwgirphkpmn4"; + }); + hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; + sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; + }); + +} diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ad444e56b56a..ee67a5f1d248 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.6.4 +compiler: ghc-8.6.5 core-packages: - array-0.5.3.0 @@ -12,13 +12,13 @@ core-packages: - deepseq-1.4.4.0 - directory-1.3.3.0 - filepath-1.4.2.1 - - ghc-8.6.4 - - ghc-boot-8.6.4 - - ghc-boot-th-8.6.4 + - ghc-8.6.5 + - ghc-boot-8.6.5 + - ghc-boot-th-8.6.5 - ghc-compact-0.1.0.0 - - ghc-heap-8.6.4 + - ghc-heap-8.6.5 - ghc-prim-0.5.3 - - ghci-8.6.4 + - ghci-8.6.5 - haskeline-0.7.4.3 - hpc-0.6.0.3 - integer-gmp-1.0.2.0 @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.17 + # LTS Haskell 13.19 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -179,7 +179,7 @@ default-package-overrides: - amazonka-waf ==1.6.1 - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - - amqp ==0.18.1 + - amqp ==0.18.2 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.8.2 - ansi-wl-pprint ==0.6.8.2 @@ -239,7 +239,7 @@ default-package-overrides: - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 - - avro ==0.4.4.1 + - avro ==0.4.4.2 - avwx ==0.3.0.2 - axel ==0.0.9 - backprop ==0.2.6.2 @@ -269,7 +269,7 @@ default-package-overrides: - bencode ==0.6.0.0 - between ==0.11.0.0 - bibtex ==0.1.0.6 - - bifunctors ==5.5.3 + - bifunctors ==5.5.4 - bimap ==0.3.3 - bimap-server ==0.1.0.1 - binary-bits ==0.5 @@ -316,7 +316,7 @@ default-package-overrides: - boolean-normal-forms ==0.0.1 - boolsimplifier ==0.1.8 - bordacount ==0.1.0.0 - - boring ==0.1 + - boring ==0.1.1 - both ==0.1.1.0 - bound ==2.0.1 - BoundedChan ==1.0.3.0 @@ -382,6 +382,8 @@ default-package-overrides: - ChannelT ==0.0.0.7 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.4 + - Chart ==1.9.1 + - Chart-diagrams ==1.9.2 - chaselev-deque ==0.5.0.5 - cheapskate ==0.1.1.1 - cheapskate-highlight ==0.1.0.0 @@ -561,7 +563,7 @@ default-package-overrides: - DAV ==1.3.3 - dbcleaner ==0.1.3 - DBFunctor ==0.1.1.1 - - dbus ==1.2.5 + - dbus ==1.2.6 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 @@ -577,7 +579,7 @@ default-package-overrides: - dependent-sum-template ==0.0.0.6 - deque ==0.2.7 - deriveJsonNoPrefix ==0.1.0.1 - - deriving-compat ==0.5.4 + - deriving-compat ==0.5.5 - derulo ==1.0.5 - detour-via-sci ==1.0.0 - dhall ==1.19.1 @@ -588,6 +590,7 @@ default-package-overrides: - diagrams-contrib ==1.4.3 - diagrams-core ==1.4.1.1 - diagrams-lib ==1.4.2.3 + - diagrams-postscript ==1.4.1 - diagrams-rasterific ==1.4.1.1 - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.2 @@ -648,7 +651,7 @@ default-package-overrides: - ekg-statsd ==0.2.4.0 - elerea ==2.9.0 - elf ==0.29 - - eliminators ==0.5 + - eliminators ==0.5.1 - elm2nix ==0.1.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 @@ -695,7 +698,7 @@ default-package-overrides: - explicit-exception ==0.1.9.2 - exp-pairs ==0.2.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.14 + - extra ==1.6.15 - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - fail ==4.9.0.0 @@ -722,7 +725,7 @@ default-package-overrides: - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 - - fin ==0.0.1 + - fin ==0.0.2 - FindBin ==0.0.5 - fingertree ==0.1.4.2 - finite-typelits ==0.1.4.2 @@ -785,7 +788,7 @@ default-package-overrides: - general-games ==1.1.1 - generic-arbitrary ==0.1.0 - generic-data ==0.3.0.0 - - generic-deriving ==1.12.3 + - generic-deriving ==1.12.4 - generic-lens ==1.1.0.0 - GenericPretty ==1.2.2 - generic-random ==1.2.0.0 @@ -815,7 +818,7 @@ default-package-overrides: - getopt-generics ==0.13.0.3 - ghc-core ==0.5.6 - ghc-exactprint ==0.5.8.2 - - ghcid ==0.7.2 + - ghcid ==0.7.4 - ghci-hexcalc ==0.1.0.2 - ghcjs-codemirror ==0.0.0.2 - ghc-paths ==0.1.0.9 @@ -893,7 +896,7 @@ default-package-overrides: - HandsomeSoup ==0.4.2 - hapistrano ==0.3.9.2 - happy ==1.19.9 - - hasbolt ==0.1.3.2 + - hasbolt ==0.1.3.3 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 @@ -915,9 +918,9 @@ default-package-overrides: - haskell-src-meta ==0.8.2 - haskey-btree ==0.3.0.0 - haskoin-core ==0.8.4 - - hasql ==1.3.0.3 + - hasql ==1.3.0.5 - hasql-optparse-applicative ==0.3.0.3 - - hasql-pool ==0.5.0.1 + - hasql-pool ==0.5.0.2 - hasql-transaction ==0.7.1 - hasty-hamiltonian ==1.3.2 - haxl ==2.0.1.1 @@ -960,7 +963,7 @@ default-package-overrides: - hmatrix-gsl ==0.19.0.1 - hmatrix-gsl-stats ==0.4.1.7 - hmatrix-morpheus ==0.1.1.2 - - hmatrix-vector-sized ==0.1.1.2 + - hmatrix-vector-sized ==0.1.1.3 - hmpfr ==0.4.4 - hoauth2 ==1.8.4 - Hoed ==0.5.1 @@ -1043,6 +1046,7 @@ default-package-overrides: - http-common ==0.8.2.0 - http-conduit ==2.3.7 - http-date ==0.0.8 + - http-directory ==0.1.1 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 - http-media ==0.7.1.3 @@ -1116,7 +1120,7 @@ default-package-overrides: - insert-ordered-containers ==0.2.1.0 - inspection-testing ==0.4.1.2 - instance-control ==0.1.2.0 - - integer-logarithms ==1.0.2.2 + - integer-logarithms ==1.0.3 - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 @@ -1126,7 +1130,7 @@ default-package-overrides: - IntervalMap ==0.6.1.1 - intervals ==0.8.1 - intset-imperative ==0.1.0.0 - - invariant ==0.5.1 + - invariant ==0.5.2 - invertible ==0.2.0.5 - io-choice ==0.0.7 - io-machine ==0.2.0.0 @@ -1196,7 +1200,7 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - language-puppet ==1.4.3 + - language-puppet ==1.4.4 - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.2 - largeword ==1.2.5 @@ -1208,7 +1212,7 @@ default-package-overrides: - leancheck ==0.8.0 - leancheck-instances ==0.0.3 - leapseconds-announced ==2017.1.0.1 - - lens ==4.17 + - lens ==4.17.1 - lens-action ==0.2.3 - lens-aeson ==1.0.2 - lens-datetime ==0.3 @@ -1260,7 +1264,7 @@ default-package-overrides: - long-double ==0.1 - loop ==0.3.0 - lrucaching ==0.3.3 - - lsp-test ==0.5.1.0 + - lsp-test ==0.5.1.2 - lucid ==2.9.11 - lucid-extras ==0.1.0.1 - lxd-client-config ==0.1.0.1 @@ -1410,7 +1414,7 @@ default-package-overrides: - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.10 - - network ==2.8.0.0 + - network ==2.8.0.1 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 @@ -1422,7 +1426,7 @@ default-package-overrides: - network-messagepack-rpc ==0.1.1.0 - network-multicast ==0.2.0 - network-simple ==0.4.3 - - network-simple-tls ==0.3.1 + - network-simple-tls ==0.3.2 - network-transport ==0.5.2 - network-transport-composed ==0.2.1 - network-uri ==2.6.1.0 @@ -1481,7 +1485,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.14.3.0 - optparse-generic ==1.3.0 - - optparse-simple ==0.1.1.1 + - optparse-simple ==0.1.1.2 - optparse-text ==0.1.1.0 - overhang ==1.0.0 - packcheck ==0.4.1 @@ -1526,7 +1530,7 @@ default-package-overrides: - pem ==0.2.4 - percent-format ==0.0.1 - perfect-hash-generator ==0.2.0.6 - - persist ==0.1.1.2 + - persist ==0.1.1.3 - persistable-record ==0.6.0.4 - persistable-types-HDBC-pg ==0.0.3.5 - persistent ==2.9.2 @@ -1570,13 +1574,13 @@ default-package-overrides: - polynomials-bernstein ==1.1.2 - polyparse ==1.12.1 - pooled-io ==0.0.2.2 - - port-utils ==0.2.0.0 + - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 - postgresql-binary ==0.12.1.2 - postgresql-libpq ==0.9.4.2 - postgresql-schema ==0.1.14 - - postgresql-simple ==0.6.1 + - postgresql-simple ==0.6.2 - postgresql-simple-migration ==0.1.14.0 - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 @@ -1621,7 +1625,7 @@ default-package-overrides: - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.0.1.0 - proto-lens ==0.4.0.1 - - proto-lens-arbitrary ==0.1.2.6 + - proto-lens-arbitrary ==0.1.2.7 - proto-lens-combinators ==0.4.0.1 - proto-lens-optparse ==0.1.1.5 - proto-lens-protobuf-types ==0.4.0.1 @@ -1646,6 +1650,7 @@ default-package-overrides: - QuickCheck ==2.12.6.1 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 + - quickcheck-classes ==0.6.0.0 - quickcheck-instances ==0.3.19 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.0.4 @@ -1683,7 +1688,7 @@ default-package-overrides: - rebase ==1.3.1 - record-dot-preprocessor ==0.1.5 - records-sop ==0.1.0.2 - - recursion-schemes ==5.1.2 + - recursion-schemes ==5.1.3 - reducers ==3.12.3 - refact ==0.3.0.2 - references ==0.3.3.1 @@ -1702,7 +1707,7 @@ default-package-overrides: - regex-tdfa ==1.2.3.1 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.3.4 + - registry ==0.1.3.5 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.1.0 @@ -1821,7 +1826,7 @@ default-package-overrides: - servant-tracing ==0.1.0.2 - servant-websockets ==1.1.0 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.8.6 + - serverless-haskell ==0.8.7 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - servius ==1.2.3.0 @@ -1917,7 +1922,7 @@ default-package-overrides: - storable-record ==0.0.4 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - - store ==0.5.0.1 + - store ==0.5.1.0 - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.29.1 @@ -2048,13 +2053,13 @@ default-package-overrides: - threads ==0.5.1.6 - threepenny-gui ==0.8.3.0 - th-reify-compat ==0.0.1.5 - - th-reify-many ==0.1.8 + - th-reify-many ==0.1.9 - throttle-io-stream ==0.2.0.1 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - th-utilities ==0.2.1.0 - thyme ==0.3.5.5 - - tidal ==1.0.10 + - tidal ==1.0.13 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2062,7 +2067,7 @@ default-package-overrides: - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - - time-parsers ==0.1.2.0 + - time-parsers ==0.1.2.1 - time-qq ==0.0.1.0 - timerep ==2.0.0.2 - timer-wheel ==0.1.0 @@ -2076,7 +2081,7 @@ default-package-overrides: - tls-session-manager ==0.0.0.2 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - - tmp-postgres ==0.1.1.1 + - tmp-postgres ==0.1.2.2 - token-bucket ==0.1.0.1 - tomland ==0.5.0 - tostring ==0.2.1.1 @@ -2097,7 +2102,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.13 + - turtle ==1.5.14 - typed-process ==0.2.4.0 - type-fun ==0.1.1 - type-hint ==0.1 @@ -2176,7 +2181,7 @@ default-package-overrides: - validity-vector ==0.2.0.2 - valor ==0.1.0.0 - vault ==0.3.1.2 - - vec ==0.1 + - vec ==0.1.1 - vector ==0.12.0.2 - vector-algorithms ==0.8.0.1 - vector-binary-instances ==0.2.5.1 @@ -2190,7 +2195,7 @@ default-package-overrides: - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - verbosity ==0.2.3.0 - - versions ==3.5.0 + - versions ==3.5.1 - ViennaRNAParser ==1.3.3 - vinyl ==0.10.0.1 - vivid ==0.4.2.3 @@ -2219,9 +2224,9 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - - warp ==3.2.26 - - warp-tls ==3.2.4.3 - - warp-tls-uid ==0.2.0.5 + - warp ==3.2.27 + - warp-tls ==3.2.5 + - warp-tls-uid ==0.2.0.6 - wave ==0.1.5 - wcwidth ==0.0.2 - web3 ==0.8.3.1 @@ -2237,7 +2242,7 @@ default-package-overrides: - websockets-snap ==0.10.3.0 - weigh ==0.0.14 - wide-word ==0.1.0.8 - - wikicfp-scraper ==0.1.0.10 + - wikicfp-scraper ==0.1.0.11 - wild-bind ==0.1.2.3 - wild-bind-x11 ==0.2.0.6 - Win32-notify ==0.3.0.3 @@ -2305,7 +2310,7 @@ default-package-overrides: - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - yesod-auth ==1.6.6 - - yesod-auth-hashdb ==1.7.1 + - yesod-auth-hashdb ==1.7.1.1 - yesod-auth-oauth2 ==0.6.1.1 - yesod-bin ==1.6.0.3 - yesod-core ==1.6.14 @@ -2318,8 +2323,8 @@ default-package-overrides: - yesod-gitrev ==0.2.1 - yesod-markdown ==0.12.6.1 - yesod-newsfeed ==1.6.1.0 - - yesod-paginator ==1.1.0.1 - - yesod-persistent ==1.6.0.1 + - yesod-paginator ==1.1.0.2 + - yesod-persistent ==1.6.0.2 - yesod-recaptcha2 ==0.3.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 @@ -2337,7 +2342,7 @@ default-package-overrides: - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - zip ==1.2.0 - - zip-archive ==0.4 + - zip-archive ==0.4.1 - zippers ==0.2.5 - zip-stream ==0.2.0.1 - zlib ==0.6.2 @@ -2387,13 +2392,15 @@ extra-packages: - 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 + - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 + - patience ^>= 0.1 # required by chell-0.4.x - persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227 - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - proto-lens == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - - proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x + - proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - QuickCheck < 2 # required by test-framework-quickcheck and its users - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x @@ -2409,7 +2416,6 @@ extra-packages: - yesod-persistent < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 - yesod-static ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 - yesod-test ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 - - patience ^>= 0.1 # required by chell-0.4.x package-maintainers: peti: @@ -2595,7 +2601,7 @@ dont-distribute-packages: - XML broken-packages: - # these packages don't compile + # These packages don't compile or depend on packages that don't compile. - 3dmodels - 4Blocks - a50 @@ -3008,12 +3014,7 @@ broken-packages: - bdcs - bdcs-api - beam - - beam-core - - beam-migrate - - beam-mysql - beam-newtype-field - - beam-postgres - - beam-sqlite - beam-th - beamable - beautifHOL @@ -3169,6 +3170,7 @@ broken-packages: - blockhash - Blogdown - blogination + - BlogLiterately-diagrams - bloodhound - bloodhound-amazonka-auth - bloomfilter-redis @@ -3224,6 +3226,9 @@ broken-packages: - brok - broker-haskell - bronyradiogermany-streaming + - brotli + - brotli-conduit + - brotli-streams - browscap - bson-generic - bson-generics @@ -3274,6 +3279,7 @@ broken-packages: - c2hsc - cabal-audit - cabal-bundle-clib + - cabal-cache - cabal-cargs - cabal-constraints - cabal-db @@ -3489,7 +3495,6 @@ broken-packages: - ClassLaws - classy-miso - classy-parallel - - classy-prelude-yesod - ClassyPrelude - clay - clckwrks @@ -4016,9 +4021,11 @@ broken-packages: - dia-base - dia-functions - diagrams-boolean + - diagrams-builder - diagrams-canvas - diagrams-graphviz - diagrams-gtk + - diagrams-haddock - diagrams-hsqml - diagrams-html5 - diagrams-pandoc @@ -4315,7 +4322,6 @@ broken-packages: - esotericbot - EsounD - espial - - esqueleto - ess - estimators - EstProgress @@ -4596,6 +4602,7 @@ broken-packages: - frag - Frames-beam - Frames-dsv + - Frames-map-reduce - franchise - Frank - freddy @@ -4727,6 +4734,7 @@ broken-packages: - generic-tree - generic-xml - generic-xmlpickler + - generics-eot - genericserialize - genesis - genesis-test @@ -5228,6 +5236,7 @@ broken-packages: - haskell-src-exts-prisms - haskell-src-exts-qq - haskell-src-exts-sc + - haskell-src-exts-simple - haskell-src-meta-mwotton - haskell-stack-trace-plugin - haskell-token-utils @@ -5563,6 +5572,7 @@ broken-packages: - HLearn-datastructures - HLearn-distributions - hledger-chart + - hledger-flow - hledger-irr - hledger-vty - hlibBladeRF @@ -5602,7 +5612,6 @@ broken-packages: - Hmpf - hmt-diagrams - hmumps - - hnix - HNM - hnormalise - ho-rewriting @@ -5713,6 +5722,7 @@ broken-packages: - HROOT-math - HROOT-tree - hs-blake2 + - hs-brotli - hs-carbon-examples - hs-cdb - hs-conllu @@ -6052,6 +6062,7 @@ broken-packages: - ihaskell-diagrams - ihaskell-display - ihaskell-gnuplot + - ihaskell-graphviz - ihaskell-hatex - ihaskell-hvega - ihaskell-inline-r @@ -6357,6 +6368,7 @@ broken-packages: - kmp-dfa - knead - knead-arithmetic + - knit-haskell - knots - koellner-phonetic - korfu @@ -6523,6 +6535,7 @@ broken-packages: - libconfig - libcspm - libexpect + - libffi-dynamic - libGenI - libhbb - libinfluxdb @@ -6763,6 +6776,7 @@ broken-packages: - manifolds - manifolds-core - map-exts + - map-reduce-folds - map-syntax - Mapping - mappy @@ -6888,6 +6902,7 @@ broken-packages: - minesweeper - miniforth - minilens + - minilight - minimung - minio-hs - minions @@ -6895,6 +6910,7 @@ broken-packages: - miniplex - minirotate - ministg + - minitypeset-opengl - minst-idx - mios - mirror-tweet @@ -7153,6 +7169,8 @@ broken-packages: - NestedFunctor - nestedmap - net-spider + - net-spider-pangraph + - net-spider-rpl - netclock - netcore - netease-fm @@ -7168,7 +7186,6 @@ broken-packages: - netwire-vinylglfw-examples - network-address - network-anonymous-i2p - - network-bsd - network-builder - network-bytestring - network-connection @@ -7184,6 +7201,7 @@ broken-packages: - network-server - network-service - network-simple-sockaddr + - network-simple-wss - network-stream - network-topic-models - network-transport-amqp @@ -7200,6 +7218,7 @@ broken-packages: - neural-network-hmatrix - newhope - newports + - newsletter-mailgun - newt - newtype-deriving - newtype-th @@ -7577,6 +7596,7 @@ broken-packages: - pipes-async - pipes-attoparsec-streaming - pipes-bgzf + - pipes-brotli - pipes-cacophony - pipes-cereal - pipes-cereal-plus @@ -7654,6 +7674,7 @@ broken-packages: - polh-lexicon - polimorf - Pollutocracy + - poly - poly-control - polydata - polydata-core @@ -7790,6 +7811,7 @@ broken-packages: - proteome - proto-lens-combinators - proto-lens-descriptors + - proto3-suite - protobuf-native - protocol-buffers-descriptor-fork - protocol-buffers-fork @@ -7826,6 +7848,7 @@ broken-packages: - purescript-iso - purescript-tsd-gen - push-notify + - push-notify-apn - push-notify-ccs - push-notify-general - pusher-haskell @@ -7954,6 +7977,7 @@ broken-packages: - rascal - Rasenschach - rating-chgk-info + - rattle - rattletrap - raven-haskell-scotty - raw-feldspar @@ -8020,6 +8044,7 @@ broken-packages: - reflex-backend-wai - reflex-basic-host - reflex-dom-core + - reflex-dom-svg - reflex-gloss - reflex-gloss-scene - reflex-orphans @@ -8223,6 +8248,7 @@ broken-packages: - safe-failure-cme - safe-freeze - safe-globals + - safe-json - safe-lazy-io - safe-length - safe-money @@ -8286,6 +8312,7 @@ broken-packages: - scenegraph - schedevr - schedule-planner + - scheduler - schedyield - schematic - scholdoc @@ -8478,6 +8505,8 @@ broken-packages: - shellish - shellmate - shellmate-extras + - shh + - shh-extras - shivers-cfg - shoap - shopify @@ -8526,6 +8555,7 @@ broken-packages: - simple-tar - simple-templates - simple-ui + - simple-units - simple-vec3 - simple-zipper - simpleargs @@ -8853,10 +8883,12 @@ broken-packages: - streamdeck - streamed - streaming-benchmarks + - streaming-brotli - streaming-cassava - streaming-concurrency - streaming-conduit - streaming-fft + - streaming-lzma - streaming-osm - streaming-pcap - streaming-png @@ -9017,6 +9049,7 @@ broken-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens + - tasty-quickcheck-laws - tasty-stats - tasty-tap - tasty-travis @@ -9197,6 +9230,7 @@ broken-packages: - tkhs - tkyprof - tls-extra + - tmp-postgres - tn - to-haskell - to-string-class @@ -9405,6 +9439,7 @@ broken-packages: - unity-testresult-parser - unitym-yesod - universe + - universe-dependent-sum - universe-instances-extended - universe-th - universum @@ -9516,6 +9551,7 @@ broken-packages: - vector-bytestring - vector-clock - vector-conduit + - vector-endian - vector-extras - vector-functorlazy - vector-heterogenous @@ -9834,6 +9870,7 @@ broken-packages: - yam - yam-datasource - yam-job + - yam-redis - yam-servant - yam-transaction-odbc - yam-web @@ -9903,9 +9940,9 @@ broken-packages: - yesod-links - yesod-lucid - yesod-mangopay - - yesod-markdown - yesod-paginate - yesod-pagination + - yesod-paginator - yesod-paypal-rest - yesod-platform - yesod-pnotify diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index ce4b3b2d7074..8a418be8b769 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -942,15 +942,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Allure_0_9_3_3" = callPackage + "Allure_0_9_5_0" = callPackage ({ mkDerivation, async, base, enummapset, filepath, ghc-compact , LambdaHack, optparse-applicative, primitive, random , template-haskell, text, transformers }: mkDerivation { pname = "Allure"; - version = "0.9.3.3"; - sha256 = "0s2f8fmcbcyvqg9vx492irr69ihkrwwf6nhp511b4y5xcgw69k12"; + version = "0.9.5.0"; + sha256 = "0cl1r3rcbkj8q290l3q5xva7lkh444s49xz8bm8sbgrk0q3zx041"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -2009,6 +2009,8 @@ self: { executableHaskellDepends = [ base BlogLiterately ]; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Blogdown" = callPackage @@ -6213,6 +6215,27 @@ self: { broken = true; }) {}; + "Frames-map-reduce" = callPackage + ({ mkDerivation, base, containers, foldl, Frames, hashable + , map-reduce-folds, newtype, profunctors, random, text, vinyl + }: + mkDerivation { + pname = "Frames-map-reduce"; + version = "0.1.0.0"; + sha256 = "05xk49qc5l8h7qnxhyxj9k2r2igcf7qc4njiw9w28fajlmnrgcw3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers foldl Frames hashable map-reduce-folds newtype + profunctors vinyl + ]; + executableHaskellDepends = [ base foldl Frames random text vinyl ]; + description = "Frames wrapper for map-reduce-folds and some extra folds helpers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "Frank" = callPackage ({ mkDerivation, base, mtl, newtype, she, void }: mkDerivation { @@ -9106,20 +9129,20 @@ self: { "HTab" = callPackage ({ mkDerivation, base, cmdargs, containers, deepseq, hylolib, mtl - , strict + , random, strict }: mkDerivation { pname = "HTab"; - version = "1.6.3"; - sha256 = "0c0igscng6gqhabmvvgappsbzbhkpybcx7vr8yd72pqh988ml4zv"; + version = "1.7.2"; + sha256 = "1xn2ljw97j625l5q7a9chqscdbi4cj29zg1yy4jz4mcivzwbjqii"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base cmdargs containers deepseq hylolib mtl strict + base cmdargs containers deepseq hylolib mtl random strict ]; description = "Tableau based theorem prover for hybrid logics"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -11789,7 +11812,7 @@ self: { broken = true; }) {}; - "LambdaHack_0_9_3_1" = callPackage + "LambdaHack_0_9_5_0" = callPackage ({ mkDerivation, assert-failure, async, base, base-compat, binary , bytestring, containers, deepseq, directory, enummapset, filepath , ghc-compact, ghc-prim, hashable, hsini, keys, miniutter @@ -11799,8 +11822,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.9.3.1"; - sha256 = "1s1xz5iz81wdwxc1bmgbpj2s19qlvz1d5q7c2l01cdzqwd2iwn3f"; + version = "0.9.5.0"; + sha256 = "1y5345cmwl40p0risziyqlxfa8jv1rm9x6ivv85xhznrsmr0406h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -12199,6 +12222,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_6_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.6.2"; + sha256 = "0m65x8yaq7q50gznln8mga2wrc8cvjx6gw9rim8s7xqcrx6y5zjh"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -13224,6 +13269,21 @@ self: { broken = true; }) {}; + "Monadoro" = callPackage + ({ mkDerivation, ansi-terminal, base, process, time }: + mkDerivation { + pname = "Monadoro"; + version = "0.1.2.0"; + sha256 = "1bqaiarr5gv42xl8fww67iryyh1mscwdkgcahdc988y19ag8a4j9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base process time ]; + executableHaskellDepends = [ ansi-terminal base process time ]; + testHaskellDepends = [ ansi-terminal base process time ]; + description = "A minimalistic CLI Pomodoro timer, based on a library of the same purpose"; + license = stdenv.lib.licenses.mit; + }) {}; + "Monaris" = callPackage ({ mkDerivation, array, base, containers, directory, free , free-game, mtl @@ -13622,6 +13682,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "NaperianNetCDF" = callPackage + ({ mkDerivation, base, hnetcdf, Naperian, split, vector }: + mkDerivation { + pname = "NaperianNetCDF"; + version = "0.1.0.1"; + sha256 = "0hyx9lg9hs124h9a666ym6cpnd3amdcl3v727shzc5v3hzwbvqgj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hnetcdf Naperian vector ]; + executableHaskellDepends = [ base hnetcdf Naperian split ]; + description = "Instances of NcStore for hypercuboids"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "NaturalLanguageAlphabets" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, cereal , containers, criterion, deepseq, file-embed, hashtables @@ -15827,8 +15901,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck }: mkDerivation { pname = "QuickCheck-safe"; - version = "0.1.0.5"; - sha256 = "0l8wp2np4mlbybzwcz8g4r9d8c65yljnvizs3g1rvig4b65j283l"; + version = "0.1.0.6"; + sha256 = "1f868s6iq66m4m305xrx3mfw46zvzaahkvz6xjlqzk0cragai1kp"; libraryHaskellDepends = [ base containers QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; license = stdenv.lib.licenses.mit; @@ -19617,25 +19691,26 @@ self: { }) {}; "Villefort" = callPackage - ({ mkDerivation, base, bytestring, concurrent-extra, convertible - , directory, filepath, HDBC, HDBC-sqlite3, hspec, MissingH, mtl - , process, QuickCheck, random, scotty, split, strict, text, time - , transformers, unbounded-delays, unix, uri-encode, webdriver + ({ mkDerivation, aeson, base, bytestring, concurrent-extra + , convertible, directory, filepath, HDBC, HDBC-sqlite3, hspec + , MissingH, mtl, process, QuickCheck, random, scotty, split, strict + , text, time, transformers, unbounded-delays, unix, uri-encode + , webdriver }: mkDerivation { pname = "Villefort"; - version = "0.1.2.17"; - sha256 = "17ga54kclbcr6vpiy6q5yws9535j9sg6isqggx05kz3hsa7nllbz"; + version = "0.1.2.19"; + sha256 = "1n6371yvlb39dzi4apcb4am2cyqpm26c2d258idyii4v7s5j0rq0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring convertible directory filepath HDBC HDBC-sqlite3 - MissingH mtl process random scotty split strict text time - transformers unix uri-encode + aeson base bytestring convertible directory filepath HDBC + HDBC-sqlite3 MissingH mtl process random scotty split strict text + time transformers unix uri-encode ]; executableHaskellDepends = [ - base HDBC HDBC-sqlite3 mtl random scotty split text time + base HDBC HDBC-sqlite3 random scotty split text time ]; testHaskellDepends = [ base concurrent-extra HDBC HDBC-sqlite3 hspec mtl QuickCheck @@ -21112,6 +21187,8 @@ self: { pname = "accelerate-bignum"; version = "0.2.0.0"; sha256 = "0xhnd39fb17kb7q5z9z8svn8zlv6j1wxrbkv3vij4f1q2hkqkl0p"; + revision = "1"; + editedCabalFile = "0lfsmhky8shyy9xhm0j2as91vrmqqrrn9r0fsv2ljc4xjklg723r"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell @@ -21138,8 +21215,8 @@ self: { }: mkDerivation { pname = "accelerate-blas"; - version = "0.2.0.0"; - sha256 = "0y77wsdw0i7b5bzlfrrn9q4d8q95r8z71g8qy77n24db1pwmjqy9"; + version = "0.2.0.1"; + sha256 = "00869y2zrh43sl0rap8bbgnzqdvrrxpc2qhzz0zdfasr3440py6k"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda @@ -21234,18 +21311,18 @@ self: { ({ mkDerivation, accelerate, accelerate-fft, accelerate-io , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint, base , binary, bmp, bytestring, bytestring-lexing, cereal - , colour-accelerate, containers, criterion, directory, fclabels - , filepath, gloss, gloss-accelerate, gloss-raster-accelerate - , gloss-rendering, HUnit, lens-accelerate, linear - , linear-accelerate, matrix-market-attoparsec, mwc-random + , colour-accelerate, containers, criterion, criterion-measurement + , directory, fclabels, filepath, gloss, gloss-accelerate + , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate + , linear, linear-accelerate, matrix-market-attoparsec, mwc-random , normaldistribution, QuickCheck, random, repa, repa-io, scientific , test-framework, test-framework-hunit, test-framework-quickcheck2 , vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "1.2.0.0"; - sha256 = "1gb4m1ri461f78x913ipxh14ybwl9wzbv81w8943whiwrmb3p5pc"; + version = "1.2.0.1"; + sha256 = "0hzk6zas03yhh8xjjrh772knhbvisl0r6q10y4mcq552bcfd8yvj"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; @@ -21258,10 +21335,10 @@ self: { executableHaskellDepends = [ accelerate accelerate-fft accelerate-io base binary bmp bytestring bytestring-lexing cereal colour-accelerate containers criterion - directory fclabels filepath gloss gloss-accelerate - gloss-raster-accelerate gloss-rendering lens-accelerate - linear-accelerate matrix-market-attoparsec mwc-random - normaldistribution random repa repa-io scientific vector + criterion-measurement directory fclabels filepath gloss + gloss-accelerate gloss-raster-accelerate gloss-rendering + lens-accelerate linear-accelerate matrix-market-attoparsec + mwc-random normaldistribution random repa repa-io scientific vector vector-algorithms ]; description = "Examples using the Accelerate library"; @@ -21280,6 +21357,8 @@ self: { pname = "accelerate-fft"; version = "1.2.0.0"; sha256 = "19p9d59vdd3nq97xjprlb6fz2ajlk6gl37cdyvrm9inag4nnk6lp"; + revision = "2"; + editedCabalFile = "096vhbwbkyvjx8znjqnb3lz43kzqq0x7kcfv1gmmbjjrcmwaj2y5"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base bytestring carray containers cuda cufft @@ -21388,8 +21467,8 @@ self: { }: mkDerivation { pname = "accelerate-llvm"; - version = "1.2.0.0"; - sha256 = "110zfxqi0lkhg7pk42qvd87qn442r6z264zj7q46jf8ia60l2cdq"; + version = "1.2.0.1"; + sha256 = "1cv5s7fgkdd3m95vy2rrq2kvzyzxx6vwgsc5nqcmfdp00z8znjhk"; libraryHaskellDepends = [ abstract-deque accelerate base bytestring chaselev-deque containers data-default-class deepseq directory dlist exceptions filepath @@ -21405,17 +21484,18 @@ self: { "accelerate-llvm-native" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring , c2hs, Cabal, cereal, containers, directory, dlist, filepath, ghc - , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, mtl - , template-haskell, time, unique, unix, vector + , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, lockfree-queue + , mtl, template-haskell, time, unique, unix, vector }: mkDerivation { pname = "accelerate-llvm-native"; - version = "1.2.0.0"; - sha256 = "089j8ic6ns6656a55byiilrj9jvs535jvx4f2m8x1qhgz9q968vb"; + version = "1.2.0.1"; + sha256 = "0sml5rj3dnxlv14i4xbs1sadnprjga1iws7fl7sxkyjzxqc04vrj"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring Cabal cereal containers directory dlist filepath ghc ghc-prim hashable libffi llvm-hs - llvm-hs-pure mtl template-haskell time unique unix vector + llvm-hs-pure lockfree-queue mtl template-haskell time unique unix + vector ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ accelerate base ]; @@ -21433,10 +21513,8 @@ self: { }: mkDerivation { pname = "accelerate-llvm-ptx"; - version = "1.2.0.0"; - sha256 = "1rh0kq10mwn4zd8f5sp19pah2hmmcansaqqssz79183znzfiviz5"; - revision = "1"; - editedCabalFile = "1fcgs1wcknqnj7wr907ixwlrzwgfnl1bmyr5j4d58bm2xrspid7m"; + version = "1.2.0.1"; + sha256 = "0c9hl19v4si0lnah4l63kqhpxz16zy0wi3cg28gz00mxzgqilivs"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring containers cuda deepseq directory dlist file-embed filepath hashable llvm-hs llvm-hs-pure @@ -22198,6 +22276,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-this" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "acme-this"; + version = "0.1.0.0"; + sha256 = "16zmjrf849m066mnj7rlc10jcddy31ck83mg0b7pmn4cvp95q8k5"; + revision = "1"; + editedCabalFile = "1xizmz9yyhxkkaynlk9x0l1nv5maz0shk3d1ipaphc9c6q4b1mjq"; + libraryHaskellDepends = [ base template-haskell ]; + description = "import This"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "acme-timemachine" = callPackage ({ mkDerivation, base, ghc-prim, mtl, transformers }: mkDerivation { @@ -22305,8 +22396,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; - revision = "7"; - editedCabalFile = "0z4l6j1q3y5zq4941bsb6ypkhfg3pyvb5gcmasymh2nj9g952xkd"; + revision = "8"; + editedCabalFile = "1j771jblfaygc3qf8iaw9b87yrqxhkq79mdi9zyhvlr2vcac362s"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -22800,6 +22891,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson_1_4_3_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, base-orphans + , base16-bytestring, bytestring, containers, deepseq, Diff + , directory, dlist, filepath, generic-deriving, ghc-prim, hashable + , hashable-time, integer-logarithms, primitive, QuickCheck + , quickcheck-instances, scientific, tagged, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text + , th-abstraction, time, time-locale-compat, unordered-containers + , uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.4.3.0"; + sha256 = "068caag4pfn9cmmdksv5yxblzffs0nws8vvhzk54pk99nh7sqr35"; + libraryHaskellDepends = [ + attoparsec base base-compat bytestring containers deepseq dlist + ghc-prim hashable primitive scientific tagged template-haskell text + th-abstraction time time-locale-compat unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers Diff directory dlist filepath + generic-deriving ghc-prim hashable hashable-time integer-logarithms + QuickCheck quickcheck-instances scientific tagged tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-locale-compat unordered-containers uuid-types vector + ]; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -22978,6 +23102,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-diff_1_1_0_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, doctest + , edit-distance-vector, filepath, Glob, hashable, mtl + , optparse-applicative, QuickCheck, quickcheck-instances + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-diff"; + version = "1.1.0.7"; + sha256 = "01d48pd7d1mb9cd5yxfajln8rmjdjq8ch91s0lav4qw1azv6vp2r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring edit-distance-vector hashable mtl scientific + text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring optparse-applicative text + ]; + testHaskellDepends = [ + aeson base bytestring directory doctest filepath Glob QuickCheck + quickcheck-instances text unordered-containers vector + ]; + description = "Extract and apply patches to JSON documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-diff-generic" = callPackage ({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring , containers, dlist, hashable, lens, scientific, tagged @@ -23503,6 +23655,32 @@ self: { pname = "aeson-typescript"; version = "0.1.1.0"; sha256 = "0sx4gavp0pvnxlxwix1di34vm2bfi5d02mzgzs402grqhh1v38vp"; + revision = "1"; + editedCabalFile = "1y5baadwfpyszd78dfbcln93ypg7ai6qvbdz7r95ili8p0vwikbk"; + libraryHaskellDepends = [ + aeson base containers interpolate mtl template-haskell text + th-abstraction unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath hspec + interpolate mtl process template-haskell temporary text + th-abstraction unordered-containers + ]; + description = "Generate TypeScript definition files from your ADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "aeson-typescript_0_1_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, interpolate, mtl, process, template-haskell + , temporary, text, th-abstraction, unordered-containers + }: + mkDerivation { + pname = "aeson-typescript"; + version = "0.1.2.0"; + sha256 = "16bbl91fxd7xmr4qam2dbzksh9sci7c4rhxyyxbiwq387x028hrc"; libraryHaskellDepends = [ aeson base containers interpolate mtl template-haskell text th-abstraction unordered-containers @@ -24194,6 +24372,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alarmclock_0_7_0_1" = callPackage + ({ mkDerivation, async, base, clock, hspec, stm, time + , unbounded-delays + }: + mkDerivation { + pname = "alarmclock"; + version = "0.7.0.1"; + sha256 = "08y3qzm1z28k819xg2qz3dbj0kpynxmhs5bwa6rmgw52sxbiwlnf"; + libraryHaskellDepends = [ + async base clock stm time unbounded-delays + ]; + testHaskellDepends = [ + async base clock hspec stm time unbounded-delays + ]; + description = "Wake up and perform an action at a certain time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alea" = callPackage ({ mkDerivation, base, optparse-applicative, random, text }: mkDerivation { @@ -27566,8 +27763,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.18.1"; - sha256 = "0j728d7q013gcqv0m6vpm401hnpbmzzb3i6br8kpxybdjzmy4y26"; + version = "0.18.2"; + sha256 = "0sp7c9vbgaxc5rhfc402q52djr0qpqgmfklhcrx45av2rqymkyxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28251,6 +28448,8 @@ self: { pname = "antagonist"; version = "0.1.0.30"; sha256 = "1bgsal1030ydg05pn5xd8gdnpm68pmd135n52dqh5cwhjmhzc0g6"; + revision = "1"; + editedCabalFile = "0hm0flgi9h1y84pspr2921skwybrs490yazbs8pz8wi0bhvfg1bc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28300,6 +28499,8 @@ self: { pname = "anticiv"; version = "0.1.0.5"; sha256 = "0sxxa2kylgagbnlf7msrgfq98jaf26lvlas6afypnr15aavvlfzh"; + revision = "1"; + editedCabalFile = "0r2dllym065wi443g2i20sarqmr12dm0z6q515djzq33kdkjddyc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28370,14 +28571,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_7_0_0" = callPackage + "antiope-athena_7_0_1" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "7.0.0"; - sha256 = "0d5h0wqh8lndp34w42agsccv7yjma0dzr4n999g8mg9s95ygq7an"; + version = "7.0.1"; + sha256 = "1dmpsxkgk7wbzl5bhnz5fnx911pvwmrcplnbqqsf90x2fpaaxcgx"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28395,8 +28596,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.0.0"; - sha256 = "19q8rzgxrvz326pmsr5vff7sbpryz1wy6sl2mm5vx2x3nr8jp7yb"; + version = "7.0.1"; + sha256 = "1s00kvwhxhcismzd2vcnhg2nqc4p4nhwh4brz5xfbm7bhgy8dnms"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28428,7 +28629,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-core_7_0_0" = callPackage + "antiope-core_7_0_1" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet @@ -28436,8 +28637,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.0.0"; - sha256 = "0yhv5jda2llydrn6n9mvqgidhmfmz85xmwxyylc1ax5f3bpjvbdr"; + version = "7.0.1"; + sha256 = "08pcrafsf4kkr8hr0l478yv2nxdlcqar19zmkm6j4d8gyayygsmx"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28474,15 +28675,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-dynamodb_7_0_0" = callPackage + "antiope-dynamodb_7_0_1" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.0.0"; - sha256 = "0ikfxl8ysgkqiny8cxfvvh1j4mh7552147qj7k8m8wg6b29n332m"; + version = "7.0.1"; + sha256 = "1za5x7ap2af85zv3gcg2pwqyhry2899n6zj0s43i9y540bkn3iqf"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28520,7 +28721,7 @@ self: { broken = true; }) {}; - "antiope-messages_7_0_0" = callPackage + "antiope-messages_7_0_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens , lens-aeson, monad-loops, network-uri, scientific, text @@ -28528,8 +28729,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.0.0"; - sha256 = "0z7qaywm37w73q472piszf4h2mfcv3ixrvrd7nvpyarjykjj19ma"; + version = "7.0.1"; + sha256 = "0n6p54cd2cvr3ycr6a99qf2ib41jggkdh4b9hrid6132xvysfbp2"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28545,6 +28746,25 @@ self: { broken = true; }) {}; + "antiope-optparse-applicative" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, base + , hedgehog, hspec, hw-hspec-hedgehog, optparse-applicative, text + }: + mkDerivation { + pname = "antiope-optparse-applicative"; + version = "7.0.1"; + sha256 = "018jnswibppmr3qzk6bn64r3xg55msp4bzmcg99vkr6nzgjl1zad"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 base optparse-applicative text + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 base hedgehog hspec + hw-hspec-hedgehog + ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; + license = stdenv.lib.licenses.mit; + }) {}; + "antiope-s3" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core , attoparsec, base, bytestring, conduit, conduit-extra, exceptions @@ -28572,7 +28792,7 @@ self: { broken = true; }) {}; - "antiope-s3_7_0_0" = callPackage + "antiope-s3_7_0_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec @@ -28581,8 +28801,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.0.0"; - sha256 = "0xz77pkjfg8v23ivg0b6idcm8rfrn6v5xyfi8hbdqjg1xq3li9ic"; + version = "7.0.1"; + sha256 = "04c6fdi45g9pqbinzfjqzjda94h65q3ch3fxmbp8iy33wmhhgldv"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -28620,15 +28840,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sns_7_0_0" = callPackage + "antiope-sns_7_0_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.0.0"; - sha256 = "1hr35p9bxc3ah63ld1lyppnkx6yazs5ylnfcp036ai4ad42qx7lh"; + version = "7.0.1"; + sha256 = "0a2knafiq48xp8lxsfzvh1kkf0k3dschvhhxw3avs4s8ycfap7kk"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -28667,7 +28887,7 @@ self: { broken = true; }) {}; - "antiope-sqs_7_0_0" = callPackage + "antiope-sqs_7_0_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl @@ -28675,8 +28895,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "7.0.0"; - sha256 = "18hd7l6w0765rckqrvsk1kpxdvw6w708ink82di4l20w8wncxx07"; + version = "7.0.1"; + sha256 = "0w4fy5dlsf650i672iwa5ixi9pi4n9g3iyn42hf5zbnbdxc0m6yf"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri text @@ -30093,6 +30313,34 @@ self: { broken = true; }) {debian-mirror = null; help = null;}; + "archive-sig" = callPackage + ({ mkDerivation, base, bytestring, composition-prelude + , dir-traverse + }: + mkDerivation { + pname = "archive-sig"; + version = "0.2.0.1"; + sha256 = "1x7kpyxfhn4i9c9wrxwda53qyj4jgw9vd3wfrzxvdfj5wdrdn79d"; + libraryHaskellDepends = [ + base bytestring composition-prelude dir-traverse + ]; + description = "Backpack signature for archive libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "archive-tar" = callPackage + ({ mkDerivation, base, bytestring, composition-prelude, tar }: + mkDerivation { + pname = "archive-tar"; + version = "0.2.0.0"; + sha256 = "0svbxr9734ysskilv5kvhfd7s436spn149pb5bcsq3hjz1zq5xq7"; + libraryHaskellDepends = [ + base bytestring composition-prelude tar + ]; + description = "Common interface using the tar package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "archiver" = callPackage ({ mkDerivation, base, bytestring, containers, curl, HTTP, network , process, random @@ -30457,6 +30705,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "arithmoi_0_9_0_0" = callPackage + ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge + , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random + , semirings, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, transformers, vector + }: + mkDerivation { + pname = "arithmoi"; + version = "0.9.0.0"; + sha256 = "0c1s93kf44ghhnvzhmnld4visx59pwvadfiww9smqisgjl6mpsa3"; + configureFlags = [ "-f-llvm" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers deepseq exact-pi ghc-prim integer-gmp + integer-logarithms random semirings transformers vector + ]; + testHaskellDepends = [ + base containers exact-pi integer-gmp QuickCheck semirings + smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + transformers vector + ]; + benchmarkHaskellDepends = [ + array base containers deepseq gauge integer-logarithms random + vector + ]; + description = "Efficient basic number-theoretic functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "arity-generic-liftA" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -31086,7 +31365,7 @@ self: { broken = true; }) {}; - "asif_6_0_0" = callPackage + "asif_6_0_1" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits @@ -31096,8 +31375,8 @@ self: { }: mkDerivation { pname = "asif"; - version = "6.0.0"; - sha256 = "1kiafpfr1xgbsp2j0fdyiavp6b8lbnrfcfvczbhbwm6vy0w0l4bq"; + version = "6.0.1"; + sha256 = "1lbz2i0ijr23vsc3b064khz3kzj1jwikwxcmjlnzkqvgnbr70grw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32022,6 +32301,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "atomic-primops_0_8_3" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.3"; + sha256 = "03n5dmyplrqgbyf8dr91izkxci7gkl3i3fnp82i5ld869zrgjfh0"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "atomic-primops-foreign" = callPackage ({ mkDerivation, base, bits-atomic, HUnit, test-framework , test-framework-hunit, time @@ -32162,8 +32453,10 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.12"; - sha256 = "174nxhkfb1qvlfxjifrb1pqfrh4na64wvfrnblzpfp03di0hbh3m"; + version = "3.2.5.13"; + sha256 = "040ac4pw1f4nfrydqx56jv0mzap306sbr76kd164vi2n8y4a09cz"; + revision = "1"; + editedCabalFile = "1by5wg58g69r8xcp3nds4s5w2n3zjb1gshgsxi4fg52gfjq0wlfh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32389,15 +32682,15 @@ self: { "attoparsec-data" = callPackage ({ mkDerivation, attoparsec, attoparsec-time, base, base-prelude - , bytestring, scientific, text, time + , bytestring, scientific, text, time, uuid }: mkDerivation { pname = "attoparsec-data"; - version = "1.0.3"; - sha256 = "02bkrbdipd0940aq34dx4156z538jbfxpgdk3pkbb6vjdcghcw9g"; + version = "1.0.4.1"; + sha256 = "01avy1bbiam401mm6196h0a1m5wrki4a3xrdss6hr6x986l6w2yc"; libraryHaskellDepends = [ attoparsec attoparsec-time base base-prelude bytestring scientific - text time + text time uuid ]; description = "Parsers for the standard Haskell data types"; license = stdenv.lib.licenses.mit; @@ -33148,8 +33441,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "29"; - editedCabalFile = "07vc32yn5d954higzxg3c94l3wzgc38b7y2xq8c5rkxwqz8xf97s"; + revision = "30"; + editedCabalFile = "0z7awvdz7447gjgg98z8682d7q1gqn85qcm0dsdgrhv67rkfnadz"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -33294,14 +33587,14 @@ self: { ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, extra, fail, gauge, hashable, hspec, hspec-discover - , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random, scientific - , semigroups, tagged, template-haskell, text, tf-random - , transformers, unordered-containers, vector, zlib + , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random + , raw-strings-qq, scientific, semigroups, tagged, template-haskell + , text, tf-random, transformers, unordered-containers, vector, zlib }: mkDerivation { pname = "avro"; - version = "0.4.4.1"; - sha256 = "12mrgjhms4m9zjax6zqlzn9cisdr482sa642xh5p9h6hdp86ay59"; + version = "0.4.4.2"; + sha256 = "1x01f05rhz4nhvzbzai5817c9ajqnph1vfn0z8cp4y7r4srm55w0"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail hashable mtl scientific @@ -33311,13 +33604,14 @@ self: { testHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers directory extra fail hashable hspec lens lens-aeson mtl - pure-zlib QuickCheck scientific semigroups tagged template-haskell - text tf-random transformers unordered-containers vector + pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged + template-haskell text tf-random transformers unordered-containers + vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - aeson base bytestring containers gauge hashable mtl random text - transformers unordered-containers vector + aeson base bytestring containers gauge hashable mtl random + raw-strings-qq text transformers unordered-containers vector ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -35847,8 +36141,6 @@ self: { ]; description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-migrate" = callPackage @@ -35869,8 +36161,6 @@ self: { ]; description = "SQL DDL support and migrations support library for Beam"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-mysql" = callPackage @@ -35888,8 +36178,6 @@ self: { ]; description = "Connection layer between beam and MySQL/MariaDB"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-newtype-field" = callPackage @@ -35933,8 +36221,6 @@ self: { ]; description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-sqlite" = callPackage @@ -35952,8 +36238,6 @@ self: { ]; description = "Beam driver for SQLite"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-th" = callPackage @@ -36633,16 +36917,18 @@ self: { "bifunctors" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , hspec-discover, QuickCheck, semigroups, tagged, template-haskell + , hspec-discover, QuickCheck, tagged, template-haskell , th-abstraction, transformers, transformers-compat }: mkDerivation { pname = "bifunctors"; - version = "5.5.3"; - sha256 = "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l"; + version = "5.5.4"; + sha256 = "134vn71wd194175k2fcdvd0ak2bdmdbk6ql5lls4byff7zs2rmi9"; + revision = "1"; + editedCabalFile = "05qh2xh2j3w5f1q94wfgfp06z9c4fyrgm4cncy6y2lbb1ficsh3j"; libraryHaskellDepends = [ - base base-orphans comonad containers semigroups tagged - template-haskell th-abstraction transformers + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers ]; testHaskellDepends = [ base hspec QuickCheck template-haskell transformers @@ -37793,8 +38079,8 @@ self: { ({ mkDerivation, base, bindings-DSL }: mkDerivation { pname = "bindings-hdf5"; - version = "0.1"; - sha256 = "0x6p1mwwnpcd5bd6iy4di11n7b45c4zp9d6l957mmhsyg24h2n79"; + version = "0.1.2"; + sha256 = "1d94irqliswjqx65k147mj8i9j34xhfn5lyk5xa7ycf3m5b1g95z"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Project bindings-* raw interface to HDF5 library"; license = stdenv.lib.licenses.bsd3; @@ -38438,8 +38724,8 @@ self: { }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.6.0"; - sha256 = "1w6c8gi8vss8wz94hwv5vap2ss6qzm7la9p9dxplcw7yz3q5c47w"; + version = "0.7.0"; + sha256 = "1wdxlpi24c5axy8d0b9hq8wqr58ikbqy9cwrixi9dc1yya6c2mxg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring bytestring-lexing @@ -39041,6 +39327,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bits_0_5_2" = callPackage + ({ mkDerivation, base, bytes, Cabal, cabal-doctest, doctest, mtl + , transformers + }: + mkDerivation { + pname = "bits"; + version = "0.5.2"; + sha256 = "1q5grjma421qiwjkwvnsakd4hxnf02bavfinky2skfhqvg63hkav"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base bytes mtl transformers ]; + testHaskellDepends = [ base doctest ]; + description = "Various bit twiddling and bitwise serialization primitives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bits-atomic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -39560,8 +39862,8 @@ self: { pname = "blank-canvas"; version = "0.6.2"; sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; - revision = "4"; - editedCabalFile = "03l1k5b58b9p8ajm2aiq5xfryj45zipzv04mxc2qnl5xk9jz0iqw"; + revision = "5"; + editedCabalFile = "1csa2lsr4jv9x3867l1nbd1brnvw10q9qla027r19csscx5pg726"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour @@ -39580,20 +39882,18 @@ self: { "blank-canvas" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries , base64-bytestring, bytestring, colour, containers - , data-default-class, directory, http-types, kansas-comet + , data-default-class, directory, fail, http-types, kansas-comet , mime-types, process, scotty, semigroups, shake, stm, text , text-show, time, transformers, unix, vector, wai, wai-extra, warp }: mkDerivation { pname = "blank-canvas"; - version = "0.6.3"; - sha256 = "1d10ngvsgi2hz6xick59rkq1wzfbsgckply2jmg6gz9mf3zj97bk"; - revision = "2"; - editedCabalFile = "0sybv2swx9gwpkjh704xfmilm9jhdb66jqc296agpzp85s2s75zz"; + version = "0.7"; + sha256 = "11blkr9yhag4l8lyg5gyi2wzcnapkgihkh01mp9lm28f3bb1v1z7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring - colour containers data-default-class http-types kansas-comet + colour containers data-default-class fail http-types kansas-comet mime-types scotty semigroups stm text text-show transformers vector wai wai-extra warp ]; @@ -41050,10 +41350,8 @@ self: { }: mkDerivation { pname = "boring"; - version = "0.1"; - sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk"; - revision = "2"; - editedCabalFile = "1jxaby4cagbhii194x9x0j75ms1v5bm14sx7d19zz3844mh9qyci"; + version = "0.1.1"; + sha256 = "1v33mj4rqg0l7161ajmd35k73n66cscg7wsnmb84z0wp1wxlmhwg"; libraryHaskellDepends = [ adjunctions base base-compat constraints fin generics-sop streams tagged transformers transformers-compat vec @@ -41164,10 +41462,8 @@ self: { }: mkDerivation { pname = "bound-extras"; - version = "0"; - sha256 = "0j010sbdm0bc9dq4lsyw1vb2x0j6gcjxp7ywjn8izdh6yqr2r3qq"; - revision = "1"; - editedCabalFile = "0qcxcpn8hdmkg3mqz80i0j9jrym2pk11k5hyjhqbmrqlhf3fr7qw"; + version = "0.0.1"; + sha256 = "0f49yqz5s5h4f3m3i7kpm2fqnd42nl4dbl24lvm6z3nb8qrx6ynq"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -41876,6 +42172,8 @@ self: { pname = "bronyradiogermany-common"; version = "1.0.0.1"; sha256 = "1hwqif1jnwjhkb22j7rsc7fznvd7373gbfsl46196bb6489bbcvy"; + revision = "1"; + editedCabalFile = "158y92fki5kk8pk7z5whc70qbw0w17v0j0zn486hym3bq6qif74k"; libraryHaskellDepends = [ aeson base bytestring network-uri text time tz uuid-types ]; @@ -41892,6 +42190,8 @@ self: { pname = "bronyradiogermany-streaming"; version = "1.0.0.1"; sha256 = "1a2yz2cbjpcywis7fy5l1w3pipirh6rjfcgs1mdyhgza12qnbx09"; + revision = "1"; + editedCabalFile = "0zhgpm0yxr9ablrc4b99wpwpj1qv2a8bq8mpz525ni17jix3iqc8"; libraryHaskellDepends = [ aeson base bronyradiogermany-common bytestring case-insensitive http-types mtl streaming streaming-bytestring streaming-utils text @@ -41903,6 +42203,68 @@ self: { broken = true; }) {}; + "brotli" = callPackage + ({ mkDerivation, base, bytestring, HUnit, libbrotlidec + , libbrotlienc, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "brotli"; + version = "0.0.0.0"; + sha256 = "1l9qiw5cl0k1rcnqnj9pb7vgj1b06wckkk5i73nqr15ixgcjmr9j"; + libraryHaskellDepends = [ base bytestring transformers ]; + libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Brotli (RFC7932) compression and decompression"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {libbrotlidec = null; libbrotlienc = null;}; + + "brotli-conduit" = callPackage + ({ mkDerivation, base, brotli, bytestring, conduit, HUnit + , QuickCheck, resourcet, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "brotli-conduit"; + version = "0.0.0.0"; + sha256 = "00hl8g4aw4klzvq8gbgx3ff5iq5diz7lxk9ssn7q8icdpl8w5fbf"; + libraryHaskellDepends = [ + base brotli bytestring conduit resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit HUnit QuickCheck resourcet test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "Conduit interface for Brotli (RFC7932) compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "brotli-streams" = callPackage + ({ mkDerivation, base, brotli, bytestring, HUnit, io-streams + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "brotli-streams"; + version = "0.0.0.0"; + sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z"; + libraryHaskellDepends = [ base brotli bytestring io-streams ]; + testHaskellDepends = [ + base bytestring HUnit io-streams QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "IO-Streams interface for Brotli (RFC7932) compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "browscap" = callPackage ({ mkDerivation, base, bytestring, deepseq, ini, lens, lrucache , mtl, text, unordered-containers, wreq @@ -42821,8 +43183,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.3.2.0"; - sha256 = "100s2f4w0lgnsjgjazck7hnbk3k9ibg1i4rdcyza9jphp67vjgar"; + version = "0.3.2.1"; + sha256 = "196c75i7cz7yww3d5pi5p51wd5bf3a8v8nsb2vkiv25ndwrsb20w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42928,6 +43290,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "byteslice" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "byteslice"; + version = "0.1.0.0"; + sha256 = "13qzkhj2ify1q097n1zrjwjkw2803153vp9a4281i5idkm7x9pfg"; + libraryHaskellDepends = [ base primitive ]; + description = "Slicing ByteArray and MutableByteArray"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytestring_0_10_8_2" = callPackage ({ mkDerivation, base, byteorder, deepseq, directory, dlist , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random @@ -43291,6 +43664,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bytestring-substring" = callPackage + ({ mkDerivation, base, bytestring, pipes, primitive }: + mkDerivation { + pname = "bytestring-substring"; + version = "0.1"; + sha256 = "1vn1r8m0ldydnrazyckkn4lpv3g5ns37j91a5649jnrprjpy08dn"; + libraryHaskellDepends = [ base bytestring pipes primitive ]; + description = "break bytestrings up into substrings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytestring-time" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, hspec , QuickCheck, text, time @@ -43782,6 +44166,43 @@ self: { broken = true; }) {}; + "cabal-cache" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , antiope-core, antiope-optparse-applicative, antiope-s3, base + , bytestring, conduit-extra, containers, cryptonite, deepseq + , directory, exceptions, filepath, generic-lens, hedgehog, hspec + , hspec-discover, http-client, http-types, hw-hedgehog + , hw-hspec-hedgehog, lens, mtl, optparse-applicative, process + , raw-strings-qq, resourcet, selective, stm, stringsearch, tar + , temporary, text, time, unliftio, zlib + }: + mkDerivation { + pname = "cabal-cache"; + version = "1.0.0.2"; + sha256 = "15m83x0bnk47cmcpni5qlln9caj742ggb36fhw1pp1fjfkard00m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 antiope-core + antiope-optparse-applicative antiope-s3 base bytestring + conduit-extra containers cryptonite deepseq directory exceptions + filepath generic-lens http-client http-types lens mtl + optparse-applicative process resourcet selective stm stringsearch + tar temporary text time unliftio zlib + ]; + executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ + aeson antiope-core antiope-s3 base bytestring containers filepath + generic-lens hedgehog hspec hw-hedgehog hw-hspec-hedgehog lens + raw-strings-qq text + ]; + testToolDepends = [ hspec-discover ]; + description = "CI Assistant for Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cabal-cargs" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-lenses, cmdargs , directory, filepath, lens, system-fileio, system-filepath, tasty @@ -44858,6 +45279,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cache_0_1_1_2" = callPackage + ({ mkDerivation, base, clock, hashable, hspec, stm, transformers + , unordered-containers + }: + mkDerivation { + pname = "cache"; + version = "0.1.1.2"; + sha256 = "0b0jggcbnrs0pppn60kaggxkwmg0ri7b1i4j5613abgw8bj258s8"; + libraryHaskellDepends = [ + base clock hashable stm transformers unordered-containers + ]; + testHaskellDepends = [ base clock hspec stm transformers ]; + description = "An in-memory key/value store with expiration support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cached" = callPackage ({ mkDerivation, base, containers, directory, doctest, filepath , protolude, QuickCheck, quickcheck-assertions, shake, text @@ -46176,6 +46614,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "case-insensitive_1_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, hashable + , HUnit, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "case-insensitive"; + version = "1.2.1.0"; + sha256 = "01p40hfjyldfds5jg6vlvvn3ihs4ki63xn6fh8yzngaz1izc2v99"; + libraryHaskellDepends = [ base bytestring deepseq hashable text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "Case insensitive string comparison"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "case-insensitive-match" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, criterion, mtl , QuickCheck, random-strings, tagsoup, text @@ -46591,8 +47047,8 @@ self: { }: mkDerivation { pname = "cassava-streams"; - version = "0.3.0.3"; - sha256 = "01s0h2mi9b4h3jy405jvz2an8w6fdvg370mizfk910anx7wsa3ix"; + version = "0.3.0.4"; + sha256 = "17g3qrinzfpmbcqyjrnwaycplmys0p93hb6841cp5rr1pjramb55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46662,20 +47118,20 @@ self: { }) {}; "caster" = callPackage - ({ mkDerivation, base, bytestring, directory, fast-builder + ({ mkDerivation, base, bytestring, directory, fast-builder, mtl , QuickCheck, quickcheck-instances, stm, tasty, tasty-discover , tasty-hunit, tasty-quickcheck, text, unix-time }: mkDerivation { pname = "caster"; - version = "0.0.1.0"; - sha256 = "0yybmrlqfki2v2952gf5xhfh5nr4dj0ldq780landjwh2ywrdcvq"; + version = "0.0.3.0"; + sha256 = "0wmczsiv7cf1yx82yd8da90fab5y8p3mgazfhssv6jd19iaxrakj"; libraryHaskellDepends = [ base bytestring fast-builder stm text unix-time ]; testHaskellDepends = [ - base bytestring directory fast-builder QuickCheck - quickcheck-instances tasty tasty-discover tasty-hunit + base bytestring directory fast-builder mtl QuickCheck + quickcheck-instances stm tasty tasty-discover tasty-hunit tasty-quickcheck text ]; testToolDepends = [ tasty-discover ]; @@ -48075,6 +48531,8 @@ self: { pname = "chatty"; version = "0.7.0.1"; sha256 = "0d7cfp3vvrmn7b6lc83j5pi7a90sk1rc1y48zb78f8plipp7ngb6"; + revision = "1"; + editedCabalFile = "1vh058qw0wphwn0l1lchhxms96p9bhsjna4j7lyvczmc9ba2mgdp"; libraryHaskellDepends = [ ansi-terminal base chatty-utils directory mtl process random setenv template-haskell text time transformers unix @@ -48089,6 +48547,8 @@ self: { pname = "chatty-text"; version = "0.6.2.1"; sha256 = "00f3h0vw0mxrcqjfwas9ddx9hhcvfzvy0p43xqq29ibwdcgms3w2"; + revision = "1"; + editedCabalFile = "11vpzarrbk0jlsnamrnf4xp3gzkgwrbs6x5mr9m5rr4lrw1f9q0v"; libraryHaskellDepends = [ base chatty transformers ]; description = "Provides some classes and types for dealing with text, using the fundaments of Chatty"; license = stdenv.lib.licenses.agpl3; @@ -48102,6 +48562,8 @@ self: { pname = "chatty-utils"; version = "0.7.3.4"; sha256 = "1dp1k641sryzp7zh5l3f8v4dajc71ly8l9fyv1c45cf0s81cxhys"; + revision = "1"; + editedCabalFile = "0b1bvxkp1yhw3ws12mkdys5dnml03phzj03sqkrk1289jm5nlfn9"; libraryHaskellDepends = [ base mtl text transformers ]; description = "Some utilities every serious chatty-based application may need"; license = stdenv.lib.licenses.agpl3; @@ -48838,10 +49300,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.0.4"; - sha256 = "1v9v237473d3fg45sqhx1ksmgvy7p144jdw0a4bvlma01fbzk09h"; - revision = "1"; - editedCabalFile = "0796ic47hmzard8bmgnj0kww32afp8lppx3l5c85nafk7dasykyn"; + version = "1.0.5"; + sha256 = "0274b5qv1wf52vsdjm1siksh07qgdgid0a9316b7nab2gc7jgpdz"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -48852,7 +49312,7 @@ self: { ]; benchmarkHaskellDepends = [ attoparsec base bytestring criterion deepseq old-locale QuickCheck - thyme time vector + text thyme time vector ]; description = "A performant time library"; license = stdenv.lib.licenses.bsd3; @@ -50053,8 +50513,6 @@ self: { ]; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "classyplate" = callPackage @@ -50745,6 +51203,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clock_0_8" = callPackage + ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }: + mkDerivation { + pname = "clock"; + version = "0.8"; + sha256 = "0539w9bjw6xbfv9v6aq9hijszxqdnqhilwpbwpql1400ji95r8q8"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "High-resolution clock functions: monotonic, realtime, cputime"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clock-extras" = callPackage ({ mkDerivation, base, clock, hspec }: mkDerivation { @@ -51615,6 +52087,8 @@ self: { pname = "co-log"; version = "0.2.0"; sha256 = "1xd83srrm659nf2s2xrm3zjg6zhrmhvj6s6mwx4axrgvnxf2lbjr"; + revision = "1"; + editedCabalFile = "0np7g6sqm6iyjyrypwlgrz67n0vhasvgp1k6cwrcj2lnmvjcrmvl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51627,6 +52101,35 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "co-log_0_3_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, chronos + , co-log-core, containers, contravariant, directory, filepath + , hedgehog, markdown-unlit, mtl, stm, text, transformers + , typerep-map + }: + mkDerivation { + pname = "co-log"; + version = "0.3.0.0"; + sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha"; + revision = "1"; + editedCabalFile = "0qf4icy6mrvkwc8kd4w3x47ckhqsx5d5zqpc6cd9qcv1r6pw2vhj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring chronos co-log-core containers + contravariant directory filepath mtl stm text transformers + typerep-map + ]; + executableHaskellDepends = [ + base co-log-core mtl text typerep-map + ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ base co-log-core hedgehog ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "co-log-core" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -51639,6 +52142,33 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "co-log-core_0_2_0_0" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "co-log-core"; + version = "0.2.0.0"; + sha256 = "0q0vhk100qm6dfdfnbgg1mr07d1lzwbfkpkm0ivinfhaz2vnsr2j"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "co-log-polysemy" = callPackage + ({ mkDerivation, base, co-log-core, polysemy }: + mkDerivation { + pname = "co-log-polysemy"; + version = "0.0.0.0"; + sha256 = "02kv0r3ijv410lv9wz40mw4vgv4fmhgrxwppz4l0p50wyra5vq04"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base co-log-core polysemy ]; + executableHaskellDepends = [ base co-log-core polysemy ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "co-log-sys" = callPackage ({ mkDerivation, aeson, base, co-log-core, fmt, microlens , monad-control, mtl, network, universum, unix @@ -52442,6 +52972,8 @@ self: { pname = "colour"; version = "2.3.3"; sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd"; + revision = "1"; + editedCabalFile = "0r0pgrsbk4a3fp9pig7q1d8wrc6cd411gb58qiq3wd5dqw0lbmjk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "A model for human colour/color perception"; @@ -52466,6 +52998,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "colour_2_3_5" = callPackage + ({ mkDerivation, base, QuickCheck, random, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "colour"; + version = "2.3.5"; + sha256 = "1rq4l46jx4lpdppy71wf7m1n7pw2jwy788rm35ycwzb1g4clg39v"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck random test-framework test-framework-quickcheck2 + ]; + description = "A model for human colour/color perception"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "colour-accelerate" = callPackage ({ mkDerivation, accelerate, base }: mkDerivation { @@ -52819,12 +53369,17 @@ self: { }) {}; "comic" = callPackage - ({ mkDerivation, aeson, base, text }: + ({ mkDerivation, aeson, base, deepseq, hashable, hashable-orphans + , lens, sorted-list, text, time, uuid + }: mkDerivation { pname = "comic"; - version = "0"; - sha256 = "00y23pd6pp4siggs0wkf102phi961dyfffbj5wjsvmhlg2nv5hg3"; - libraryHaskellDepends = [ aeson base text ]; + version = "0.0.1"; + sha256 = "1hr2dwj9d3wlwdalcr51jjvlk8lg92lhds25vxvjszpxf6nch20k"; + libraryHaskellDepends = [ + aeson base deepseq hashable hashable-orphans lens sorted-list text + time uuid + ]; description = "A format for describing comics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -52984,6 +53539,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_5" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , distributive, doctest, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.5"; + sha256 = "1l7snp2mszgnjgd0nc9kzfyd13vla0rlazqi03rwx2akcxk14n3c"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers distributive tagged transformers + transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -55490,8 +56064,8 @@ self: { pname = "connection"; version = "0.2.8"; sha256 = "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh"; - revision = "1"; - editedCabalFile = "15qdwqqjv60w14m319a58yjmhzr39dydsnk6r26ydkwxwh23rk73"; + revision = "2"; + editedCabalFile = "0bhwcd9dqa2jk23bdz3z3vn2p1gzssinp96dxzznb7af4y5x2gmk"; libraryHaskellDepends = [ base byteable bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation @@ -55500,6 +56074,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "connection_0_3_0" = callPackage + ({ mkDerivation, base, basement, bytestring, containers + , data-default-class, network, socks, tls, x509, x509-store + , x509-system, x509-validation + }: + mkDerivation { + pname = "connection"; + version = "0.3.0"; + sha256 = "1f53bysp8zr8c8dhivrq2k9qmlwnk84d4c1s31sd62ws9yddcw34"; + revision = "1"; + editedCabalFile = "0cm421anscv6h4nvhkaqvi5s3lwkc0f34p6z8lzap4wyc4gv578k"; + libraryHaskellDepends = [ + base basement bytestring containers data-default-class network + socks tls x509 x509-store x509-system x509-validation + ]; + description = "Simple and easy network connections API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "connection-pool" = callPackage ({ mkDerivation, base, between, data-default-class, monad-control , network, resource-pool, streaming-commons, time @@ -55777,8 +56371,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.0.1.0"; - sha256 = "0jsqm1d8341i98vg98l01sg0vhw398z1x3lf68kz380qiy7paz4c"; + version = "1.0.2.0"; + sha256 = "0czsxil1mzswm9l88df4lnrgsgp634n06k14vs6f4zh2s9xxb59g"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -56239,6 +56833,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "contravariant_1_5_1" = callPackage + ({ mkDerivation, base, StateVar, transformers }: + mkDerivation { + pname = "contravariant"; + version = "1.5.1"; + sha256 = "1jcfbv3mmx2hb49h4djn72bb13j609wvsy9z4wcbj461cvhcr2q8"; + libraryHaskellDepends = [ base StateVar transformers ]; + description = "Contravariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "contravariant-extras" = callPackage ({ mkDerivation, base, base-prelude, contravariant, semigroups , template-haskell, tuple-th @@ -56484,6 +57090,8 @@ self: { pname = "control-monad-omega"; version = "0.3.1"; sha256 = "11hirysr76i01qj8rm22xjcrv2qwxgwjlrqqyd1dsnnvypn9hfrq"; + revision = "1"; + editedCabalFile = "029v5j0mnlzzn6my7jgw26gdm5fbs2h7y395zk1q7r5bfar00q58"; libraryHaskellDepends = [ base ]; description = "A breadth-first list monad"; license = stdenv.lib.licenses.publicDomain; @@ -57417,26 +58025,26 @@ self: { }) {}; "cpkg" = callPackage - ({ mkDerivation, base, binary, bytestring, bzlib - , composition-prelude, containers, cpphs, dhall, directory - , filemanip, filepath, hashable, hspec, hspec-megaparsec - , http-client, http-client-tls, libarchive, lzma, megaparsec - , microlens, mtl, network-uri, optparse-applicative, prettyprinter - , process, recursion, tar, temporary, text, zip-archive, zlib + ({ mkDerivation, base, binary, bytestring, bzlib, containers, cpphs + , dhall, directory, filemanip, filepath, hashable, hspec + , hspec-megaparsec, http-client, http-client-tls, libarchive, lzma + , megaparsec, microlens, mtl, network-uri, optparse-applicative + , prettyprinter, process, recursion, tar, temporary, text + , zip-archive, zlib }: mkDerivation { pname = "cpkg"; - version = "0.1.1.1"; - sha256 = "06nwkys90i0rdhg1nvwzii88z5f3ijn9kjwrg6lgy2m973zr8668"; + version = "0.1.3.1"; + sha256 = "1myivznx5p2c8zw5frvp9drj7gidanq39r7lh11xyxg4rsw1y89n"; revision = "1"; - editedCabalFile = "0dqfgr06mv9xmqs2whzklzgj9ny17ncm6202bhykh9xp8qvzfbyy"; + editedCabalFile = "1ww05lik01k44xfrmjjs542qd66afisx6gglwqsylil86hjbs6gp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bzlib composition-prelude containers dhall - directory filemanip filepath hashable http-client http-client-tls - libarchive lzma megaparsec microlens mtl network-uri prettyprinter - process recursion tar temporary text zip-archive zlib + base binary bytestring bzlib containers dhall directory filemanip + filepath hashable http-client http-client-tls libarchive lzma + megaparsec microlens mtl network-uri prettyprinter process + recursion tar temporary text zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -58398,6 +59006,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "criterion_1_5_5_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, bytestring, cassava, code-page + , containers, criterion-measurement, deepseq, directory, exceptions + , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl + , mwc-random, optparse-applicative, parsec, QuickCheck, statistics + , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-compat, vector, vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.5.5.0"; + sha256 = "1a5i9ghy4hr3355ml4b0rc3b94fa2ijfflh398ncn9sw1ivmx8pa"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base-compat-batteries binary bytestring + cassava code-page containers criterion-measurement deepseq + directory exceptions filepath Glob js-flot js-jquery microstache + mtl mwc-random optparse-applicative parsec statistics text time + transformers transformers-compat vector vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat-batteries optparse-applicative + ]; + testHaskellDepends = [ + aeson base base-compat base-compat-batteries bytestring deepseq + directory HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector + ]; + description = "Robust, reliable performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "criterion-measurement" = callPackage ({ mkDerivation, aeson, base, base-compat, binary, containers , deepseq, vector @@ -59239,26 +59883,24 @@ self: { "cryptol" = callPackage ({ mkDerivation, alex, ansi-terminal, array, base, base-compat - , blaze-html, bytestring, containers, criterion, deepseq, directory - , filepath, gitrev, GraphSCC, happy, haskeline, heredoc - , monad-control, monadLib, mtl, panic, pretty, process, random, sbv - , simple-smt, strict, text, tf-random, time, transformers - , transformers-base + , blaze-html, bytestring, containers, criterion, cryptohash-sha1 + , deepseq, directory, filepath, gitrev, GraphSCC, happy, haskeline + , heredoc, monad-control, monadLib, mtl, panic, pretty, process + , random, sbv, simple-smt, strict, text, tf-random, time + , transformers, transformers-base }: mkDerivation { pname = "cryptol"; - version = "2.6.0"; - sha256 = "0hlgff177s8lhv3s90cmqc3x2xr60g3vxvc7p1mhzb354zxbp2jz"; - revision = "1"; - editedCabalFile = "1smkc0gxbj1vl626iiy56aarx6rcnjzqprqzh443222samrrzr25"; + version = "2.7.0"; + sha256 = "14yk7qs7laxy5ranx9m911k1lxc4vh4pp83ywmsg1kf0cdfvmij6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base base-compat bytestring containers deepseq directory - filepath gitrev GraphSCC heredoc monad-control monadLib mtl panic - pretty process random sbv simple-smt strict text tf-random time - transformers-base + array base base-compat bytestring containers cryptohash-sha1 + deepseq directory filepath gitrev GraphSCC heredoc monad-control + monadLib mtl panic pretty process random sbv simple-smt strict text + tf-random time transformers-base ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -59783,6 +60425,8 @@ self: { pname = "ctpl"; version = "0.1.0.4"; sha256 = "03vcy5qb4wg1wpqcpnr33nwfmyfq3fk01ga3vawh6alppingbvi9"; + revision = "1"; + editedCabalFile = "02wisimqzgjbpaw95fvmwqq97bh3zix710k672gcdbkqsx9x06kn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base chatty-text chatty-utils ]; @@ -59982,6 +60626,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cuda_0_10_1_0" = callPackage + ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath + , pretty, template-haskell, uuid-types + }: + mkDerivation { + pname = "cuda"; + version = "0.10.1.0"; + sha256 = "10lyyc652ic3m4r5agszpv2r99y9fnsdwahb5pd4qiga770v45vp"; + revision = "1"; + editedCabalFile = "0y08nr4p6rad1393l0373s4ivq2zvgm8xv0axh5bi6n95j2khkqz"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base bytestring filepath template-haskell uuid-types + ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base pretty ]; + description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cudd" = callPackage ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }: mkDerivation { @@ -60477,8 +61144,8 @@ self: { }: mkDerivation { pname = "cyclotomic"; - version = "0.5.1"; - sha256 = "1zazdzsiv42p244f0js2fj81l6wkv0s46rfcl9hyabzcq6x9h87p"; + version = "1.0"; + sha256 = "15mp9wi83anv1vxc6649agak4zn4fqyh2vik5f983269h4xsv12j"; libraryHaskellDepends = [ arithmoi base containers ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -61394,6 +62061,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-compat" = callPackage + ({ mkDerivation, base, constraints }: + mkDerivation { + pname = "data-compat"; + version = "0.1.0.0"; + sha256 = "0j9gx0sg2bwqigw9w3kg286bm6imqa35jkgkzagdjg9mfkgy6kwy"; + libraryHaskellDepends = [ base constraints ]; + description = "Define Backwards Compatibility Schemes for Arbitrary Data"; + license = stdenv.lib.licenses.mit; + }) {}; + "data-concurrent-queue" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -62058,8 +62736,8 @@ self: { pname = "data-interval"; version = "1.3.0"; sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9"; - revision = "2"; - editedCabalFile = "16frb3rlkca5z30lwhw8vpwi4g1y42scvg8v41lvih90jq82pg2s"; + revision = "3"; + editedCabalFile = "0jfqgijikf11lqsvbj0rc2b9n2ym7gn4mhk5xpsginp0vy3bgpbp"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -62924,31 +63602,31 @@ self: { "datadog-tracing" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , ffunctor, generic-random, hspec-golden-aeson, http-media, msgpack - , mtl, prettyprinter, QuickCheck, quickcheck-text, refined - , scientific, servant, servant-client, servant-server, tasty - , tasty-discover, tasty-hspec, text, time, unordered-containers - , vector, wai-extra, warp + , ffunctor, generic-random, hspec-golden-aeson, http-media + , jaeger-flamegraph, msgpack, mtl, prettyprinter, QuickCheck + , quickcheck-text, refined, scientific, servant, servant-client + , servant-server, tasty, tasty-discover, tasty-hspec, text, time + , unordered-containers, vector, wai-extra, warp }: mkDerivation { pname = "datadog-tracing"; - version = "1.4.0"; - sha256 = "02gdkh7yxjh2lnjjm4cgpabl0ywwqs145gd5in6s22999chf0hif"; + version = "1.5.0"; + sha256 = "0iagsvaw5fhb0p13mvgg1w60zyzqhb75mkhvw1lxb667xjjwan7l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers ffunctor generic-random http-media - msgpack mtl prettyprinter QuickCheck quickcheck-text refined - scientific servant servant-client text time unordered-containers - vector + jaeger-flamegraph msgpack mtl prettyprinter QuickCheck + quickcheck-text refined scientific servant servant-client text time + unordered-containers vector ]; executableHaskellDepends = [ - aeson base bytestring containers data-default mtl servant - servant-server text wai-extra warp + aeson base bytestring containers data-default jaeger-flamegraph mtl + servant servant-server text wai-extra warp ]; testHaskellDepends = [ - aeson base bytestring containers hspec-golden-aeson mtl servant - tasty tasty-hspec text + aeson base bytestring containers hspec-golden-aeson + jaeger-flamegraph mtl servant tasty tasty-hspec text ]; testToolDepends = [ tasty-discover ]; description = "Datadog tracing client and mock agent"; @@ -63466,8 +64144,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.5"; - sha256 = "0s4j3j02iggvhzys9rnhr7m49dq8f5asv398jvsaibarjpdicnib"; + version = "1.2.6"; + sha256 = "0qqa6ch7113fygrx0fl3xr1lr8hik6c4y2r05q36pzaknhxsywgl"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -65224,14 +65902,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "deque_0_4_2" = callPackage + "deque_0_4_2_1" = callPackage ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "deque"; - version = "0.4.2"; - sha256 = "0zqz8akmkrkwcfkqmspr5dbk5dzhlsh7raxfvda40xhiwyni1cpf"; + version = "0.4.2.1"; + sha256 = "0w7d2z43flj739l3qd5vkn4bcz1ci3f24g92ky33z2gvkfiwvw9x"; libraryHaskellDepends = [ base mtl strict-list ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -65462,8 +66140,31 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.5.4"; - sha256 = "0kd76zvaj84391k9847q3zdvw5hlkdw3qwncysfbsvsh4g9glqwr"; + version = "0.5.5"; + sha256 = "1y1xy5w6ar4p6kc7g67fh93ccwnjnj81l6py1lkxlp8x4x5hpbca"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "deriving-compat_0_5_6" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5.6"; + sha256 = "1rsjq3s2m69x2h880r087qbiwp3173pwv2yihlb8aw7dmjybydmf"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -65475,6 +66176,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derp" = callPackage @@ -65746,8 +66448,8 @@ self: { }: mkDerivation { pname = "df1"; - version = "0.3"; - sha256 = "1qiy2xxri3vdqhy78ccan7phrlfdkb2ndvrj8grlhbzycmai64i3"; + version = "0.3.1"; + sha256 = "0a1fpi9r6nivjxlknfyfkwdgnq5m6qmf68z46m3xjvy0md40caij"; libraryHaskellDepends = [ attoparsec base bytestring containers text time ]; @@ -65898,24 +66600,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_21_0" = callPackage + "dhall_1_22_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, criterion, cryptonite, deepseq, Diff, directory - , doctest, dotgen, exceptions, filepath, haskeline, http-client - , http-client-tls, http-types, lens-family-core, megaparsec, memory - , mockery, mtl, optparse-applicative, parsers, prettyprinter - , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances - , repline, scientific, serialise, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, transformers - , unordered-containers, uri-encode, vector + , doctest, dotgen, exceptions, filepath, foldl, haskeline + , http-client, http-client-tls, http-types, lens-family-core + , megaparsec, memory, mockery, mtl, optparse-applicative, parsers + , prettyprinter, prettyprinter-ansi-terminal, QuickCheck + , quickcheck-instances, repline, scientific, serialise, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text + , transformers, turtle, unordered-containers, uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.21.0"; - sha256 = "03nzp79mmivnyg6s179abf8bj8j60hkng9kgbmfjzvwlfrpwq8lv"; - revision = "1"; - editedCabalFile = "0ap1490jks9hmwf73vlrj7bsfrf4m5yvgqxx3ix57w23ia5gy662"; + version = "1.22.0"; + sha256 = "0f80vxry3vns6kyviradvpn32nkcl51lva5j2naakdg9kgcq4xxz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65931,8 +66631,9 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring cborg containers deepseq directory doctest filepath - mockery prettyprinter QuickCheck quickcheck-instances serialise - tasty tasty-hunit tasty-quickcheck text transformers vector + foldl mockery prettyprinter QuickCheck quickcheck-instances + serialise tasty tasty-hunit tasty-quickcheck text transformers + turtle vector ]; benchmarkHaskellDepends = [ base bytestring containers criterion directory serialise text @@ -65963,14 +66664,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_19" = callPackage + "dhall-bash_1_0_20" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.19"; - sha256 = "11933vw6khyhggdp6a3ib4c3qln6cmrm9ng9cc7mjmm3vpc11l7x"; + version = "1.0.20"; + sha256 = "1nqiyvyj0dw1a6shy9bb1qxzjrnh8544hsa2c6rwg2j36f0lk73d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66031,23 +66732,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_2_7" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall - , optparse-applicative, tasty, tasty-hunit, text - , unordered-containers, vector, yaml + "dhall-json_1_2_8" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , dhall, exceptions, optparse-applicative, scientific, tasty + , tasty-hunit, text, unordered-containers, vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.2.7"; - sha256 = "1wg3cdp1m11lqkz9qs1f5payjbxq8lph31nangrzkgxcrs7s3z0i"; + version = "1.2.8"; + sha256 = "0s5iygh9rfmhx3v62dnfr55xz60rjvnicrq9ydspy129mhf0zzgd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base dhall optparse-applicative text unordered-containers ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring dhall optparse-applicative text - vector yaml + aeson aeson-pretty base bytestring containers dhall exceptions + optparse-applicative scientific text unordered-containers vector + yaml ]; testHaskellDepends = [ aeson base bytestring dhall tasty tasty-hunit text @@ -66115,6 +66817,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-text_1_0_17" = callPackage + ({ mkDerivation, base, dhall, optparse-applicative, text }: + mkDerivation { + pname = "dhall-text"; + version = "1.0.17"; + sha256 = "0bs246857r801qnqvh8cb5wm1rplr7grynl4h989i61qz7vcqf53"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base dhall optparse-applicative text + ]; + description = "Template text using Dhall"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-to-cabal" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, contravariant , dhall, Diff, directory, filepath, hashable, microlens @@ -66226,8 +66944,8 @@ self: { ({ mkDerivation, base, bytestring, di-core, exceptions, unix }: mkDerivation { pname = "di-handle"; - version = "1.0"; - sha256 = "1v4jn1dvvfa6nbqx34hhjg47lbjafkmdps8aalq3n5sah99iy26d"; + version = "1.0.1"; + sha256 = "070gxs75f3wvvalw81y3af5dm76hnv89rwlh6j5dks9m8mm9pgqq"; libraryHaskellDepends = [ base bytestring di-core exceptions unix ]; @@ -66368,6 +67086,8 @@ self: { ]; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-cairo" = callPackage @@ -66424,8 +67144,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.3"; sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5"; - revision = "2"; - editedCabalFile = "0xpw4myq4n6k5lxdll1wg76m3gfymwb746x6qd48qfy3z22nrymw"; + revision = "3"; + editedCabalFile = "0mm1mmagx6q8g6dxk1cagqka38z6393ihp0lvf6095prlvidasqs"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -66521,6 +67241,8 @@ self: { ]; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-hsqml" = callPackage @@ -67687,6 +68409,24 @@ self: { broken = true; }) {}; + "dir-traverse" = callPackage + ({ mkDerivation, base, composition-prelude, criterion, directory + , dirstream, dlist, filepath, pipes, pipes-safe, system-filepath + }: + mkDerivation { + pname = "dir-traverse"; + version = "0.1.0.0"; + sha256 = "1sxw6hr8ajs7gxqp7kwj5v635wb7m0gxix37navp3gddr34jhan2"; + libraryHaskellDepends = [ + base composition-prelude directory dlist filepath + ]; + benchmarkHaskellDepends = [ + base criterion dirstream pipes pipes-safe system-filepath + ]; + description = "Simple directory traversal library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "direct-binary-files" = callPackage ({ mkDerivation, base, bytestring, mtl }: mkDerivation { @@ -67892,6 +68632,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "direm" = callPackage + ({ mkDerivation, base, directory }: + mkDerivation { + pname = "direm"; + version = "0.1.0.0"; + sha256 = "048503bgikwffvqa00yxawr1lmqy523i9zvs05dyim6v927m1fmx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base directory ]; + description = "Deletes a directory and retains its contents in the parent directory"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "dirfiles" = callPackage ({ mkDerivation, aeson, base, containers, hblock, safecopy, text , time, unordered-containers @@ -67989,8 +68742,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "0.8.1"; - sha256 = "0r7nlivcrqazjgsh54k8qrl64h7065c9vdg4ndv8bahvxvw1ld8r"; + version = "0.8.3"; + sha256 = "15nm4dp20ch27wf86s0z3qd98419hhc988dmbv4z9qhq0f8sdcmb"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default http-client iso8601-time JuicyPixels MonadRandom req @@ -71294,6 +72047,19 @@ self: { broken = true; }) {}; + "dura" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath }: + mkDerivation { + pname = "dura"; + version = "0.1"; + sha256 = "0sm5f8678lym1maavvx0jsl0px3phry6687wsvf5askbrdyla84m"; + revision = "1"; + editedCabalFile = "018pwi48hx6jcy9gkbbc4gcbjxa2n8b4lbfmd18mnm49ymwyyqlv"; + libraryHaskellDepends = [ base bytestring directory filepath ]; + description = "durable/atomic file system writes (from rio package)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "duration" = callPackage ({ mkDerivation, base, doctest, hspec, parsec, template-haskell , time @@ -72869,6 +73635,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "either_5_0_1_1" = callPackage + ({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck + , semigroupoids, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "either"; + version = "5.0.1.1"; + sha256 = "09yzki8ss56xhy9vggdw1rls86b2kf55hjl5wi0vbv02d8fxahq2"; + libraryHaskellDepends = [ + base bifunctors mtl profunctors semigroupoids + ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Combinators for working with sums"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "either-both" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -72925,8 +73710,8 @@ self: { pname = "ekg"; version = "0.4.0.15"; sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8"; - revision = "5"; - editedCabalFile = "0jwzwqr4giinq6wvl46399454nm9vc5g6mc2k2mx4wjdcl07qbgm"; + revision = "6"; + editedCabalFile = "012y235n8k7hhx651l01xf88vgr2wskapbsn83w18ls1h1njqnzk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -73099,6 +73884,8 @@ self: { pname = "ekg-prometheus-adapter"; version = "0.1.0.4"; sha256 = "1i9bqbn8zj7hbkc7iypmjji4sh8s2h9jix2ngp77mkmii6wblfx2"; + revision = "1"; + editedCabalFile = "1aq3x5j33bb0rwlip0p3y6ppk8m1x8k3hnrwnb7pca98gyz8fm6r"; libraryHaskellDepends = [ base containers ekg-core microlens-th prometheus text transformers unordered-containers @@ -73159,8 +73946,8 @@ self: { pname = "ekg-statsd"; version = "0.2.4.0"; sha256 = "1nvsiblha1fzykvfaq1s0fyvfmhm32wvxdsfkn9pqd6dl5ivyx2y"; - revision = "2"; - editedCabalFile = "1l0lh77qy4kbybkys1d4gg563fc593w27wpf4k1cg9j6ix6y604x"; + revision = "3"; + editedCabalFile = "0va7fliya7g546f5qbc42bl7dyh74al38sspd2smjyl7a9d5mmlk"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -73295,8 +74082,8 @@ self: { }: mkDerivation { pname = "eliminators"; - version = "0.5"; - sha256 = "0d1d2pp8r2gai25q898v30gb5r82pjzi9smqndn27p1bk9xlqzzr"; + version = "0.5.1"; + sha256 = "0kqgfsa736sahcsgsjgyh7h1lwxzyn4z85klybmj7gffg9lz4rl1"; libraryHaskellDepends = [ base extra singleton-nats singletons template-haskell th-abstraction th-desugar @@ -73998,6 +74785,17 @@ self: { broken = true; }) {}; + "embla" = callPackage + ({ mkDerivation, base, chronos }: + mkDerivation { + pname = "embla"; + version = "0.1"; + sha256 = "1nk689j21ghaiymqnddlf4j8pgb9z61xflfrcgxw3zrxiv5jslk6"; + libraryHaskellDepends = [ base chronos ]; + description = "execute actions periodically while avoiding drift"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "embroidery" = callPackage ({ mkDerivation, base, bytestring, dlist, gloss, haskell98, HCodecs , mtl @@ -74367,16 +75165,16 @@ self: { , directory, exceptions, monad-loops, process, QuickCheck , quickcheck-instances, quickcheck-properties, quickcheck-text , random, retry, SafeSemaphore, semigroups, stm, text, time - , transformers, transformers-either + , transformers, transformers-either, unordered-containers }: mkDerivation { pname = "entwine"; - version = "0.0.3"; - sha256 = "0x4ghpskgpls028fp74mmxqb6hrhcfvdxbfny2bniclh9826fiij"; + version = "0.0.4"; + sha256 = "1k150jbn2jb4ckadmcb655x7ck1cw659zkv03ngwp0wmx8l51n6b"; libraryHaskellDepends = [ async base clock containers exceptions monad-loops retry SafeSemaphore semigroups stm text time transformers - transformers-either + transformers-either unordered-containers ]; testHaskellDepends = [ async base directory exceptions process QuickCheck @@ -74635,6 +75433,8 @@ self: { pname = "enummapset-th"; version = "0.6.1.1"; sha256 = "0anmarswk8vvd9c8qhkhgwzmr5h2yq0bdx48ww5lbca1zf6h5hkw"; + revision = "1"; + editedCabalFile = "0fyjwcw7ibm0x5k2281q53drwm1ddsmkc890fywcv7r6b9jdx5py"; libraryHaskellDepends = [ base containers deepseq template-haskell ]; @@ -75365,6 +76165,34 @@ self: { broken = true; }) {}; + "ersatz_0_4_5" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest, fail + , filepath, lens, mtl, parsec, process, semigroups, temporary + , transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.5"; + sha256 = "14hk7fvwxhh080flwc3l4wqv4r3c8bf6vcbvfnnvnzj4k3s9ssia"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base directory doctest filepath mtl ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -75592,11 +76420,9 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; - "esqueleto_2_7_0" = callPackage + "esqueleto_3_0_0" = callPackage ({ mkDerivation, base, blaze-html, bytestring, conduit, containers , hspec, monad-logger, mysql, mysql-simple, persistent , persistent-mysql, persistent-postgresql, persistent-sqlite @@ -75606,8 +76432,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.7.0"; - sha256 = "1cxf26qfymsx578yzpmpdhs7w79s3xw5ar8d359cxbk04j0im2ib"; + version = "3.0.0"; + sha256 = "187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy"; libraryHaskellDepends = [ base blaze-html bytestring conduit monad-logger persistent resourcet tagged text time transformers unliftio @@ -75623,7 +76449,6 @@ self: { description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ess" = callPackage @@ -76391,8 +77216,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.7"; - sha256 = "0rqgb224v9zy2kkchk2v3zwpdwh805ff03j5y5vswmc0l52bkw7w"; + version = "0.8.2.8"; + sha256 = "1k10f8mihxb9xsvjkmzxphin4l49f5pwbfxfan1ar7wzxyv85vjj"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -76699,8 +77524,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "exception-hierarchy"; - version = "0.1.0.1"; - sha256 = "1zk06z8fwr4g701c79vvsqmagjcm2h850d9m96zrig08kz3lshm9"; + version = "0.1.0.2"; + sha256 = "1srzc1dz3cpplxsqjiw3iiy0jnwyc57qxmdgibkkymjlaksi721i"; libraryHaskellDepends = [ base template-haskell ]; description = "Exception type hierarchy with TemplateHaskell"; license = stdenv.lib.licenses.bsd3; @@ -76817,6 +77642,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptions_0_10_2" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers, transformers-compat + }: + mkDerivation { + pname = "exceptions"; + version = "0.10.2"; + sha256 = "0ajiq47xd1paingr7kksh69v6d072zsppfr6cy1gzjh3zg5jr34i"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 transformers + transformers-compat + ]; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exchangerates" = callPackage ({ mkDerivation, aeson, base, containers, directory, genvalidity , genvalidity-containers, genvalidity-hspec @@ -77514,8 +78361,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.4.2"; - sha256 = "0lps0grvknsp0sfsqnd6kxfh6xf518x9ii11s7fy03qcl0v51da5"; + version = "0.5"; + sha256 = "1xp6rfiak6a8mg20xjdimcqna1g99a7gafgzrvpala3i06wjb3ia"; libraryHaskellDepends = [ attoparsec base containers free lattices singletons text transformers @@ -77533,8 +78380,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.4"; - sha256 = "1m3s9rm4767z68wpl92vryhg1sb0pllrv18x5x53amfa7kf6vrvv"; + version = "0.5"; + sha256 = "1l9h88hvbnl0y8yz5drzn2smnll3wsk6ni4qn752m51g9hm4qvjf"; libraryHaskellDepends = [ base containers expressions list-t singletons transformers z3 ]; @@ -77724,8 +78571,8 @@ self: { }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.21.1"; - sha256 = "1ijk6z4g6y5bfif5rv3w3ld2rfm1ad1sqqicpx9n6lkvh0awc3vp"; + version = "0.22.1"; + sha256 = "1vjd8rr60zxgvv96i9fx5vjbvvxagj8fxz6891irmjgxhlb1v75z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77787,14 +78634,14 @@ self: { "extra" = callPackage ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, time, unix + , QuickCheck, semigroups, time, unix }: mkDerivation { pname = "extra"; - version = "1.6.14"; - sha256 = "170jmwx2wnpa6bs92pcijm4ib4hq0vs4582s6v63wrcn1m9l21m6"; + version = "1.6.15"; + sha256 = "1kbx15x1y6mdzydm4apizym89in4dd71imwk239ywyg27hl8f4gv"; libraryHaskellDepends = [ - base clock directory filepath process time unix + base clock directory filepath process semigroups time unix ]; testHaskellDepends = [ base directory filepath QuickCheck unix ]; description = "Extra functions I use"; @@ -78176,10 +79023,10 @@ self: { }: mkDerivation { pname = "fake"; - version = "0.1.1.1"; - sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf"; + version = "0.1.1.2"; + sha256 = "0jwndfsyc5p7da97658j14x5gynbifkx7ikg8k09ym9gizkrmdd2"; revision = "1"; - editedCabalFile = "1a1rsa8hpgpyw8m2bq9ns76n4dbr4iymjhxqkiif6b6xvg8zwld5"; + editedCabalFile = "0gpqpb6vmskw7l6k3q18cfb670azxldiirj9sapz043sqd5wc3di"; libraryHaskellDepends = [ base containers generics-sop random text time ]; @@ -78258,8 +79105,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.0.0"; - sha256 = "10dvgxipik8pw2cibmw65887ri1zssy2ha72r6x57flgkr0jal0j"; + version = "1.0.1.0"; + sha256 = "0vkg1siaiq6dj1i0dnfdcdswr7fw4shn92wyfj8lxrj6krmfjrni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78382,8 +79229,8 @@ self: { }: mkDerivation { pname = "fast-builder"; - version = "0.1.0.0"; - sha256 = "1sc5hgiagjcsblbzlymd9z140ybmq03l6xykksjdx0xkwj4sqrp2"; + version = "0.1.0.1"; + sha256 = "0ykl1s29kma3bxvv1jfi7q8yv9vmbn1lsrfyn7axgi51j4g06x32"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring process QuickCheck stm ]; benchmarkHaskellDepends = [ @@ -78758,8 +79605,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.24.0.2"; - sha256 = "00qm6n8ali6inqmm64mrcz414iwiin8zwpavq5w1hnrmvzlbazg5"; + version = "0.24.0.3"; + sha256 = "07ys208iiy28hmhc098yx2vj3rzwwxqi0q7l4xx4q61albmryf08"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78783,8 +79630,8 @@ self: { ({ mkDerivation, base, fay }: mkDerivation { pname = "fay-base"; - version = "0.21.1.0"; - sha256 = "1i19q04a4z3aix8njw5im8ixkw7l53xfhff0rrgx3ibnf9jy752z"; + version = "0.21.1.1"; + sha256 = "09fnivdghxc750gpsa3hr7vgj3hff21zj7k73dfkxbkaj48bpf7q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base fay ]; description = "The base package for Fay"; @@ -79300,15 +80147,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "fedora-haskell-tools_0_7" = callPackage + "fedora-haskell-tools_0_8" = callPackage ({ mkDerivation, base, csv, directory, fedora-dists, filepath, HTTP , optparse-applicative, process, simple-cmd, simple-cmd-args, split , time, unix }: mkDerivation { pname = "fedora-haskell-tools"; - version = "0.7"; - sha256 = "1c6pn63jn2afbnr0ink4sblhh4ggvgan9h4fk8l6bpg7g6wm68kp"; + version = "0.8"; + sha256 = "03wk335dpkbcdgxqsjiavnqc43jkw8gh7y41dyfwivwd9mr32y2w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79327,8 +80174,8 @@ self: { }: mkDerivation { pname = "fedora-img-dl"; - version = "0.2"; - sha256 = "0jk9wljmqszfjr4alhx13112bbdgi84662v1f1fslq8w0q17y3m2"; + version = "0.3"; + sha256 = "0mly2lmrirzskralw9ajywmcirmsv67gjws4dckvf1ns24cx33lw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79916,10 +80763,8 @@ self: { }: mkDerivation { pname = "ffunctor"; - version = "1.1.99"; - sha256 = "0b6r72921cr6xrwwnvlw7ndnhfyavrk5a4vsgz3xvisf3i0slb4c"; - revision = "2"; - editedCabalFile = "0772irhfscf3bkxgiy33g7np8wrkdc8pzc7pnap362qvd8v2xkjj"; + version = "1.1.100"; + sha256 = "07s9ax9pi8bxvj94dfh237wfxdmx63gglkw8cx7pn2w1jybpb8v9"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ aeson base exceptions generic-lens http-client mtl servant @@ -80313,6 +81158,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "filelock_0_1_1_3" = callPackage + ({ mkDerivation, async, base, process, unix }: + mkDerivation { + pname = "filelock"; + version = "0.1.1.3"; + sha256 = "04qimhz78jjndk686dblkx06l9jscq2q9gyr014a4pbfj4iljgi5"; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ async base process ]; + description = "Portable interface to file locking (flock / LockFileEx)"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filemanip" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , unix-compat @@ -80582,10 +81440,8 @@ self: { }: mkDerivation { pname = "fin"; - version = "0.0.1"; - sha256 = "0mqs6qayj2n54siz3bpab9z6sk9030wdaxgvgg9g36983yaqmlil"; - revision = "1"; - editedCabalFile = "056d22f1j1xv5ka2qr7a3z5ad5w1im76qdf77v6dqdi4vaz52vd1"; + version = "0.0.2"; + sha256 = "1fdykzyqc43648ka7z3jg3dciyb71ipp67ya521mp6zk9is2fx5i"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; @@ -80951,6 +81807,29 @@ self: { broken = true; }) {}; + "fits-parse" = callPackage + ({ mkDerivation, base, binary, bytestring, data-default + , fast-logger, JuicyPixels, megaparsec, optparse-applicative + , parser-combinators, statistics, text, text-latin1, vector + }: + mkDerivation { + pname = "fits-parse"; + version = "0.0.1"; + sha256 = "13a072ribpn10hfiiqkx2bkns8rjcsf32zx4lsvxzfhm7p24p499"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring data-default megaparsec parser-combinators + text text-latin1 + ]; + executableHaskellDepends = [ + base bytestring fast-logger JuicyPixels optparse-applicative + statistics vector + ]; + description = "Parse FITS files"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "fitsio" = callPackage ({ mkDerivation, base, cfitsio, filepath, mtl }: mkDerivation { @@ -81629,8 +82508,8 @@ self: { ({ mkDerivation, base, directory, parsec }: mkDerivation { pname = "flat-tex"; - version = "0.6.1"; - sha256 = "1g116pdjlxx8mz3w2bapbcfd4jgk8jl24fg7fck3j2gyh8282zbm"; + version = "0.7.0"; + sha256 = "19djkalk3pw309y8ngia88qrppm3c6128db7lk7q6l0w18vrnb9d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory parsec ]; @@ -81915,36 +82794,34 @@ self: { }) {}; "floskell" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , criterion, data-default, deepseq, directory, exceptions, filepath - , ghc-prim, haskell-src-exts, hspec, monad-dijkstra, monad-loops - , mtl, optparse-applicative, text, transformers + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , containers, criterion, data-default, deepseq, directory + , exceptions, filepath, ghc-prim, haskell-src-exts, hspec + , monad-dijkstra, mtl, optparse-applicative, text, transformers , unordered-containers, utf8-string }: mkDerivation { pname = "floskell"; - version = "0.9.0"; - sha256 = "0zx61l6gggblb74ydsamjdvsdm8s8gzb8bmcl8sdhrq7bdbdmbav"; - revision = "2"; - editedCabalFile = "01ayyhmcj6jm4afwdgypd3p8xcrhrvc4g4rgpgi1vdbvwrw3jnb0"; + version = "0.10.0"; + sha256 = "169b69rjqyf3rmgm0hycphcarm4cwx46gg5zgshqg170lwchxf6l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers data-default haskell-src-exts - monad-dijkstra monad-loops mtl text transformers + aeson attoparsec base bytestring containers data-default directory + filepath haskell-src-exts monad-dijkstra mtl text transformers unordered-containers utf8-string ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath ghc-prim - haskell-src-exts optparse-applicative text unordered-containers + aeson-pretty base bytestring directory ghc-prim haskell-src-exts + optparse-applicative text ]; testHaskellDepends = [ - base bytestring deepseq directory exceptions haskell-src-exts hspec - monad-loops mtl text utf8-string + base bytestring deepseq exceptions haskell-src-exts hspec text + utf8-string ]; benchmarkHaskellDepends = [ - base bytestring criterion deepseq directory exceptions ghc-prim + base bytestring criterion deepseq exceptions ghc-prim haskell-src-exts text utf8-string ]; description = "A flexible Haskell source code pretty printer"; @@ -83152,6 +84029,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "forma_1_1_2" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, mtl, text + , unordered-containers + }: + mkDerivation { + pname = "forma"; + version = "1.1.2"; + sha256 = "1ppgqwqm157ygj992r0cbarfii127g7nm63wbnrqvr9k1wmnlxx0"; + libraryHaskellDepends = [ + aeson base containers mtl text unordered-containers + ]; + testHaskellDepends = [ aeson base containers hspec mtl text ]; + description = "Parse and validate forms in JSON format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "formal" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers , directory, file-embed, HTTP, indents, interpolatedstring-perl6 @@ -83875,6 +84769,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_1_1" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, mtl, profunctors, semigroupoids, template-haskell + , transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.1"; + sha256 = "0f33n7x4z0mc733ck4gg6ljcinfmm946a20g5irv90g77c6jmmak"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions mtl profunctors + semigroupoids template-haskell transformers transformers-base + ]; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, constraints, containers, data-fix, dlist , free, groups, hedgehog, kan-extensions, mtl, natural-numbers @@ -84482,19 +85394,16 @@ self: { }) {}; "freq" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, gauge - , hedgehog, primitive + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , gauge, hedgehog, primitive }: mkDerivation { pname = "freq"; - version = "0.1.0.4"; - sha256 = "1h5lhsnm89g4g46sqiym2zf855skinirygqllf9grj6vk4qbls9n"; - isLibrary = true; - isExecutable = true; + version = "0.1.1"; + sha256 = "1n86njmj2y8qgfg3z1rw8p74glqkm36lm2zigv299fzlhqxsx907"; libraryHaskellDepends = [ - base bytestring containers deepseq primitive + base binary bytestring containers deepseq primitive ]; - executableHaskellDepends = [ base bytestring containers ]; testHaskellDepends = [ base bytestring containers hedgehog ]; benchmarkHaskellDepends = [ base bytestring containers gauge ]; description = "Are you ready to get freaky?"; @@ -84674,15 +85583,19 @@ self: { }) {}; "front" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, fay - , text + ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup + , bytestring, conduit, fay, fay-dom, fay-websockets, mtl, stm + , stm-lifted, text, websockets }: mkDerivation { pname = "front"; - version = "0.0.0.1"; - sha256 = "1iaabr2cfvgismar58w7nazi4mckcvxv37qrkjqnxm82zhnv2fgc"; + version = "0.0.0.2"; + sha256 = "106y0qnz5lyvxy69s24fapqkys6i373kl2v51bpkvfwq5ppax0b0"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring fay text + aeson async base blaze-html blaze-markup bytestring conduit fay + fay-dom fay-websockets mtl stm stm-lifted text websockets ]; description = "A reactive frontend web framework"; license = stdenv.lib.licenses.bsd3; @@ -85165,6 +86078,8 @@ self: { pname = "full-text-search"; version = "0.2.1.4"; sha256 = "1qbfklpyxdf5d4d5s1ka9s5a43y892387b0lyjsx9fq3g6d2vck7"; + revision = "1"; + editedCabalFile = "0dma678xflfplrld48aca1p9kjnnwlsqdrqmkgwh9dp54wrxzxl1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers text vector ]; @@ -85753,18 +86668,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fused-effects_0_3_0_0" = callPackage + "fused-effects_0_3_1_0" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, hspec - , MonadRandom, QuickCheck, random, transformers + , inspection-testing, MonadRandom, QuickCheck, random, transformers + , unliftio-core }: mkDerivation { pname = "fused-effects"; - version = "0.3.0.0"; - sha256 = "1plivl5vdgzpb2pbbhyiv2i6jk39l43bwa574qs9nb5jx5i7n056"; + version = "0.3.1.0"; + sha256 = "0mg6sgp4j6my34wzsdpvjvsb07s9k515shvi8nnrnzf0djqq95rv"; libraryHaskellDepends = [ - base deepseq MonadRandom random transformers + base deepseq MonadRandom random transformers unliftio-core + ]; + testHaskellDepends = [ + base doctest hspec inspection-testing QuickCheck transformers ]; - testHaskellDepends = [ base doctest hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "A fast, flexible, fused effect system"; license = stdenv.lib.licenses.bsd3; @@ -86381,6 +87299,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gc_0_0_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "gc"; + version = "0.0.3"; + sha256 = "0cql0csrwqddpw28qmpr47mcnszmdc2szwvbnardr86pmjhvgwph"; + libraryHaskellDepends = [ base ]; + description = "Poor Richard's Memory Manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gc-monitoring-wai" = callPackage ({ mkDerivation, aeson, base, blaze-builder, conduit, http-types , text, transformers, unordered-containers, wai @@ -87061,20 +87991,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generic-data_0_6_0_0" = callPackage - ({ mkDerivation, base, base-orphans, contravariant, generic-lens - , one-liner, show-combinators, tasty, tasty-hunit + "generic-data_0_7_0_0" = callPackage + ({ mkDerivation, base, base-orphans, contravariant, criterion + , deepseq, generic-lens, one-liner, show-combinators, tasty + , tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "0.6.0.0"; - sha256 = "0aiz7m78ysmx31754g28x0zls1kds12p2h3n35k7mxf7g1lla6fx"; + version = "0.7.0.0"; + sha256 = "156d8zx425bpghp903260x1fdgnvwkyd7483mdjdg5l54ff9via8"; libraryHaskellDepends = [ base base-orphans contravariant show-combinators ]; testHaskellDepends = [ base generic-lens one-liner tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -87127,8 +88059,10 @@ self: { }: mkDerivation { pname = "generic-deriving"; - version = "1.12.3"; - sha256 = "14k6yilr8x3ymwmgv51rjkqnzgm64b538gi80lj3z8p6wfjdgvfv"; + version = "1.12.4"; + sha256 = "0vdg9qdq35jl3m11a87wk8cq1y71qm4i1g1b2pxki0wk70yw20a4"; + revision = "1"; + editedCabalFile = "16z0748pw4j28ib6vg5yzjm8wrarqkclr7l597q5zjxabjdn1ygj"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -87152,6 +88086,17 @@ self: { broken = true; }) {}; + "generic-env" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "generic-env"; + version = "0.1.1.0"; + sha256 = "084rfdmcw071dslnw86n2w58xiqhkaldf7qjcmlizykqc15si5xh"; + libraryHaskellDepends = [ base containers text ]; + description = "Generic Environment Generator"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-lens" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, HUnit , inspection-testing, lens, profunctors, QuickCheck, tagged @@ -87379,6 +88324,8 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A library for generic programming that aims to be easy to understand"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generics-mrsop" = callPackage @@ -88618,7 +89565,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_6_4" = callPackage + "ghc_8_6_5" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap , ghci, hpc, process, template-haskell, terminfo, time @@ -88626,8 +89573,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "8.6.4"; - sha256 = "1ninm000qkpvvfgfrlvj0259451wwmfayh46px3zg6mkr19x64yi"; + version = "8.6.5"; + sha256 = "13sh7f40pib5v00wd5bdxrwz7m5q398l93kky0z14q47130mpp20"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell @@ -88638,14 +89585,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_6_4" = callPackage + "ghc-boot_8_6_5" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.6.4"; - sha256 = "1clk84l47bdyj74jykyzqzlwxgpwhs2r9x9bxfnw6f7c24xiv4xp"; + version = "8.6.5"; + sha256 = "1sxar25ji02a4yaz6s5hksf7b8pbl66vv9nb3bfc7fxq6gzj5n4b"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -88654,14 +89601,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_6_4" = callPackage + "ghc-boot-th_8_6_5" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.6.4"; - sha256 = "15hvcns1vpagx0bdpzgm1cgwnxvz4cbbhbzsvdzpl8zf4y0jd8jz"; + version = "8.6.5"; + sha256 = "18gjvxp3668np9n3c5l65q03nlqhgfjhh9wizvifmk673g0cl7n9"; libraryHaskellDepends = [ base ]; - description = "Shared functionality between GHC and the @template-haskell@ library"; + description = "Shared functionality between GHC and the `template-haskell` library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -89088,8 +90035,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "0.20190402"; - sha256 = "1w91n0bh5xyfgzk4kgn43s3wnx4a0h2la9phwf11327ajiacch4l"; + version = "0.20190423"; + sha256 = "1jj4ph9ldxicccs3myqmll9x3a1rl9zv95b797mm9yas80sbijnx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -89113,8 +90060,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "0.20190402"; - sha256 = "0ppp7grcmbml472yi766hsmzlnwvb6dawr4f72k41s3xwkfpjmpg"; + version = "0.20190423"; + sha256 = "1vwfsyyj8h0x56zq498mhjbpj6bz9n901v3mwyn5hzp7c25zdv5k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -89272,8 +90219,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.2.0.2"; - sha256 = "1130fpddf3jx84k558gsc83j3166qy15jp878w2d3lwgzxjcqx5v"; + version = "0.2.0.3"; + sha256 = "0j0injpah571chhgm2gzrim7908l859mgppvxp966bwla3i7j1aj"; libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; description = "Haskell source parser from GHC"; @@ -89697,15 +90644,15 @@ self: { broken = true; }) {}; - "ghci_8_6_4" = callPackage + "ghci_8_6_5" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap , template-haskell, transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.6.4"; - sha256 = "0gjl2bs2alv56j45khylcdjm3cl71kfcadc83lw3b1zpiinhkb7m"; + version = "8.6.5"; + sha256 = "0h011kixzv5x5bjb2i71bl9dnffc6if7k6jmsncbyvj0vvchrrn8"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th ghc-heap template-haskell transformers unix @@ -89848,34 +90795,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.7.2"; - sha256 = "1h50438brxazk6vx8ym3f8y83rijh0lnkf6ac2rwhxi07r016h7s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs directory extra filepath process time - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_7_3" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.7.3"; - sha256 = "00af44r0y4n8nz9sc8mgbydgwzjmp32yrnf1k15lrlyahqrixhfl"; + version = "0.7.4"; + sha256 = "1wd278xligp0qj98zhqp3lkxdzpgb8k7yy0vhva6cs1ch6032gpp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89891,7 +90812,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -91344,8 +92264,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190322"; - sha256 = "1ylz38zp9dz6fyavjz88lzlv5bd9d2mic08ac5vsnxixqbj8rnnx"; + version = "7.20190503"; + sha256 = "127zhk8hfmhac1m31mkazcml5c4hxnbw8c5bn059njycvgw5was4"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -92265,8 +93185,8 @@ self: { }: mkDerivation { pname = "gitlib-test"; - version = "3.1.1"; - sha256 = "1h8kqqj298bb0bj7w4rw18jf3bz0h1rqdg8fngmp4p35c1k1kjzi"; + version = "3.1.2"; + sha256 = "17v84igqyhc808nzv2qsyylk9ls4kzfd9hdx1avj4vb4gc5gblzz"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators exceptions gitlib hspec hspec-expectations HUnit tagged text time transformers @@ -92965,6 +93885,8 @@ self: { pname = "gloss-accelerate"; version = "2.0.0.1"; sha256 = "106z8kax0m3hzk0381l8m7gxdapl3wf0fdr1ljwb5fgcjc00pac2"; + revision = "1"; + editedCabalFile = "0349yyzxn7r82mz4vr71dibzp0sh45b4a06hm0c0z9d7vlxj0sjj"; libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -93110,8 +94032,8 @@ self: { pname = "gloss-raster-accelerate"; version = "2.0.0.0"; sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d"; - revision = "2"; - editedCabalFile = "0k0a562qa8khj39zpgp4sr8kh8h2q4krjjhbvpbsll4r83067ahj"; + revision = "3"; + editedCabalFile = "0nk901zy01x7v7faa20j0yawqfw3nfl27xr19ip7bn3agmq4sqq2"; libraryHaskellDepends = [ accelerate base colour-accelerate gloss gloss-accelerate ]; @@ -96660,8 +97582,8 @@ self: { }: mkDerivation { pname = "grammatical-parsers"; - version = "0.3.2"; - sha256 = "1xmxjds8jpg8q3vmmrypcz3gcjwv9sxyxmpkcrlrjm0wziv175x7"; + version = "0.4"; + sha256 = "0cn912rq65k234y12wwbh07wfps107i43s374lddajb853jq3wr6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97289,8 +98211,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.3.1.1"; - sha256 = "1cfq41s18n73fpn0zzwrvw0b2n7l2h7i71dz9wvifsjxrpla50q1"; + version = "0.3.1.3"; + sha256 = "1v63hp99q3idyq5hmrcax45yp22cswvfs0jj4s7vs94s918a0xg4"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -97452,8 +98374,8 @@ self: { }: mkDerivation { pname = "gray-extended"; - version = "1.5.6"; - sha256 = "13a18vri2akfahp8k7s5sg6knn0plcsf6lqdzy05628wymiia2s3"; + version = "1.5.7"; + sha256 = "0j2lzy15jiykz9b6cqzh7xhpf1idwxp8illvy3r50g1g4hc8zvyp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -98200,6 +99122,36 @@ self: { broken = true; }) {}; + "grpc-haskell" = callPackage + ({ mkDerivation, async, base, bytestring, clock, containers + , criterion, grpc-haskell-core, managed, pipes, proto3-suite + , proto3-wire, QuickCheck, random, safe, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, turtle, unix + }: + mkDerivation { + pname = "grpc-haskell"; + version = "0.0.0.0"; + sha256 = "1d1njhrg6sfwy9f6xaxj0p8bbp2g6qjsa4cq7zq43h3vc1lkb0ii"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring grpc-haskell-core managed proto3-suite + proto3-wire + ]; + testHaskellDepends = [ + async base bytestring clock containers managed pipes proto3-suite + QuickCheck safe tasty tasty-hunit tasty-quickcheck text time + transformers turtle unix + ]; + benchmarkHaskellDepends = [ + async base bytestring criterion proto3-suite random + ]; + description = "Haskell implementation of gRPC layered on shared C library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {grpc-haskell-core = null;}; + "gruff" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , FTGL, gtk, gtkglext, mtl, old-locale, OpenGL, OpenGLRaw, parallel @@ -99672,6 +100624,26 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "hablo" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, lucid, mtl, optparse-applicative, parsec, template + , text, time, unix + }: + mkDerivation { + pname = "hablo"; + version = "1.0.1.0"; + sha256 = "1jbbh8d2xdcdgm4kq4yn6i6h9g996m2zqklg8s5b5h5jlzk7hfvs"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + aeson base bytestring containers directory filepath lucid mtl + optparse-applicative parsec template text time unix + ]; + description = "A minimalist static blog generator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hablog" = callPackage ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup , bytestring, containers, directory, filepath, markdown, mime-types @@ -101021,8 +101993,8 @@ self: { }: mkDerivation { pname = "haiji"; - version = "0.2.3.0"; - sha256 = "12g7nlfci2hrsqi19z8mi7i8vqd1s7a8c3sr8k43f0hhzk6b528i"; + version = "0.3.0.0"; + sha256 = "079q3m3c39ip86hpirq9c5l3b9hw030zd5slwi2bssbmq2bhfv5i"; libraryHaskellDepends = [ aeson attoparsec base data-default mtl scientific tagged template-haskell text transformers unordered-containers vector @@ -101670,6 +102642,22 @@ self: { broken = true; }) {}; + "hakyll-shortcut-links" = callPackage + ({ mkDerivation, base, hakyll, hspec, megaparsec, mtl, pandoc + , pandoc-types, shortcut-links, text + }: + mkDerivation { + pname = "hakyll-shortcut-links"; + version = "0.0.0.0"; + sha256 = "1bzkq83rcpvx0cah77q6p27fd7f0l9hrnk8jyzpmngrnvgyjb2sz"; + libraryHaskellDepends = [ + base hakyll megaparsec mtl pandoc-types shortcut-links text + ]; + testHaskellDepends = [ base hspec mtl pandoc text ]; + description = "Use shortcut-links in markdown file for Hakyll"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "hal" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, envy , exceptions, http-conduit, http-types, mtl, text, time @@ -103489,10 +104477,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.3.2"; - sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i"; - revision = "3"; - editedCabalFile = "10h7pbkrkc9cdxx09zk0s8ygcdva2xy646zq3k8czph3vdaffzqx"; + version = "0.1.3.3"; + sha256 = "1l1p9iz9k8i1car5cd6cfd2bpidkrfbr2354hxvg8gpnw1i5jsbb"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default network text transformers @@ -104595,8 +105581,8 @@ self: { }: mkDerivation { pname = "haskell-debug-adapter"; - version = "0.0.30.0"; - sha256 = "0vr5bc3qkd0h6rb3s4bihg4m9g9z0vzjz6w4m4m2gkw7c1pnirvs"; + version = "0.0.31.0"; + sha256 = "1qxbpllkcf9ybp94f3bhy2w5l6164na0j72c2d4r1va0bzmni4lp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104998,6 +105984,8 @@ self: { pname = "haskell-lsp"; version = "0.8.2.0"; sha256 = "18qkrybwvmyz5h03xj9wjigpqs6s6rw9wi1lqcla4ppg1pkd5zyd"; + revision = "1"; + editedCabalFile = "0m6kprfsgxcmif0mmb1vpc46jyr0kjk6fqv3k1sqfvpjpldh0mvy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105018,6 +106006,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp_0_12_0_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, directory, filepath, hashable, haskell-lsp-types + , hslogger, hspec, hspec-discover, lens, mtl, network-uri, parsec + , QuickCheck, quickcheck-instances, rope-utf16-splay, sorted-list + , stm, text, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.12.0.0"; + sha256 = "1l328s0r3ya00pp33g6v8nwj23n009ki8gikrgja0wgj4hn35d2c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default directory + filepath hashable haskell-lsp-types hslogger lens mtl network-uri + parsec rope-utf16-splay sorted-list stm text time + unordered-containers + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hslogger lens mtl network-uri parsec rope-utf16-splay stm text time + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , haskell-lsp, lens, process, text, unix @@ -105057,6 +106080,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp-types_0_12_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, deepseq + , filepath, hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.12.0.0"; + sha256 = "10f79vjknklp935lvd300gvvwbky8issgq5s68z4cg6v1xva5np0"; + libraryHaskellDepends = [ + aeson base bytestring data-default deepseq filepath hashable lens + network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-menu" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -105638,11 +106679,13 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-simple"; - version = "1.20.0.0"; - sha256 = "0p79ppmwb14lj2a1wy42zgm3z3zk5jbyn7rfgwxsyw2g424bw1dk"; + version = "1.21.0.0"; + sha256 = "0h8m1w995mpdca9is7lwv9n1w7khr5cnxzam21x7w47i546wm9rm"; libraryHaskellDepends = [ base haskell-src-exts ]; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-src-exts-util" = callPackage @@ -107046,8 +108089,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.9.9"; - sha256 = "0d4bv1wr3c89x7r6aakvvwklwzk8g90bl21bc52k4d88znyclqvm"; + version = "0.9.10"; + sha256 = "05pnj7caia2ifr793pryfdc8q8p203rii4agrgy4i123mcfmxqjq"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -107125,8 +108168,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.14.0"; - sha256 = "0d508vs1rhj54iixh1m4s7jcszav83bwbxd7g6d4hgn0vwf2l1wh"; + version = "0.14.3"; + sha256 = "1jjnymwaqd22dpciz2gnxynxz02gch13cvpgh66sny8vjwndcy07"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107978,10 +109021,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.3.0.3"; - sha256 = "01vl4p67yhcm8cmbmajgyd7ggj3p5f6350f8sky8kv3dn31wg6ji"; - revision = "2"; - editedCabalFile = "14063k0dald0i2cqk70kdja1df587vn8vrzgw3rb62nxwycr0r9b"; + version = "1.3.0.5"; + sha256 = "0qs2x4gbaffrxndivb4237vxc6qrzn2rs5kbf04n4d6py9cdhbjv"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder contravariant contravariant-extras data-default-class dlist @@ -108143,8 +109184,8 @@ self: { ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: mkDerivation { pname = "hasql-pool"; - version = "0.5.0.1"; - sha256 = "1isnn3klvqcr13wvq6fsj3b5sysjs6xlll9s3ysihd1x4v87zii8"; + version = "0.5.0.2"; + sha256 = "12289a6xn7gn58s8009bwcjffvr5ipycyb2ixzkxbigaxjbprar4"; libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql"; @@ -110166,8 +111207,8 @@ self: { pname = "hedgehog"; version = "0.6.1"; sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"; - revision = "3"; - editedCabalFile = "11ifv3yymhrzin3cmlrw298lyggqc1sxmbw6n5kpjrv8cnkw28x6"; + revision = "4"; + editedCabalFile = "0iaqqdv4qvkzw1vasnz829k9lh7mz5nkqr8i803rilwnq40xgipx"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory exceptions lifted-async mmorph monad-control mtl @@ -110283,6 +111324,17 @@ self: { broken = true; }) {}; + "hedgehog-generic" = callPackage + ({ mkDerivation, base, hedgehog }: + mkDerivation { + pname = "hedgehog-generic"; + version = "0.1"; + sha256 = "1166jwk3f4bfw54qaxk3q3gxrfmffwwfkmd8xyvwj7i3whwzxq0f"; + libraryHaskellDepends = [ base hedgehog ]; + description = "GHC Generics automatically derived hedgehog generators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hedgehog-quickcheck" = callPackage ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { @@ -110306,6 +111358,8 @@ self: { pname = "hedis"; version = "0.10.10"; sha256 = "0hbjhccipvg2i1cyinvhlk4jgscam9y5897ib1fh6rc0qwnlblhs"; + revision = "1"; + editedCabalFile = "0fcpf0jqga8wh0ikbpkma8sw7f5376wbc9w9rsiqp51q8f23x04h"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -110320,7 +111374,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_12_1" = callPackage + "hedis_0_12_4" = 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 @@ -110328,8 +111382,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.1"; - sha256 = "01l8fmwwanw00bj3rzyv8k9swgvvzbvh920li67w10w5qlwvmgri"; + version = "0.12.4"; + sha256 = "1d1r0ghf1fpiiarpywx7j48bhc86q86lass3b837dcyfni8z2sxw"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -113110,10 +114164,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "5.2.7"; - sha256 = "06p7rn689ynlxxgpy7ix8r69zwz4iwp7rfvcjxa6kxayfiq3hc2w"; - revision = "2"; - editedCabalFile = "14fdsaybp9jyhgcr5q4zl3cnhbll2q732gz52qwbmvk0q5y0zad0"; + version = "5.3.0"; + sha256 = "0wkfik7mvqskk23kyh7ybgnlh3j9j1ym7d3ncahsbli9w654b7xg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -113132,7 +114184,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq directory exceptions ghc-prim - haskell-src-exts utf8-string + haskell-src-exts mtl utf8-string ]; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -114005,6 +115057,27 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hjugement-protocol" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, hashable + , memory, mmorph, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unordered-containers + }: + mkDerivation { + pname = "hjugement-protocol"; + version = "0.0.0.20190501"; + sha256 = "0jhc5qjraf3v54892134g1qlsi1wrl87kv9c0m4k40hd4fkjh894"; + libraryHaskellDepends = [ + base bytestring containers cryptonite memory mmorph random text + transformers unordered-containers + ]; + testHaskellDepends = [ + base containers hashable QuickCheck random tasty tasty-hunit + tasty-quickcheck text transformers unordered-containers + ]; + description = "A cryptographic protocol for the Majority Judgment"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hkdf" = callPackage ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }: mkDerivation { @@ -114229,24 +115302,28 @@ self: { }) {}; "hledger-flow" = callPackage - ({ mkDerivation, base, containers, foldl, HUnit, stm, text, time - , turtle + ({ mkDerivation, base, containers, foldl, HUnit + , optparse-applicative, stm, text, time, turtle }: mkDerivation { pname = "hledger-flow"; - version = "0.11.0.0"; - sha256 = "1zjmy80r7iifj4cw53jskxqnnhrn8ysall5nx7xxhzfx4mwixq6f"; + version = "0.12.0.0"; + sha256 = "0d57q99p1ph70mmwanlyps7vfj6iph9wmx0nza2jlg6falr7wrbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers foldl stm text time turtle ]; - executableHaskellDepends = [ base text turtle ]; + executableHaskellDepends = [ + base optparse-applicative text turtle + ]; testHaskellDepends = [ base containers foldl HUnit stm text turtle ]; description = "An hledger workflow focusing on automated statement import and classification"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hledger-iadd" = callPackage @@ -114531,8 +115608,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.16"; - sha256 = "027v3aigghmghwbiwkhv9iadwv15fa40brkin489ahi6jwrlnp32"; + version = "2.1.17"; + sha256 = "0brinb3fjy619qh8yingqz2k03gcixc7mvqxzhzjadj69zlns6j3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -114647,8 +115724,8 @@ self: { }: mkDerivation { pname = "hlrdb-core"; - version = "0.1.3.0"; - sha256 = "1rjvhgy1bv5kzf8xkmpjndzclq16gc1ihalzn3swg8iyh91pqh89"; + version = "0.1.4.0"; + sha256 = "1sn23347mm9r4j45ba2jz4vw7swh6jgn5fds9xnwgr8rch9b0ljc"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers @@ -115065,8 +116142,8 @@ self: { }: mkDerivation { pname = "hmatrix-vector-sized"; - version = "0.1.1.2"; - sha256 = "0zj31xm0d2d7bzky9qxxs5jb5snjivdjknghpwmf8s1b85zim646"; + version = "0.1.1.3"; + sha256 = "1p4222rq9xm8admm3811hgb32q1nin9y35bm4c121yhz6c0ic5cg"; libraryHaskellDepends = [ base hmatrix vector vector-sized ]; testHaskellDepends = [ base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized @@ -115382,44 +116459,44 @@ self: { "hnix" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, comonad, containers, criterion, cryptohash-md5 - , cryptohash-sha1, cryptohash-sha256, cryptohash-sha512, data-fix - , deepseq, dependent-sum, deriving-compat, Diff, directory - , exceptions, filepath, free, generic-random, Glob, hashable - , hashing, haskeline, hedgehog, hnix-store-core, http-client - , http-client-tls, http-types, interpolate, lens-family - , lens-family-core, lens-family-th, logict, megaparsec - , monad-control, monadlist, mtl, optparse-applicative - , parser-combinators, pretty-show, prettyprinter, process, ref-tf - , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups - , serialise, split, syb, tasty, tasty-hedgehog, tasty-hunit - , tasty-quickcheck, tasty-th, template-haskell, text, these, time - , transformers, transformers-base, unix, unordered-containers - , vector, xml + , bytestring, comonad, containers, contravariant, criterion + , cryptohash-md5, cryptohash-sha1, cryptohash-sha256 + , cryptohash-sha512, data-fix, deepseq, dependent-sum + , deriving-compat, Diff, directory, exceptions, filepath, free + , generic-random, Glob, hashable, hashing, haskeline, hedgehog + , hnix-store-core, http-client, http-client-tls, http-types + , interpolate, lens-family, lens-family-core, lens-family-th + , logict, megaparsec, monad-control, monadlist, mtl + , optparse-applicative, parser-combinators, pretty-show + , prettyprinter, process, ref-tf, regex-tdfa, regex-tdfa-text + , repline, scientific, semigroups, serialise, split, syb, tasty + , tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, text, these, time, transformers + , transformers-base, unix, unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.6.0"; - sha256 = "1yirs9q2hm7h8zahc053q129s5iab6c24745hin4hik0ghdqw6k7"; + version = "0.6.1"; + sha256 = "0q79wdrm3z88mknq6nf7cpg7lwgbx355k95k11rz3iz0sgk9hjwi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring comonad - containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 - cryptohash-sha512 data-fix deepseq dependent-sum deriving-compat - directory exceptions filepath free hashable hashing haskeline - hnix-store-core http-client http-client-tls http-types interpolate - lens-family lens-family-core lens-family-th logict megaparsec - monad-control monadlist mtl optparse-applicative parser-combinators - pretty-show prettyprinter process ref-tf regex-tdfa regex-tdfa-text - scientific semigroups serialise split syb template-haskell text - these time transformers transformers-base unix unordered-containers - vector xml + containers contravariant cryptohash-md5 cryptohash-sha1 + cryptohash-sha256 cryptohash-sha512 data-fix deepseq dependent-sum + deriving-compat directory exceptions filepath free hashable hashing + haskeline hnix-store-core http-client http-client-tls http-types + interpolate lens-family lens-family-core lens-family-th logict + megaparsec monad-control monadlist mtl optparse-applicative + parser-combinators pretty-show prettyprinter process ref-tf + regex-tdfa regex-tdfa-text scientific semigroups serialise split + syb template-haskell text these time transformers transformers-base + unix unordered-containers vector xml ]; executableHaskellDepends = [ aeson base base16-bytestring bytestring comonad containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 - data-fix deepseq exceptions filepath hashing haskeline mtl + data-fix deepseq exceptions filepath free hashing haskeline mtl optparse-applicative pretty-show prettyprinter ref-tf repline serialise template-haskell text time transformers unordered-containers @@ -115442,8 +116519,6 @@ self: { ]; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hnix-store-core" = callPackage @@ -115623,6 +116698,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_8_5" = 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.5"; + sha256 = "1s96zijcmsd3kfh7pjvbs4ks3hi6fkbq04pnxp9zfgr4di6ifmwz"; + 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 @@ -117731,8 +118826,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.7.1.0"; - sha256 = "0fxa92lvw61d48dbgk24bcx2kjbw8k8gpzbbi7z2d8k3z2b9alfk"; + version = "1.8.0.0"; + sha256 = "1q90y8qm5hmyh4q344p844p78cqi0l5w8sxzazyg3mmf8xmz9xy1"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash data-default exceptions fields-json hpqtypes lifted-base log-base @@ -117922,8 +119017,8 @@ self: { }: mkDerivation { pname = "hpython"; - version = "0.2"; - sha256 = "1c9ryyfm3cdhl3n5vqhzsxi31jl0vg5qaq1n8li1cy843bjgl63a"; + version = "0.3"; + sha256 = "1vbjvx87n4d6fhvgz6hbbpyfh2276d3dlq0v39jq85qsb1274ip2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118182,8 +119277,8 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {brotli = null; brotlidec = null; brotlienc = null; - libbrotlidec = null; libbrotlienc = null;}; + }) {brotlidec = null; brotlienc = null; libbrotlidec = null; + libbrotlienc = null;}; "hs-captcha" = callPackage ({ mkDerivation, base, bytestring, gd, random }: @@ -120376,6 +121471,8 @@ self: { pname = "hsini"; version = "0.5.1.2"; sha256 = "1r6qksnrmk18ndxs5zaga8b7kvmk34kp0kh5hwqmq797qrlax9pa"; + revision = "1"; + editedCabalFile = "0wkvajjgs64l4wlw8s6sn3pbwx3ni41p1260chp67a16innr1qp6"; libraryHaskellDepends = [ base bytestring containers mtl parsec ]; testHaskellDepends = [ base bytestring containers mtl parsec tasty tasty-hunit @@ -120483,6 +121580,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hslogger_1_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, network + , network-bsd, old-locale, time, unix + }: + mkDerivation { + pname = "hslogger"; + version = "1.3.0.0"; + sha256 = "1gnnqyd5hr59agqjcbim3kys5zarwsj7b1kfdbhy5qmjjwnpyzs8"; + libraryHaskellDepends = [ + base bytestring containers network network-bsd old-locale time unix + ]; + testHaskellDepends = [ base HUnit ]; + description = "Versatile logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslogger-reader" = callPackage ({ mkDerivation, attoparsec, base, hslogger, optparse-applicative , text, text-icu, time @@ -120577,6 +121691,30 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances + , tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "1.0.3"; + sha256 = "1g2llcffj4yah326lf9axffziz0bla443zddr0lhpz8nqrpbh4j1"; + configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions fail mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers exceptions fail mtl QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "Bindings to Lua, an embeddable scripting language"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific @@ -120598,6 +121736,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-system" = callPackage + ({ mkDerivation, base, containers, directory, exceptions, hslua + , tasty, tasty-hunit, temporary, text + }: + mkDerivation { + pname = "hslua-module-system"; + version = "0.2.1"; + sha256 = "1m7wz3g5c34pyizqw5mllzhsy2vziddhlbhjfwdvd7nhd3p4v3hh"; + libraryHaskellDepends = [ + base containers directory exceptions hslua temporary + ]; + testHaskellDepends = [ base hslua tasty tasty-hunit text ]; + description = "Lua module wrapper around Haskell's System module"; + license = stdenv.lib.licenses.mit; + }) {}; + "hslua-module-text" = callPackage ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text }: @@ -120611,6 +121765,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-text_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "hslua-module-text"; + version = "0.2.1"; + sha256 = "1ikdwvvxhbd5wmfr85dzs2ccamh9rbbpgy899z7s1vlv5q1dj0hk"; + libraryHaskellDepends = [ base bytestring hslua text ]; + testHaskellDepends = [ base hslua tasty tasty-hunit text ]; + description = "Lua module for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsluv-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, containers }: mkDerivation { @@ -123616,6 +124784,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-conduit_2_3_7_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, connection, cookie + , data-default-class, hspec, http-client, http-client-tls + , http-types, HUnit, mtl, network, resourcet, streaming-commons + , temporary, text, time, transformers, unliftio, unliftio-core + , utf8-string, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.3.7.1"; + sha256 = "1xnjbwvil1an5crffcwapdqyinbvvss25rcdra05isqixcs26h39"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit conduit-extra http-client + http-client-tls http-types mtl resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit network resourcet streaming-commons + temporary text time transformers unliftio utf8-string wai + wai-conduit warp warp-tls + ]; + doCheck = false; + description = "HTTP client package with conduit interface and HTTPS support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -123895,6 +125092,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-media_0_8_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , QuickCheck, test-framework, test-framework-quickcheck2 + , utf8-string + }: + mkDerivation { + pname = "http-media"; + version = "0.8.0.0"; + sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir"; + revision = "1"; + editedCabalFile = "01kb67m99jl3b8k06bp84sxiwxygz48ci5wkll42688qgsjb3rab"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers utf8-string + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers QuickCheck + test-framework test-framework-quickcheck2 utf8-string + ]; + description = "Processing HTTP Content-Type and Accept headers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-monad" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception , HTTP, lazyio, network, network-uri, parsec, semigroups @@ -124248,14 +125468,18 @@ self: { "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq - , http2, network, stm, time, tls + , http2, lifted-async, lifted-base, mtl, network, stm, time, tls + , transformers-base }: mkDerivation { pname = "http2-client"; - version = "0.8.0.2"; - sha256 = "16m4amw7xq7psvxix76z7g1dvllkfs9pzpnig5rfhbgfvbf5pydw"; + version = "0.9.0.0"; + sha256 = "1z46an4sign2ashjsj2y07vkf73i2wzx5x10qsdaf4av5ib8ykxq"; + revision = "1"; + editedCabalFile = "00fg9a62qkjwp7rb38j7z7yy6dk3mkh6mgwspd79v2ycmn4mr25q"; libraryHaskellDepends = [ - async base bytestring containers deepseq http2 network stm time tls + async base bytestring containers deepseq http2 lifted-async + lifted-base mtl network stm time tls transformers-base ]; testHaskellDepends = [ base ]; description = "A native HTTP2 client library"; @@ -124264,17 +125488,18 @@ self: { "http2-client-exe" = callPackage ({ mkDerivation, async, base, bytestring, data-default-class, http2 - , http2-client, optparse-applicative, time, tls + , http2-client, lifted-async, lifted-base, optparse-applicative + , time, tls }: mkDerivation { pname = "http2-client-exe"; - version = "0.1.0.1"; - sha256 = "1z1y52253dybliwplybwd71a1ssmma34zcylv54aj6x7grrj37hm"; + version = "0.2.0.0"; + sha256 = "15yvg3nmsajc7q63c2qsmmckw3v4h37364zdxqi3dk9r0xkpssjy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ async base bytestring data-default-class http2 http2-client - optparse-applicative time tls + lifted-async lifted-base optparse-applicative time tls ]; description = "A command-line http2 client"; license = stdenv.lib.licenses.bsd3; @@ -124283,15 +125508,16 @@ self: { "http2-client-grpc" = callPackage ({ mkDerivation, async, base, binary, bytestring, case-insensitive , data-default-class, http2, http2-client, http2-grpc-types, lens - , proto-lens, text, tls + , lifted-async, lifted-base, proto-lens, text, tls }: mkDerivation { pname = "http2-client-grpc"; - version = "0.6.0.0"; - sha256 = "0cf6asfh8wmjh1j0i1ldh557n33q1k1kfj604rz7rrrcarmn0m5h"; + version = "0.7.0.0"; + sha256 = "1iy825wrn2ai2qpbkq4p9k2amc5rarr57b9sa2vm8vqdrclcvzn1"; libraryHaskellDepends = [ async base binary bytestring case-insensitive data-default-class - http2 http2-client http2-grpc-types lens proto-lens text tls + http2 http2-client http2-grpc-types lens lifted-async lifted-base + proto-lens text tls ]; testHaskellDepends = [ base ]; description = "Implement gRPC-over-HTTP2 clients"; @@ -126498,6 +127724,8 @@ self: { pname = "hxt-regex-xmlschema"; version = "9.2.0.3"; sha256 = "1c4jr0439f5yc05h7iz53fa47g6l2wrvqp6gvwf01mlqajk3nx7l"; + revision = "1"; + editedCabalFile = "0vg9vnfjmq1ma6zwwv4yvfih6wbslksvsvy9b41i4f81l0hh7ia8"; libraryHaskellDepends = [ base bytestring hxt-charproperties parsec text ]; @@ -126962,8 +128190,8 @@ self: { }: mkDerivation { pname = "hylolib"; - version = "1.5.3"; - sha256 = "1jpmgpw7cln4r1y4jc4rn17b8wm3vw4dbbzj1fcvljdi73z5yg4b"; + version = "1.5.4"; + sha256 = "0vznqq8z4f42plidagmg2d099gvfk3pwv4xclar8d0gp6dsbks6v"; libraryHaskellDepends = [ array base containers mtl pretty random uniplate ]; @@ -128137,14 +129365,15 @@ self: { , cmdargs, containers, directory, filepath, ghc, ghc-boot , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint , hspec, hspec-contrib, http-client, http-client-tls, HUnit - , ipython-kernel, mtl, parsec, process, random, setenv, shelly - , split, stm, strict, system-argv0, text, transformers, unix - , unordered-containers, utf8-string, uuid, vector + , ipython-kernel, mtl, parsec, process, random, raw-strings-qq + , setenv, shelly, split, stm, strict, system-argv0, text, time + , transformers, unix, unordered-containers, utf8-string, uuid + , vector }: mkDerivation { pname = "ihaskell"; - version = "0.9.1.0"; - sha256 = "1r71bijgfcsgsymg9aqjkgplg8c9g65zddr7dqf7d3mv2bpb5ain"; + version = "0.10.0.0"; + sha256 = "0fmz0l2mpl6qwh4c00ppryxs2nfacmi1n3k21645v62vyhk0favp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -128153,15 +129382,15 @@ self: { directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline haskell-src-exts hlint http-client http-client-tls ipython-kernel mtl parsec process random shelly split stm strict system-argv0 text - transformers unix unordered-containers utf8-string uuid vector + time transformers unix unordered-containers utf8-string uuid vector ]; executableHaskellDepends = [ aeson base bytestring containers directory ghc ipython-kernel - process strict text transformers unix + process strict text transformers unix unordered-containers ]; testHaskellDepends = [ - base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv - shelly text transformers + base directory ghc ghc-paths here hspec hspec-contrib HUnit + raw-strings-qq setenv shelly text transformers ]; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; @@ -128274,6 +129503,19 @@ self: { broken = true; }) {}; + "ihaskell-graphviz" = callPackage + ({ mkDerivation, base, bytestring, ihaskell, process }: + mkDerivation { + pname = "ihaskell-graphviz"; + version = "0.1.0.0"; + sha256 = "1min39vd75rn7vwpmggf8a30fhlv5zphhmckb5a4g6lqg5v1kf1y"; + libraryHaskellDepends = [ base bytestring ihaskell process ]; + description = "IHaskell display instance for GraphViz (external binary)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ihaskell-hatex" = callPackage ({ mkDerivation, base, HaTeX, ihaskell, text }: mkDerivation { @@ -128409,8 +129651,8 @@ self: { }: mkDerivation { pname = "ihaskell-widgets"; - version = "0.2.3.2"; - sha256 = "18kp3s534k241ld1s0ds5hln47pc863dfs3i6r9w67adnf6qhff8"; + version = "0.2.3.3"; + sha256 = "1b4v8ng9y9n9wkadjj06iab71gbqkfr7plxxn1a9fn6qgnnlmdg8"; libraryHaskellDepends = [ aeson base containers ihaskell ipython-kernel scientific singletons text unix unordered-containers vector vinyl @@ -129710,6 +130952,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_7_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, scientific, tagged + , template-haskell, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.7.0"; + sha256 = "1a9la9gm5brsh9rs9ai1a50kcdk75kw8jmrh1rd6xs4xiwdca819"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ base doctest template-haskell ]; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -129720,6 +130986,8 @@ self: { pname = "informative"; version = "0.1.0.27"; sha256 = "05h69883lmj9d80h847yig0ryl1a49y7pckdhq8gl9ahx3hzsgyh"; + revision = "1"; + editedCabalFile = "1bcdaykax075cal066v7j3f1jmbhkqpql0wkj3dny6ww9jdvq1ws"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130409,10 +131677,8 @@ self: { }: mkDerivation { pname = "integer-logarithms"; - version = "1.0.2.2"; - sha256 = "1hvzbrh8fm1g9fbavdym52pr5n9f2bnfx1parkfizwqlbj6n51ms"; - revision = "1"; - editedCabalFile = "1684dkh8j2xqsd85bfsmhv3iam37hasjg4x79mvl6xh7scmpfdbw"; + version = "1.0.3"; + sha256 = "05pc5hws66csvcvfswlwcr2fplwn1lbssvwifjxkbbwqhq0n5qjs"; libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -130805,6 +132071,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "interpolator_1_0_0" = callPackage + ({ mkDerivation, aeson, base, containers, either, hspec + , mono-traversable, mtl, product-profunctors, profunctors + , QuickCheck, template-haskell, text + }: + mkDerivation { + pname = "interpolator"; + version = "1.0.0"; + sha256 = "0kkasycgba525mag4362w8kirnxjydrmh7gjqk5xs6zgcp1ralb7"; + libraryHaskellDepends = [ + aeson base containers either mono-traversable mtl + product-profunctors profunctors QuickCheck template-haskell text + ]; + testHaskellDepends = [ + aeson base containers either hspec mono-traversable mtl + product-profunctors profunctors QuickCheck template-haskell text + ]; + description = "Runtime interpolation of environment variables in records using profunctors"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "interprocess" = callPackage ({ mkDerivation, base, typed-process }: mkDerivation { @@ -131041,26 +132329,46 @@ self: { "invariant" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, hspec-discover, profunctors - , QuickCheck, semigroups, StateVar, stm, tagged, template-haskell + , QuickCheck, StateVar, stm, tagged, template-haskell , th-abstraction, transformers, transformers-compat , unordered-containers }: mkDerivation { pname = "invariant"; - version = "0.5.1"; - sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b"; - revision = "1"; - editedCabalFile = "100gsacbpal53khj94m5qs4aq70hbsp4dz4065czfm49ysd4yqq4"; + version = "0.5.2"; + sha256 = "0k3rh5gzga9snj8piqpsix5h9437kmbam75sax7aa6pirhxx0dw0"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim - profunctors semigroups StateVar stm tagged template-haskell - th-abstraction transformers transformers-compat - unordered-containers + profunctors StateVar stm tagged template-haskell th-abstraction + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell98 invariant functors"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "invariant_0_5_3" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, hspec-discover, profunctors + , QuickCheck, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.5.3"; + sha256 = "03245nhcqxx6b0yw81fzqaqd7cgllmx8awzhvs2xv7ys73pmsgnp"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors StateVar stm tagged template-haskell th-abstraction + transformers transformers-compat unordered-containers ]; testHaskellDepends = [ base hspec QuickCheck template-haskell ]; testToolDepends = [ hspec-discover ]; description = "Haskell98 invariant functors"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible" = callPackage @@ -131733,6 +133041,30 @@ self: { broken = true; }) {}; + "ipython-kernel_0_10_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text + , containers, cryptonite, directory, filepath, memory, mtl, process + , temporary, text, transformers, unordered-containers, uuid + , zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.10.0.0"; + sha256 = "1dqvii2h0vc32ladxmrzli5ch5m3is41bgalas34fh0gcc00p7qa"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring cereal cereal-text containers cryptonite + directory filepath memory mtl process temporary text transformers + unordered-containers uuid zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -132076,6 +133408,8 @@ self: { pname = "ironforge"; version = "0.1.0.36"; sha256 = "11fsph447c3cml0805zdf8454skd7v12ip0cflma6llp3cnfbbl6"; + revision = "1"; + editedCabalFile = "09xmdl9d92jg3l9b2j7crf2kkyhf7zw9vysvr8qfbrhwkkq8d56z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133143,17 +134477,20 @@ self: { }: mkDerivation { pname = "jaeger-flamegraph"; - version = "1.1.0"; - sha256 = "01aa2wk95hwkdh6b3m4c9j73ym2xl1ndys81fvvam6wq0dwf9k14"; - isLibrary = false; + version = "1.3.0"; + sha256 = "03j5hjrhyhmc6qjp7v4j0mr2y0fpk0zds6v55as24par508w72ka"; + revision = "1"; + editedCabalFile = "1q6hmjbj60h86zghzh18nyay705l1960fm7cl4j2fxizz9fll3mg"; + isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base QuickCheck ]; + libraryHaskellDepends = [ aeson base containers QuickCheck text ]; executableHaskellDepends = [ aeson base bytestring containers extra optparse-applicative text ]; - testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ]; + testHaskellDepends = [ + aeson base containers tasty tasty-hspec tasty-quickcheck text + ]; testToolDepends = [ tasty-discover ]; - doHaddock = false; description = "Generate flamegraphs from Jaeger .json dumps."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -135840,8 +137177,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "16"; - editedCabalFile = "1fnncjd9wjwrnl0247gizlvwklihjbfk21pad6a4mqnaa3li5672"; + revision = "17"; + editedCabalFile = "1qnjg28rkwxwn2f8xisbx4f8pqxw2d70mczrjbrbyvx6gkdqzvri"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -136963,8 +138300,8 @@ self: { pname = "keycode"; version = "0.2.2"; sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "3"; - editedCabalFile = "18dgbpf3xwdm3x9j63vsr5q7l028qvifgc6jmjf1ar4p2wv1fzz0"; + revision = "4"; + editedCabalFile = "081spzhywygv90i7jwhbcm7p1aqz6qqph02ddxvqncghar5kjc7n"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -137018,6 +138355,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "keys_3_12_2" = callPackage + ({ mkDerivation, array, base, comonad, containers, free, hashable + , semigroupoids, semigroups, tagged, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "keys"; + version = "3.12.2"; + sha256 = "1mw4c0dd21hmzhidf84p6fxrin7k05l2iz8iar3m7k5vbxihlldj"; + libraryHaskellDepends = [ + array base comonad containers free hashable semigroupoids + semigroups tagged transformers transformers-compat + unordered-containers + ]; + description = "Keyed functors and containers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "keysafe" = callPackage ({ mkDerivation, aeson, argon2, async, base, bloomfilter , bytestring, containers, deepseq, directory, disk-free-space @@ -137246,6 +138602,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kind-apply_0_3_1_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "kind-apply"; + version = "0.3.1.0"; + sha256 = "1rvm0zw5gxn4jfy7ndplrzi2k77mciiisylf9adppy1an8q4zw3d"; + libraryHaskellDepends = [ base ]; + description = "Utilities to work with lists of types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kind-generics" = callPackage ({ mkDerivation, base, kind-apply }: mkDerivation { @@ -137273,6 +138641,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kind-generics-th_0_1_1_0" = callPackage + ({ mkDerivation, base, kind-generics, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "kind-generics-th"; + version = "0.1.1.0"; + sha256 = "0pwhids2d9wfmycaxn5qm04jp1qjj8ji8casgk7d7k36fs15qgkl"; + libraryHaskellDepends = [ + base kind-generics template-haskell th-abstraction + ]; + testHaskellDepends = [ base kind-generics ]; + description = "Template Haskell support for generating `GenericK` instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kinds" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -137327,6 +138712,29 @@ self: { broken = true; }) {}; + "kleene_0_1" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, bytestring + , containers, lattices, MemoTrie, QuickCheck, range-set-list + , regex-applicative, semigroupoids, step-function, text + , transformers + }: + mkDerivation { + pname = "kleene"; + version = "0.1"; + sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; + revision = "1"; + editedCabalFile = "0cirgqhbwz849szrzmyvs47pzja9wnmz5rc2ccylgdikkv4mg3bb"; + libraryHaskellDepends = [ + attoparsec base base-compat bytestring containers lattices MemoTrie + QuickCheck range-set-list regex-applicative semigroupoids + step-function text transformers + ]; + description = "Kleene algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "kmeans" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -137426,6 +138834,37 @@ self: { broken = true; }) {}; + "knit-haskell" = callPackage + ({ mkDerivation, aeson-pretty, base, base64-bytestring + , blaze-colonnade, blaze-html, bytestring, case-insensitive + , colonnade, containers, directory, Glob, here, http-client + , http-client-tls, http-types, hvega, logging-effect, lucid, mtl + , network, network-uri, pandoc, polysemy, prettyprinter, random + , random-fu, random-source, text, time + }: + mkDerivation { + pname = "knit-haskell"; + version = "0.2.0.0"; + sha256 = "0028g05plj8dsakb2c78ryl3lcbfaagg4n1hjfj6b92cxn1bg5hv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson-pretty base base64-bytestring blaze-colonnade blaze-html + bytestring case-insensitive colonnade containers directory Glob + http-client http-client-tls http-types hvega logging-effect lucid + mtl network network-uri pandoc polysemy prettyprinter random + random-fu random-source text time + ]; + executableHaskellDepends = [ + base blaze-html colonnade containers here hvega mtl polysemy + random-fu text + ]; + description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "knob" = callPackage ({ mkDerivation, base, bytestring, transformers }: mkDerivation { @@ -138180,8 +139619,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.1.0.4"; - sha256 = "1pywangzqf85pqhh5sn10vpk0wrd7ff5p29jrsi6sxdz5lyb7svk"; + version = "5.2"; + sha256 = "1ay873mnp4jzjsawxm6k17h6ciyw022a3fviqm83d0l6d1yjnyzm"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -138200,22 +139639,24 @@ self: { ({ mkDerivation, base, binary, bytestring, containers , dependent-map, dependent-sum, dependent-sum-template, directory , edit-distance, filepath, haskeline, hslogger, HTTP, lifted-base - , monad-control, mtl, network, parsec, prim-uniq, random, random-fu - , random-source, regex-tdfa, SafeSemaphore, split, syb - , template-haskell, time, transformers, transformers-base, unix - , utf8-string, zlib + , monad-control, mtl, network, network-bsd, parsec, prim-uniq + , random, random-fu, random-source, regex-tdfa, SafeSemaphore + , split, syb, template-haskell, time, transformers + , transformers-base, unix, utf8-string, zlib }: mkDerivation { pname = "lambdabot-core"; - version = "5.1.0.4"; - sha256 = "1cnp0w47fp0s1zlyb0d90xj5ynwfmlnzm5inc5lhbichwgqcwfzk"; + version = "5.2"; + sha256 = "1wh87wwb8hk3hn2lmdqi1hv77qbdmwqcwjslichygmvac8fjhjss"; + revision = "1"; + editedCabalFile = "1srdkvyw1b0cpv2gq497x11zmqkiqpxkhhdhkd0363wayqjpg21s"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline - hslogger HTTP lifted-base monad-control mtl network parsec - prim-uniq random random-fu random-source regex-tdfa SafeSemaphore - split syb template-haskell time transformers transformers-base unix - utf8-string zlib + hslogger HTTP lifted-base monad-control mtl network network-bsd + parsec prim-uniq random random-fu random-source regex-tdfa + SafeSemaphore split syb template-haskell time transformers + transformers-base unix utf8-string zlib ]; description = "Lambdabot core functionality"; license = "GPL"; @@ -138233,8 +139674,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.1.0.4"; - sha256 = "19fl14c1j7p9qaf26g1qkmxvmw9r7hvxqmp9jxmmwbp7xlc3664v"; + version = "5.2"; + sha256 = "0slq4bfkjpb13k9r9dzfhzsaz39f4ji81f8zfqs37b3r6vfvabbb"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -138256,8 +139697,8 @@ self: { }: mkDerivation { pname = "lambdabot-irc-plugins"; - version = "5.1.0.4"; - sha256 = "0kscksdqjysk9amxwb1xjh475pbwq22mf9as5kqwn72c8s75ngaf"; + version = "5.2"; + sha256 = "0m0dmggmri8imzm15qf5xhzha5ww0qxzg9r3w826z57fwpsql5kh"; libraryHaskellDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -138268,7 +139709,7 @@ self: { }) {}; "lambdabot-misc-plugins" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, hstatsd + ({ mkDerivation, base, bytestring, containers, filepath , lambdabot-core, lifted-base, mtl, network, network-uri, parsec , process, random, random-fu, random-source, regex-tdfa , SafeSemaphore, split, tagsoup, template-haskell, time @@ -138276,14 +139717,13 @@ self: { }: mkDerivation { pname = "lambdabot-misc-plugins"; - version = "5.1.0.4"; - sha256 = "169grwgg5x63qhls16c7xd0p78da38r275mar27il78az7qfgn8d"; + version = "5.2"; + sha256 = "1bl33np4ajiasafchqp2cf0jgb4r8s5phh2nifd82wqg4g4ajw6a"; libraryHaskellDepends = [ - base bytestring containers filepath hstatsd lambdabot-core - lifted-base mtl network network-uri parsec process random random-fu - random-source regex-tdfa SafeSemaphore split tagsoup - template-haskell time transformers transformers-base unix - utf8-string zlib + base bytestring containers filepath lambdabot-core lifted-base mtl + network network-uri parsec process random random-fu random-source + regex-tdfa SafeSemaphore split tagsoup template-haskell time + transformers transformers-base unix utf8-string zlib ]; description = "Lambdabot miscellaneous plugins"; license = "GPL"; @@ -138296,8 +139736,8 @@ self: { }: mkDerivation { pname = "lambdabot-novelty-plugins"; - version = "5.1.0.4"; - sha256 = "1m6n0asp8pn12wif5jv0nvjipzgh7mzzxa17j4mzd7mdqi4dma7z"; + version = "5.2"; + sha256 = "171zx2sicl2c5i0mq2aj82dy146i474l18958qw6nwnx9qxc023a"; libraryHaskellDepends = [ base binary brainfuck bytestring containers dice directory lambdabot-core misfortune process random-fu regex-tdfa unlambda @@ -138313,8 +139753,8 @@ self: { }: mkDerivation { pname = "lambdabot-reference-plugins"; - version = "5.1.0.4"; - sha256 = "0qavp784p5qdb2plhhgk1idrjxcazzn4a94pg8syymb24fzjvm1w"; + version = "5.2"; + sha256 = "0z4hx2knj7y5cslrx3rbd2gzm1qyan4gi1v45c91nlg2g54z5cf3"; libraryHaskellDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -138329,8 +139769,8 @@ self: { }: mkDerivation { pname = "lambdabot-social-plugins"; - version = "5.1.0.4"; - sha256 = "0kjjsnrrsrcdvkn75dsbw7afx8y87i36i6lk54hs6cg88zndailz"; + version = "5.2"; + sha256 = "04gg7cnzahqfy69sp0wr0h1kgy6l0m0dkjbynrx2rmi5w6v4zgkl"; libraryHaskellDepends = [ base binary bytestring containers lambdabot-core mtl split time ]; @@ -138342,8 +139782,8 @@ self: { ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }: mkDerivation { pname = "lambdabot-trusted"; - version = "5.1.0.4"; - sha256 = "1mlyhxc93d3466xhxqlyzg1c8988spzbyk4d5l0c05l1m0xlq77j"; + version = "5.2"; + sha256 = "0cc1x3yxmpnhgl47y8zvbhqiryp3db30b0i89h0zb112kf8mvw5k"; libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ]; description = "Lambdabot trusted code"; license = "GPL"; @@ -138871,8 +140311,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.1.1"; - sha256 = "0zqvr8z0mdjjdd9wx3ghf4aiv61brs52wk04d2vqar8nvv2wpzn4"; + version = "1.7.1.2"; + sha256 = "057gskb5y57jvh6z71d35qq228kpvf0wk09wf175mgy9qc78vg9p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -139428,6 +140868,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-javascript_0_6_0_12" = callPackage + ({ mkDerivation, alex, array, base, blaze-builder, bytestring + , Cabal, containers, happy, hspec, mtl, QuickCheck, text + , utf8-light, utf8-string + }: + mkDerivation { + pname = "language-javascript"; + version = "0.6.0.12"; + sha256 = "0yqwalb3qxvmwx1gdss3sv7d8v4vzrnkvahq2b35y3lzi3fykpa7"; + libraryHaskellDepends = [ + array base blaze-builder bytestring containers mtl text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + array base blaze-builder bytestring Cabal containers hspec mtl + QuickCheck utf8-light utf8-string + ]; + description = "Parser for JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-js" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -139744,8 +141206,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.4.3"; - sha256 = "1sh0i487w7mz5c0scly1s11xzha4dbp2wdiwdks3203c5yrjdfq7"; + version = "1.4.4"; + sha256 = "0dgbbyz89q1hhacy2pymhvmp8k5dvnzzsrxq0zc6l865nhha67ch"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -140334,8 +141796,8 @@ self: { pname = "lattices"; version = "1.7.1.1"; sha256 = "1byx2hmmh2213afdcsjxf3mvq3h9bwkl5wrvzxv1yqvd9jiqjz3r"; - revision = "1"; - editedCabalFile = "18182vlzaz5kzcn2j0k1jmdl8kgqmnpjc3ynsi7v6jdl3vig89dr"; + revision = "2"; + editedCabalFile = "0qxz4v5pqwvhb79mz4b7wc66r2c0xc9ixfhss4h56jk3vb1hriys"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -140351,6 +141813,32 @@ self: { broken = true; }) {}; + "lattices_2" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , integer-logarithms, QuickCheck, quickcheck-instances + , semigroupoids, tagged, tasty, tasty-quickcheck, transformers + , universe-base, universe-reverse-instances, unordered-containers + }: + mkDerivation { + pname = "lattices"; + version = "2"; + sha256 = "050c66rrzh5p204jyqmysyhm419f8pasi0mlbwv3n167y0fnr8xq"; + libraryHaskellDepends = [ + base base-compat containers deepseq hashable integer-logarithms + QuickCheck semigroupoids tagged transformers universe-base + universe-reverse-instances unordered-containers + ]; + testHaskellDepends = [ + base base-compat containers QuickCheck quickcheck-instances tasty + tasty-quickcheck transformers universe-base + universe-reverse-instances unordered-containers + ]; + description = "Fine-grained library for constructing and manipulating lattices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "launchpad-control" = callPackage ({ mkDerivation, array, base, containers, hmidi, mtl, transformers }: @@ -141288,20 +142776,20 @@ self: { , tagged, template-haskell, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, text , th-abstraction, transformers, transformers-compat - , unordered-containers, vector, void + , unordered-containers, vector }: mkDerivation { pname = "lens"; - version = "4.17"; - sha256 = "1k087zfy10rijr3cikalj8p58d8ypfmhb4d29bsbw8qhakg68dj7"; + version = "4.17.1"; + sha256 = "1gpkc53l2cggnfrgg5k4ih82rycjbdvpj9pnbi5cq8ms0dbvs4a7"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath free ghc-prim hashable kan-extensions mtl parallel profunctors - reflection semigroupoids semigroups tagged template-haskell text + reflection semigroupoids tagged template-haskell text th-abstraction transformers transformers-compat - unordered-containers vector void + unordered-containers vector ]; testHaskellDepends = [ base bytestring containers deepseq directory doctest filepath @@ -142134,6 +143622,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {ffi = null; inherit (pkgs) libffi;}; + "libffi-dynamic" = callPackage + ({ mkDerivation, base, contravariant, ffi, hashable, intern }: + mkDerivation { + pname = "libffi-dynamic"; + version = "0.0.0.1"; + sha256 = "0fh3a07qv6fgxycba2yy02warz2lm2npps9118nkxq0qf8gnvinv"; + libraryHaskellDepends = [ base contravariant hashable intern ]; + librarySystemDepends = [ ffi ]; + description = "LibFFI interface with dynamic bidirectional type-driven binding generation"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {ffi = null;}; + "libgit" = callPackage ({ mkDerivation, base, mtl, process }: mkDerivation { @@ -142375,6 +143877,8 @@ self: { pname = "libmpd"; version = "0.9.0.9"; sha256 = "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv"; + revision = "1"; + editedCabalFile = "16pzbmhyzlpxy2djmxrs0wrv8mad3ahb040lx5kmf57say3qxgdl"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -143002,8 +144506,8 @@ self: { pname = "lift-generics"; version = "0.1.2"; sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf"; - revision = "2"; - editedCabalFile = "171f8cpn0kw9psikx3n7cdwyqfwg8rr8gf1hja6g7pnm0683l5l8"; + revision = "3"; + editedCabalFile = "0ackkmjfqxyxhy9w03zlqvmi68la9yv4jf0sc8qdhyr5y30ac68s"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell ]; @@ -143046,6 +144550,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_10_0_4" = callPackage + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty + , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.0.4"; + sha256 = "0cwl1d0wjpdk0v1l1qxiqiksmak950c8gx169c1q77cg0z18ijf9"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -143409,8 +144935,8 @@ self: { }: mkDerivation { pname = "line-bot-sdk"; - version = "0.5.0.0"; - sha256 = "135l32xf28ric12ya9mfis6rixd4cyfp3801dr6q8di4vvfgblm4"; + version = "0.5.0.1"; + sha256 = "0d2a540dflyv3zjx9phs85qar1kpyl287f01hh8fxkp550wivfgg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143501,6 +145027,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear_1_20_9" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq + , distributive, doctest, ghc-prim, hashable, HUnit, lens + , reflection, semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.20.9"; + sha256 = "0h7yqigq593n7wsl7nz6a5f137wznm7y679wsii0ph0zsc4v5af5"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable lens reflection + semigroupoids semigroups tagged template-haskell transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq doctest HUnit lens reflection + simple-reflect test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -146230,6 +147785,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logict_0_6_0_3" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "logict"; + version = "0.6.0.3"; + sha256 = "1a3sqws8bc55a7sxkl406a69ls75l60syv20b5rmkd30nbdisryh"; + libraryHaskellDepends = [ base mtl ]; + description = "A backtracking logic-programming monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logict-state" = callPackage ({ mkDerivation, base, logict, mtl, transformers }: mkDerivation { @@ -146949,8 +148516,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.5.1.0"; - sha256 = "1kmffpfq6cnby3gij5sd1p2fp8hhn7gjk1nm5a4hs2gfhlyik57y"; + version = "0.5.1.2"; + sha256 = "1fc58krsm2q92azkcq57xdj7ngqvkqbvngjcr3plf0793xdarxj8"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -146967,6 +148534,33 @@ self: { broken = true; }) {}; + "lsp-test_0_5_2_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, rope-utf16-splay, text, transformers + , unix, unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.5.2.1"; + sha256 = "1yrcs6wln4sf8rns46q84rxhdd8la3mjpmmazp6yyhm0i288bifq"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bytestring conduit + conduit-parse containers data-default Diff directory filepath + haskell-lsp lens mtl parser-combinators process rope-utf16-splay + text transformers unix unordered-containers + ]; + testHaskellDepends = [ + aeson base data-default haskell-lsp hspec lens text + unordered-containers + ]; + description = "Functional test framework for LSP servers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -147266,8 +148860,8 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.7.0.0"; - sha256 = "0sqzgmadm7a0lydsc9p7632sd37152f8xf8x4abdfnakqpdvni3m"; + version = "0.7.1"; + sha256 = "1crfq5z0acv8ci7cj62dg1sy9hmsgpzhjwrjky9rkfnjs2brbf0n"; libraryHaskellDepends = [ base blaze-builder lucid text transformers ]; @@ -148347,24 +149941,22 @@ self: { }) {}; "mailgun" = callPackage - ({ mkDerivation, base, bytestring, conduit, exceptions, failure - , http-client, http-client-multipart, http-conduit, monad-control - , network, text, transformers + ({ mkDerivation, aeson, aeson-filthy, ascii, base, bytestring + , containers, exceptions, filepath, ini, lens, lens-aeson, machines + , mime-mail, mime-types, mtl, text, these, time, transformers + , unordered-containers, wreq }: mkDerivation { pname = "mailgun"; - version = "0.1.0.4"; - sha256 = "01xcr0dwbkpryavk054y52fdk9qis4s6df8d0yxz05kdl8b5nczq"; - isLibrary = true; - isExecutable = true; + version = "0.2"; + sha256 = "10gmic7hks35wanzy16ivrnc9zqx586yjxiqmcmhvmkiwrpha3yi"; libraryHaskellDepends = [ - base bytestring conduit exceptions failure http-client - http-client-multipart http-conduit monad-control network text - transformers + aeson aeson-filthy ascii base bytestring containers exceptions + filepath ini lens lens-aeson machines mime-mail mime-types mtl text + these time transformers unordered-containers wreq ]; - executableHaskellDepends = [ base http-conduit text transformers ]; - description = "Connector to Rackspace's Mailgun Service"; - license = stdenv.lib.licenses.mit; + description = "API binding for Mailgun"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -149076,8 +150668,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.5.0.0"; - sha256 = "19p2yh8yrav6dljmw8mz3xnghxf2h9a5z5wqxnb6zsrl11mds95g"; + version = "0.5.0.2"; + sha256 = "073bqcsv09ckgdcpimq2siggh79wf8g070w05jdzmi7pvds9ys2g"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -149089,7 +150681,7 @@ self: { }) {}; "manifolds" = callPackage - ({ mkDerivation, array, base, call-stack, comonad + ({ mkDerivation, array, base, binary, call-stack, comonad , constrained-categories, containers, deepseq, free , free-vector-spaces, ieee754, lens, linear, linearmap-category , manifolds-core, MemoTrie, number-show, placeholders @@ -149099,11 +150691,11 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.5.0.1"; - sha256 = "1l2rbf0axlbyvxdd62dhik4pk8n9jf2c6pxl86yi48hhvc3wyx07"; + version = "0.5.0.2"; + sha256 = "07jv4qvjxc1hhlvy95r3wmb9f4zlifiixjy5vhj7s02lkdpyd7xb"; libraryHaskellDepends = [ - array base call-stack comonad constrained-categories containers - deepseq free free-vector-spaces ieee754 lens linear + array base binary call-stack comonad constrained-categories + containers deepseq free free-vector-spaces ieee754 lens linear linearmap-category manifolds-core MemoTrie number-show placeholders pragmatic-show QuickCheck semigroups spatial-rotations tagged transformers vector vector-space void @@ -149123,8 +150715,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.5.0.1"; - sha256 = "0bq102vfxq47if5nf0az92inzxgbla9by09nggi2nww4gqrd37v3"; + version = "0.5.0.2"; + sha256 = "1i2a9nz3v19v155pjhvqwzcsnd9iqv9p28s98ms09fnjb7j1i954"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -149164,6 +150756,37 @@ self: { broken = true; }) {}; + "map-reduce-folds" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , discrimination, foldl, hashable, hashtables, hedgehog, parallel + , profunctors, random, split, streaming, streamly, text + , unordered-containers, vector + }: + mkDerivation { + pname = "map-reduce-folds"; + version = "0.1.0.0"; + sha256 = "03f5jkjsrn5a82g0cvjwm9dq1hn4c9m6a8hsyh035f92vflfk5vc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers discrimination foldl hashable hashtables parallel + profunctors split streaming streamly text unordered-containers + vector + ]; + executableHaskellDepends = [ + base containers foldl profunctors text unordered-containers + ]; + testHaskellDepends = [ base containers foldl hedgehog ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq foldl profunctors random text + unordered-containers + ]; + description = "foldl wrappers for map-reduce"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "map-syntax" = callPackage ({ mkDerivation, base, containers, deepseq, hspec, HUnit, mtl , QuickCheck, transformers @@ -149683,7 +151306,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_3_0_1" = callPackage + "massiv_0_3_2_0" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest , containers, data-default, data-default-class, deepseq, doctest , exceptions, hspec, primitive, QuickCheck, scheduler @@ -149691,8 +151314,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.3.0.1"; - sha256 = "175dhcpv9gki3rb9vr1xig1sw6hams20clxql9y61xfhv0hryj0v"; + version = "0.3.2.0"; + sha256 = "0cap5rxy3d301ci1ysh4d0y3k4smgx6w4s7ngqkzdbw17fk74iam"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive @@ -149806,6 +151429,8 @@ self: { pname = "matchable-th"; version = "0.1.0.0"; sha256 = "1381zpnpzgng7iwx326bjwi1i3300a0aa0hhp1j5wr0mxad8hyr3"; + revision = "1"; + editedCabalFile = "0az3cwf4gy0vhv0zqdvqpvk3j6ckhf1h2946kklvmij7z46x17ql"; libraryHaskellDepends = [ base matchable template-haskell th-abstraction ]; @@ -149882,6 +151507,28 @@ self: { broken = true; }) {}; + "math-interpolate" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "math-interpolate"; + version = "0.1.0.1"; + sha256 = "0l8jv0zm1mar6848n5jyd6dzy02q0cvkgvgnry9db382i1r4g9bq"; + libraryHaskellDepends = [ base ]; + description = "Class for interpolation of values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "math-metric" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "math-metric"; + version = "0.1.0.1"; + sha256 = "092qbl1x0l6hcm9vn3nx3gyxnqcfx3z2kkfkqw5zmmmyn9zkjsgx"; + libraryHaskellDepends = [ base ]; + description = "Typeclass for metric spaces"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mathblog" = callPackage ({ mkDerivation, base, bytestring, ConfigFile, containers , data-default, deepseq, directory, either, filepath, fsnotify @@ -151097,6 +152744,51 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec_7_0_5" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, mtl, parser-combinators, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "7.0.5"; + sha256 = "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq text weigh + ]; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "megaparsec-tests" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , hspec, hspec-discover, hspec-expectations, hspec-megaparsec + , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text + , transformers + }: + mkDerivation { + pname = "megaparsec-tests"; + version = "7.0.5"; + sha256 = "11kwf122bq38qvkpvhb1pkqzbv7yk9wi7klmg9yvls29x66shiyq"; + libraryHaskellDepends = [ + base bytestring containers hspec hspec-expectations + hspec-megaparsec megaparsec mtl QuickCheck text transformers + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hspec + hspec-expectations hspec-megaparsec megaparsec mtl + parser-combinators QuickCheck scientific text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Test utilities and the test suite of Megaparsec"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -152046,6 +153738,8 @@ self: { pname = "micro-recursion-schemes"; version = "5.0.2.2"; sha256 = "17jybjra4s1hapjz6i8bwlv8y6rm70g72vl7cd2y7xrq4vrd3p9v"; + revision = "1"; + editedCabalFile = "0zdyg5w4fhdps5cirp21wpd6056v09381lmdf9mizfxilhx4wziy"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; libraryToolDepends = [ cpphs ]; testHaskellDepends = [ base HUnit template-haskell ]; @@ -152284,6 +153978,8 @@ self: { pname = "microlens-th"; version = "0.4.2.3"; sha256 = "13qw0pwcgd6f6i39rwgqwcwk1d4da5x7wv3gna7gdlxaq331h41j"; + revision = "1"; + editedCabalFile = "167in7b1qhgrspx81bdm2jyg9qji66sk7id282c0s99kmp0d01n6"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -152498,10 +154194,8 @@ self: { }: mkDerivation { pname = "midi-util"; - version = "0.2.0.1"; - sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc"; - revision = "1"; - editedCabalFile = "0a3hasbhvd327m65yqqyjah7y8r48l65bqg1ymcrc0s2zff10gl5"; + version = "0.2.1"; + sha256 = "0ajmjwxa2g5fjgb9zhil63mszsalmg4fqdv62zabf774z8k1x1ry"; libraryHaskellDepends = [ base containers event-list midi non-negative ]; @@ -152592,22 +154286,22 @@ self: { "mighttpd2" = callPackage ({ mkDerivation, array, async, auto-update, base, byteorder , bytestring, case-insensitive, conduit, conduit-extra, directory - , filepath, hspec, http-client, http-date, http-types, io-choice - , network, old-locale, parsec, resourcet, streaming-commons, time + , filepath, hspec, http-client, http-date, http-types, network + , old-locale, parsec, resourcet, streaming-commons, time , transformers, unix, unix-time, unordered-containers, wai , wai-app-file-cgi, wai-http2-extra, wai-logger, warp }: mkDerivation { pname = "mighttpd2"; - version = "3.4.3"; - sha256 = "0afa25kaagdznfg1kbm5hbmlfk75p7rws0x9fjb505wrr12jipbh"; + version = "3.4.4"; + sha256 = "0n73zr3scn6sgqwaqjzcm3gybf2j0nwdcfq4cmsq9wanc5naz1pd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async auto-update base byteorder bytestring case-insensitive conduit conduit-extra directory filepath http-date http-types - io-choice network parsec resourcet streaming-commons unix unix-time + network parsec resourcet streaming-commons unix unix-time unordered-containers wai wai-app-file-cgi warp ]; executableHaskellDepends = [ @@ -152945,33 +154639,36 @@ self: { }) {}; "minilight" = callPackage - ({ mkDerivation, aeson, base, containers, exceptions, FontyFruity - , hashable, linear, microlens, microlens-mtl, mtl, mwc-random - , scientific, sdl2, sdl2-gfx, sdl2-image, sdl2-ttf, tasty - , tasty-discover, tasty-hspec, template-haskell, text, trifecta - , unordered-containers, vector, yaml + ({ mkDerivation, aeson, aeson-diff, base, caster, containers + , exceptions, FontyFruity, fsnotify, hashable, hashtables, lens + , linear, microlens, mtl, mwc-random, scientific, sdl2, sdl2-gfx + , sdl2-image, sdl2-ttf, tasty, tasty-discover, tasty-hspec + , template-haskell, text, transformers, trifecta + , unordered-containers, uuid, vector, yaml }: mkDerivation { pname = "minilight"; - version = "0.1.1"; - sha256 = "0wl37m7wz5jdq4hwcbrnd0m5lhz9mgfk6p8ysinjwfc1458g8v91"; + version = "0.3.0"; + sha256 = "0x251755hjrzkbbsvsb0ihrrmqw82dvcsp9f9xmvff0v0s1gfi24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers exceptions FontyFruity hashable linear - microlens microlens-mtl mtl mwc-random scientific sdl2 sdl2-gfx - sdl2-image sdl2-ttf template-haskell text trifecta - unordered-containers vector yaml + aeson aeson-diff base caster containers exceptions FontyFruity + fsnotify hashable hashtables lens linear mtl mwc-random scientific + sdl2 sdl2-gfx sdl2-image sdl2-ttf template-haskell text + transformers trifecta unordered-containers uuid vector yaml ]; executableHaskellDepends = [ base linear microlens mtl mwc-random sdl2 sdl2-ttf text vector ]; testHaskellDepends = [ - aeson base tasty tasty-hspec trifecta yaml + aeson base tasty tasty-hspec trifecta vector yaml ]; testToolDepends = [ tasty-discover ]; description = "A SDL2-based graphics library, batteries-included"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minimal-configuration" = callPackage @@ -153174,13 +154871,15 @@ self: { }: mkDerivation { pname = "minitypeset-opengl"; - version = "0.1.0.0"; - sha256 = "06fh4j0sfpd8w576s04a6bg6h4c7lsk7zm85dlcfhlghyg2gwri1"; + version = "0.3.0.0"; + sha256 = "10q5071gm98vc16k5mdck1gcdf6p8aa6612wlsqwawnq3f2hj7d0"; libraryHaskellDepends = [ base containers filepath OpenGL stb-truetype ]; description = "Layout and render text with TrueType fonts using OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "miniutter" = callPackage @@ -153775,6 +155474,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmark_0_0_7_0" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec + , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens + , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck + , text, text-metrics, unordered-containers, weigh, yaml + }: + mkDerivation { + pname = "mmark"; + version = "0.0.7.0"; + sha256 = "0g7mx3xvvj8vgcids231zlz9kp7z3zjrq4xfhdm0wk0v1k51dflx"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers deepseq dlist email-validate + foldl hashable html-entity-map lucid megaparsec microlens + microlens-th modern-uri mtl parser-combinators text text-metrics + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + description = "Strict markdown processor for writers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmark-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark @@ -153829,6 +155556,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmorph_1_1_3" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.1.3"; + sha256 = "0rfsy9n9mlinpmqi2s17fhc67fzma2ig5fbmh6m5m830canzf8vr"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmtf" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-msgpack, deepseq, hspec, http-conduit, QuickCheck, text @@ -154909,8 +156650,8 @@ self: { }: mkDerivation { pname = "monad-metrics"; - version = "0.2.1.2"; - sha256 = "0zxvdx75psdninvh7f7wqj498wav2cjmn94n5a3f5g8nvrs0n4rq"; + version = "0.2.1.3"; + sha256 = "0ryazqrn7s2pzgzgvzp4paibylbvl54p52gc70n3alwzz8x1b7bd"; libraryHaskellDepends = [ base clock ekg-core exceptions hashable microlens mtl text transformers unordered-containers @@ -156429,6 +158170,22 @@ self: { broken = true; }) {}; + "morpheus-graphql" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , mtl, scientific, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.0.1"; + sha256 = "1a9wkpsj8850abpz2z5cphphllpwzdc1l38ljfghd79y278cc1zm"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers mtl scientific text + transformers unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -156727,12 +158484,12 @@ self: { , daemons, directory, exceptions, filepath, gi-glib, gi-gobject , gi-gst, haskell-gi-base, haskell-gi-overloading, lens, MissingH , mtl, network, random, resourcet, simple-ui, template-haskell - , text, utf8-string, vty + , text, unix, utf8-string, vty }: mkDerivation { pname = "mp"; - version = "1.0.2"; - sha256 = "07npcr1rjypjbxrv3hccqfac3piq00psc7yxgh7iw8pl8izqrwl7"; + version = "1.1.0"; + sha256 = "1msy52c1702q16pmbzc69iyj7bj9xdh4c72d15sigblh9hwvipmm"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -156740,7 +158497,7 @@ self: { async base binary ConfigFile containers daemons directory exceptions filepath gi-glib gi-gobject gi-gst haskell-gi-base haskell-gi-overloading lens MissingH mtl network random resourcet - simple-ui template-haskell text utf8-string vty + simple-ui template-haskell text unix utf8-string vty ]; description = "Music player for linux"; license = stdenv.lib.licenses.gpl2; @@ -157246,6 +159003,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mtl-compat_0_2_2" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "mtl-compat"; + version = "0.2.2"; + sha256 = "17iszr5yb4f17g8mq6i74hsamii8z6m2qfsmgzs78mhiwa7kjm8r"; + libraryHaskellDepends = [ base mtl ]; + doHaddock = false; + description = "Backported Control.Monad.Except module from mtl"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mtl-evil-instances" = callPackage ({ mkDerivation, base, monad-control, mtl, transformers , transformers-base @@ -157545,6 +159315,25 @@ self: { broken = true; }) {}; + "multi-containers" = callPackage + ({ mkDerivation, base, containers, directory, extra, filepath + , hspec + }: + mkDerivation { + pname = "multi-containers"; + version = "0.1.0.2"; + sha256 = "1az9drnj6kd6x8r8gycfndqw9mhv0arvi4mkmqcazjg3lr7rxvpa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ + base containers directory extra filepath + ]; + testHaskellDepends = [ base containers hspec ]; + description = "A few multimap variants"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multi-instance" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -157939,6 +159728,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multiprocess" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "multiprocess"; + version = "0.0.0"; + sha256 = "06f1yq4x9jc7cv8nxsqbm47xbv6b2cp1q8xkbhlqr9dbz8cvf5my"; + libraryHaskellDepends = [ base ]; + description = "Multiprocess architecture library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multirec" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -160624,8 +162424,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.2.0.0"; - sha256 = "0xka2fa5zxznm2fg5xmc2c2ppamwybdlmh5jqy00ivxjmliy20s0"; + version = "0.3.0.0"; + sha256 = "1wz37rrjpk4v8h1mh6pbld84f9kp5h3qcjxxh6fgbkij5l4g7m77"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger safe-exceptions text time @@ -160640,6 +162440,45 @@ self: { broken = true; }) {}; + "net-spider-pangraph" = callPackage + ({ mkDerivation, base, bytestring, doctest, doctest-discover + , greskell, hspec, net-spider, pangraph, text, time + }: + mkDerivation { + pname = "net-spider-pangraph"; + version = "0.1.0.0"; + sha256 = "1aiacaccml8477vmcnv9mqcrn87nyx7pbgwp7rppz7h5w0dsj8lx"; + libraryHaskellDepends = [ + base bytestring greskell net-spider pangraph text time + ]; + testHaskellDepends = [ + base doctest doctest-discover hspec net-spider pangraph text + ]; + description = "Conversion between net-spider and pangraph"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "net-spider-rpl" = callPackage + ({ mkDerivation, aeson, base, greskell, hashable, hspec, ip + , net-spider, net-spider-pangraph, text, time + }: + mkDerivation { + pname = "net-spider-rpl"; + version = "0.1.0.0"; + sha256 = "0basbgcdkjksg9p2s5s0whnbas3w3wnrkkdsr907m8gppkdk6i69"; + libraryHaskellDepends = [ + aeson base greskell hashable ip net-spider net-spider-pangraph text + time + ]; + testHaskellDepends = [ base hspec net-spider text ]; + description = "NetSpider data model and utility for RPL networks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "netclock" = callPackage ({ mkDerivation, base, bytestring, hosc, network }: mkDerivation { @@ -161089,17 +162928,18 @@ self: { }) {}; "network" = callPackage - ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit - , unix + ({ mkDerivation, base, bytestring, directory, doctest, hspec + , hspec-discover, HUnit, unix }: mkDerivation { pname = "network"; - version = "2.8.0.0"; - sha256 = "00skcish0xmm67ax999nv1nll9rm3gqmn92099iczd73nxl55468"; + version = "2.8.0.1"; + sha256 = "0im8k51rw3ahmr23ny10pshwbz09jfg0fdpam0hzf2hgxnzmvxb1"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring directory doctest hspec HUnit ]; + testToolDepends = [ hspec-discover ]; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -161120,6 +162960,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network_3_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, hspec + , hspec-discover, HUnit + }: + mkDerivation { + pname = "network"; + version = "3.1.0.0"; + sha256 = "0xskqnv90h8lc663ilprwgsmx9nv7534kwsv9acxlcfvqy1nnq4s"; + libraryHaskellDepends = [ base bytestring deepseq ]; + testHaskellDepends = [ base bytestring directory hspec HUnit ]; + testToolDepends = [ hspec-discover ]; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-address" = callPackage ({ mkDerivation, base, Cabal, QuickCheck, test-framework , test-framework-quickcheck2 @@ -161281,13 +163137,11 @@ self: { pname = "network-bsd"; version = "2.8.1.0"; sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; - revision = "1"; - editedCabalFile = "0j5dpk1b5qx2rl8w9awrw5ghi8i7fm7zhkdhakcqaqrx8m1yraar"; + revision = "2"; + editedCabalFile = "1cqb720gl960zfzbzxakc2wvrvw8plncgarbb1v1hdzmdxw07js7"; libraryHaskellDepends = [ base deepseq network ]; description = "POSIX network database (<netdb.h>) API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-builder" = callPackage @@ -161783,8 +163637,8 @@ self: { pname = "network-simple"; version = "0.4.3"; sha256 = "0a4hag26ry6lg90q4ppchvrm5xaij50jd4633mhfkfq8scgczm8d"; - revision = "1"; - editedCabalFile = "1xyz4b24vgnidvd43cfmf0k6090dayhfcp6n8x894ibd2mq3vash"; + revision = "2"; + editedCabalFile = "073g0agplvgan62s638w5hcq25biq8f811xhha6drfyxybs6cspn"; libraryHaskellDepends = [ base bytestring network safe-exceptions socks transformers ]; @@ -161816,8 +163670,8 @@ self: { }: mkDerivation { pname = "network-simple-tls"; - version = "0.3.1"; - sha256 = "12kwi2jc8g310wrw7ynq2hfhkxhh95qn0fy205g7a48xrw75npyj"; + version = "0.3.2"; + sha256 = "09fw7ynvry0wjc2nip6kwncl662f7glzq1akiwgh09bwnpbswxsh"; libraryHaskellDepends = [ base bytestring data-default network network-simple safe-exceptions tls transformers x509 x509-store x509-system x509-validation @@ -161826,6 +163680,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-simple-ws" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, network-simple + , safe-exceptions, websockets + }: + mkDerivation { + pname = "network-simple-ws"; + version = "0.1"; + sha256 = "04a0q4q7idah834dvgkl4j1a8fjgrw9qkxppmk5jnvdphq6sxxzd"; + libraryHaskellDepends = [ + base bytestring case-insensitive network-simple safe-exceptions + websockets + ]; + description = "Simple interface to WebSockets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "network-simple-wss" = callPackage + ({ mkDerivation, base, bytestring, network-simple-tls + , network-simple-ws, safe-exceptions, websockets + }: + mkDerivation { + pname = "network-simple-wss"; + version = "0.1"; + sha256 = "1wmicn9zyf4308spf1s7dd4xbi8hfwksdigf62jdm87ywv8jd6rj"; + libraryHaskellDepends = [ + base bytestring network-simple-tls network-simple-ws + safe-exceptions websockets + ]; + description = "Simple interface to TLS secured WebSockets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "network-socket-options" = callPackage ({ mkDerivation, base, network }: mkDerivation { @@ -162292,6 +164180,51 @@ self: { broken = true; }) {}; + "newsletter" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, clientsession + , email-validate, http-api-data, lens, machines, mime-mail, mtl + , network-uri, psqueues, random, servant, servant-blaze + , servant-server, stm, text, time, unordered-containers, warp + }: + mkDerivation { + pname = "newsletter"; + version = "0"; + sha256 = "1cpc0g8bzx7dzvvs3pn76q8y7fkcz2jbh26jfss8bpfy5rwnfmd1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html bytestring clientsession email-validate + http-api-data lens machines mime-mail mtl network-uri psqueues + random servant servant-blaze servant-server stm text time + unordered-containers + ]; + executableHaskellDepends = [ + aeson base blaze-html bytestring clientsession email-validate + http-api-data lens machines mime-mail mtl network-uri psqueues + random servant servant-blaze servant-server stm text time + unordered-containers warp + ]; + description = "A basic newsletter implimentation, using various backends"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "newsletter-mailgun" = callPackage + ({ mkDerivation, base, exceptions, lens, machines, mailgun + , mime-mail, mtl, newsletter, text + }: + mkDerivation { + pname = "newsletter-mailgun"; + version = "0"; + sha256 = "1xzi6kb1mvvj0541l3dvyxwhlhwhw7iyrxqw585lhhinqzkp6zy0"; + libraryHaskellDepends = [ + base exceptions lens machines mailgun mime-mail mtl newsletter text + ]; + description = "A mailgun backend for the newsletter package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "newsynth" = callPackage ({ mkDerivation, base, Cabal, containers, fixedprec, random , superdoc, time @@ -162509,8 +164442,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.7.0.1"; - sha256 = "0gaj4v8hzjjljr5v3l1by6rhin2k8a2wsaff61s5g77gdkcmi2i5"; + version = "1.7.1"; + sha256 = "0dylj1i6370r1yz2rgjpjs5ynsvaqshgvz71200r0q2hqqznax6d"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -162525,8 +164458,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.4.0"; - sha256 = "19x6qzryjdac1alq4wsmy0as6258ga9b3ga3iszqwvqjdpc89a6n"; + version = "0.4.5.0"; + sha256 = "1775syhp5pgm6sdn3x8y3zqzvqrwypl07xm6rkv34sbw5x84mmmv"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -162534,6 +164467,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ngx-export-tools-extra" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , enclosed-exceptions, http-client, ngx-export-tools, snap-core + , snap-server, template-haskell, text, time + }: + mkDerivation { + pname = "ngx-export-tools-extra"; + version = "0.1.0.0"; + sha256 = "0j3bfrmic9zrivsnaf4kzf5bf0inianmnn7v0c21s5ip775k5jy8"; + libraryHaskellDepends = [ + aeson base bytestring containers enclosed-exceptions http-client + ngx-export-tools snap-core snap-server template-haskell text time + ]; + description = "More extra tools for Nginx haskell module"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "niagra" = callPackage ({ mkDerivation, base, ghc-prim, HUnit, mtl, primitive, QuickCheck , text, transformers @@ -164493,8 +166443,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "2.0.0.0"; - sha256 = "0wnvvzd1ry8a3863dyj6ylsh075px7ppd1wrv3cbf9694dc5zfih"; + version = "2.1.0.0"; + sha256 = "02i6nvdk99vjy98r666sb3ik79zq8ssri0nhnfn9r60nfcpsrini"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -165147,24 +167097,24 @@ self: { "odpic-raw" = callPackage ({ mkDerivation, base, binary, bytestring, c2hs, conduit, hspec - , odpic, resourcet, scientific, time + , resourcet, scientific, time }: mkDerivation { pname = "odpic-raw"; - version = "0.4.0"; - sha256 = "0kdsmjksy2dcsc1dgwx8r8fcv1czap06fy8n3wlg29759md1bchm"; + version = "0.5.0"; + sha256 = "1cgg4yvcdysh1l1h8nv9jcn26hfcyx5hxqaqpvfd292c0spylary"; libraryHaskellDepends = [ base binary bytestring conduit resourcet scientific time ]; - librarySystemDepends = [ odpic ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base binary bytestring conduit hspec resourcet scientific time ]; + testToolDepends = [ c2hs ]; description = "Oracle Database Bindings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) odpic;}; + }) {}; "oeis" = callPackage ({ mkDerivation, base, HTTP, HUnit, network, network-uri @@ -165294,23 +167244,25 @@ self: { }) {}; "oidc-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions - , hspec, http-client, http-client-tls, http-types, jose-jwt - , network, network-uri, text, time, tls + ({ mkDerivation, aeson, attoparsec, base, bytestring, cryptonite + , exceptions, hspec, http-client, http-client-tls, http-types + , jose-jwt, network, network-uri, scientific, text, time, tls }: mkDerivation { pname = "oidc-client"; - version = "0.3.0.1"; - sha256 = "0wk1lx3kqgza9dah89p10bza1iasdj4bnbax5x66h2a7imn7c4sk"; + version = "0.4.0.0"; + sha256 = "15lnxxmnpmkvz9zqgz8sq5lzjxvgc5x8a6hrizj3m0mzg9cvml0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base bytestring exceptions http-client - http-client-tls jose-jwt network network-uri text time tls + aeson attoparsec base bytestring cryptonite exceptions http-client + http-client-tls jose-jwt network network-uri scientific text time + tls ]; testHaskellDepends = [ - aeson base bytestring exceptions hspec http-client http-client-tls - http-types jose-jwt network-uri text time + aeson base bytestring cryptonite exceptions hspec http-client + http-client-tls http-types jose-jwt network-uri scientific text + time ]; description = "OpenID Connect 1.0 library for RP"; license = stdenv.lib.licenses.mit; @@ -167079,8 +169031,8 @@ self: { }: mkDerivation { pname = "optparse-applicative-simple"; - version = "1.0.3"; - sha256 = "07v47fa2yc3rxdn1lbgbsq8ggfd7zlknz2ib8wf628g95n0dl7ya"; + version = "1.1"; + sha256 = "0v6nwgk94ax0k281fyxfi42njfi0rw36vrhak9i8k7h5z43xkfr3"; libraryHaskellDepends = [ attoparsec attoparsec-data base-prelude optparse-applicative text ]; @@ -167137,8 +169089,8 @@ self: { }: mkDerivation { pname = "optparse-simple"; - version = "0.1.1.1"; - sha256 = "0nqr81q5rvzpgl3r79rrmf30jzkds8gwdir2w1c9775jy2wslssl"; + version = "0.1.1.2"; + sha256 = "1r00hkri42vyx552l8hcd1779fxiyl9w4k0pql915zsprirn8w82"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168293,30 +170245,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pairing_0_2" = callPackage - ({ mkDerivation, arithmoi, base, bytestring, criterion, cryptonite - , memory, protolude, QuickCheck, quickcheck-instances, random - , tasty, tasty-discover, tasty-hunit, tasty-quickcheck - , wl-pprint-text + "pairing_0_3_0" = callPackage + ({ mkDerivation, arithmoi, base, binary, bytestring, criterion + , cryptonite, errors, integer-logarithms, memory, protolude + , QuickCheck, quickcheck-instances, random, tasty, tasty-discover + , tasty-hunit, tasty-quickcheck, wl-pprint-text }: mkDerivation { pname = "pairing"; - version = "0.2"; - sha256 = "06w1vp9cqzxpqlg3hs68qxn8mjm46bkh7b5428ac6wh7f1zzxw88"; + version = "0.3.0"; + sha256 = "1l8kkyb18qm3mv5jzqyj1wgxlnla0kcah42c2837siqlxwajjbsg"; libraryHaskellDepends = [ - arithmoi base bytestring cryptonite memory protolude QuickCheck - random wl-pprint-text + arithmoi base binary bytestring cryptonite errors + integer-logarithms memory protolude QuickCheck random + wl-pprint-text ]; testHaskellDepends = [ - arithmoi base bytestring cryptonite memory protolude QuickCheck - quickcheck-instances random tasty tasty-discover tasty-hunit - tasty-quickcheck wl-pprint-text + arithmoi base binary bytestring cryptonite errors + integer-logarithms memory protolude QuickCheck quickcheck-instances + random tasty tasty-discover tasty-hunit tasty-quickcheck + wl-pprint-text ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ - arithmoi base bytestring criterion cryptonite memory protolude - QuickCheck quickcheck-instances random tasty tasty-hunit - tasty-quickcheck wl-pprint-text + arithmoi base binary bytestring criterion cryptonite errors + integer-logarithms memory protolude QuickCheck quickcheck-instances + random tasty tasty-hunit tasty-quickcheck wl-pprint-text ]; description = "Optimal ate pairing over Barreto-Naehrig curves"; license = stdenv.lib.licenses.mit; @@ -168459,8 +170413,8 @@ self: { pname = "pandoc"; version = "2.7.2"; sha256 = "1qjla7zk8whx17qapmv3zji6b98qdpd464gwhi4zv8g4hfzv7010"; - revision = "1"; - editedCabalFile = "0xxnb1arycrlxjqnnka4gsz7nff70ahvr6zbrladhigian4mpk9z"; + revision = "3"; + editedCabalFile = "17m7pd1d1q7blavh5vv9m9ll2v9z4pj48k7cn3x6k884c9haicwc"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -168530,7 +170484,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_16_1_3" = callPackage + "pandoc-citeproc_0_16_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , libyaml, mtl, network, old-locale, pandoc, pandoc-types, parsec @@ -168539,8 +170493,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.16.1.3"; - sha256 = "13pd7rfpzpc7a4dn2sasc30icrihv5kgmngyx70s4v42scgsfndg"; + version = "0.16.2"; + sha256 = "15mm17awgi1b5yazwhr5nh8b59qml1qk6pz6gpyijks70fq2arsv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -168590,10 +170544,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.4.0"; - sha256 = "15vfqpfkw4wnsg98804l5ylqbc926s2j5z4ik5zhval4d3kiamgz"; - revision = "3"; - editedCabalFile = "11ajbgw8icgvn8ylfpgnd4sxivlxx2f58363va1gar1kipf7gkar"; + version = "0.3.4.1"; + sha256 = "19hs4akqsg7nlspnbdbyncq8irj0a3h8akmyfzxmi2yb35x7c8ny"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -168837,16 +170789,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pandoc-pyplot_2_1_0_1" = callPackage - ({ mkDerivation, base, containers, data-default-class, directory - , filepath, hashable, hspec, hspec-expectations, pandoc - , pandoc-types, tasty, tasty-hspec, tasty-hunit, temporary, text - , typed-process, yaml + "pandoc-pyplot_2_1_1_0" = callPackage + ({ mkDerivation, base, containers, data-default-class, deepseq + , directory, filepath, hashable, hspec, hspec-expectations + , open-browser, pandoc, pandoc-types, tasty, tasty-hspec + , tasty-hunit, template-haskell, temporary, text, typed-process + , yaml }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.1.0.1"; - sha256 = "0hhsy90chq3ap54816qhpplxg4c8iwdvx8xrcrn2n0p3yi2ma0yi"; + version = "2.1.1.0"; + sha256 = "0s66m591v6x91qqdkyxl40zwlv6nan86zfq5z4cx73yz9xf3gjsx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168854,13 +170807,14 @@ self: { pandoc pandoc-types temporary text typed-process yaml ]; executableHaskellDepends = [ - base data-default-class directory pandoc-types + base data-default-class deepseq directory filepath open-browser + 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 for including figures generated from Matplotlib"; + description = "A Pandoc filter to include figures generated from Python code blocks"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -170263,6 +172217,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parsers_0_12_10" = callPackage + ({ mkDerivation, attoparsec, base, base-orphans, binary, bytestring + , charset, containers, mtl, parsec, QuickCheck + , quickcheck-instances, scientific, semigroups, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "parsers"; + version = "0.12.10"; + sha256 = "0v0smxbzk1qpdfkfqqmrzd2dngv3vxba10mkjn9nfm6a309izf8p"; + libraryHaskellDepends = [ + attoparsec base base-orphans binary charset containers mtl parsec + scientific semigroups text transformers unordered-containers + ]; + testHaskellDepends = [ + attoparsec base bytestring parsec QuickCheck quickcheck-instances + ]; + description = "Parsing combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parsers-megaparsec" = callPackage ({ mkDerivation, base, fail, megaparsec, mtl, parsers, semigroups , text, transformers @@ -170321,8 +172297,8 @@ self: { }: mkDerivation { pname = "parsix"; - version = "0.2.0.0"; - sha256 = "07azgir8gkjbr2if8cvcmlqf3v9bi27w4xh922j0r9q1c3ry7k5i"; + version = "0.2.1.0"; + sha256 = "1282mzlriyl4gi0l2ds4a3prjh6q0vl5cv14ms03999hmygpnr3l"; libraryHaskellDepends = [ base containers fingertree mtl parsers prettyprinter prettyprinter-ansi-terminal text transformers @@ -172113,6 +174089,25 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "perfect-vector-shuffle" = callPackage + ({ mkDerivation, base, MonadRandom, primitive, QuickCheck + , quickcheck-instances, random, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "perfect-vector-shuffle"; + version = "0.1.0"; + sha256 = "1nvwbmfqv9bq6423hxafjrvza6ynj3pry4m5ms1g2yf5vsx47w38"; + libraryHaskellDepends = [ + base MonadRandom primitive random vector + ]; + testHaskellDepends = [ + base QuickCheck quickcheck-instances random tasty tasty-quickcheck + vector + ]; + description = "Library for performing vector shuffles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "perfecthash" = callPackage ({ mkDerivation, array, base, bytestring, cmph, containers , criterion, deepseq, hspec, QuickCheck, random, time @@ -172269,8 +174264,8 @@ self: { }: mkDerivation { pname = "persist"; - version = "0.1.1.2"; - sha256 = "08l59z7jc1ij7y497yjvv0q9bcd100l3bkdj4zwjl3dx6fhz2gq2"; + version = "0.1.1.3"; + sha256 = "0lcjk2q9x0qclc3znwv9xrqqwbczw2ryvamfqa6hvabr618lmi4p"; libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -172402,6 +174397,35 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent_2_10_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, bytestring, conduit, containers, fast-logger, hspec + , http-api-data, monad-logger, mtl, path-pieces, resource-pool + , resourcet, scientific, silently, template-haskell, text, time + , transformers, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.10.0"; + sha256 = "1ja34gdwf72rxnz3v5d9wjri11285fpzxn8sh9ws7ldrx3kfqy1g"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger http-api-data monad-logger mtl + path-pieces resource-pool resourcet scientific silently + template-haskell text time transformers unliftio-core + unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + containers hspec http-api-data path-pieces scientific text time + transformers unordered-containers vector + ]; + description = "Type-safe, multi-backend data serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -172467,6 +174491,28 @@ self: { broken = true; }) {}; + "persistent-documentation" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover, mtl + , persistent, persistent-template, template-haskell, text + }: + mkDerivation { + pname = "persistent-documentation"; + version = "0.1.0.0"; + sha256 = "1m9hmvi6krksb64k5mqkqpcz3670xjbqr4vic0x1n350ji2mrngd"; + revision = "1"; + editedCabalFile = "06nrr2c4pprrgl4d2iwi8np7714rx685g4dagaad79q5x01k4d8v"; + libraryHaskellDepends = [ + base containers mtl persistent template-haskell text + ]; + testHaskellDepends = [ + base containers hspec hspec-discover persistent persistent-template + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Documentation DSL for persistent entities"; + license = stdenv.lib.licenses.asl20; + }) {}; + "persistent-equivalence" = callPackage ({ mkDerivation, array, base, diffarray }: mkDerivation { @@ -172599,13 +174645,42 @@ self: { pname = "persistent-mysql"; version = "2.9.0"; sha256 = "0aa1ia4r49vy5hfg59rbrfmfwdyaix0l32drdjnj9xxqbayifjzf"; + revision = "1"; + editedCabalFile = "0xvis08x4ajayp73f6j0czpksn309f3anv5kklxa9r6j8j5qkhvz"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + description = "Backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + }) {}; + + "persistent-mysql_2_10_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, HUnit, monad-logger, mysql + , mysql-simple, persistent, persistent-qq, persistent-template + , persistent-test, QuickCheck, quickcheck-instances, resource-pool + , resourcet, text, time, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.10.0"; + sha256 = "13y65l0vaiczxndah2djh28j4jhslymb53gnfz3av24kg5vb2y4n"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text transformers unliftio-core ]; + testHaskellDepends = [ + base bytestring containers fast-logger hspec HUnit monad-logger + mysql persistent persistent-qq persistent-template persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio-core + ]; description = "Backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-mysql-haskell" = callPackage @@ -172677,6 +174752,8 @@ self: { pname = "persistent-postgresql"; version = "2.9.1"; sha256 = "02i5lq6j79cv1y6n7c3lzipngkwaqfa96i4nvnkrs535x9xbxlpq"; + revision = "1"; + editedCabalFile = "186fbykla4hpsl14l1ccjr3rfdabl47c9x28m290477ilaygk685"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger persistent postgresql-libpq postgresql-simple resource-pool @@ -172687,6 +174764,36 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-postgresql_2_10_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, hspec-expectations, HUnit + , monad-logger, persistent, persistent-qq, persistent-template + , persistent-test, postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet, text, time + , transformers, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.10.0"; + sha256 = "00kc14zf6ggblyps68qvg7d0s4wbsz0iv96sdvjv5rsqwblrav18"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + persistent postgresql-libpq postgresql-simple resource-pool + resourcet text time transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations HUnit monad-logger persistent persistent-qq + persistent-template persistent-test QuickCheck quickcheck-instances + resourcet text time transformers unliftio-core unordered-containers + vector + ]; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -172876,6 +174983,41 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_10_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger + , persistent, persistent-template, persistent-test, QuickCheck + , resource-pool, resourcet, sqlite, system-fileio, system-filepath + , temporary, text, time, transformers, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.10.0"; + sha256 = "1h3ls1wg02q7336zqfrpggx64f1wm3x701dvkwvci6yn4hqvkpn2"; + revision = "1"; + editedCabalFile = "1kxqz47h2gxinck114ip75brbm0wsimff5fdzldv72mqv7id66nl"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + persistent resource-pool resourcet text time transformers + unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base bytestring containers exceptions fast-logger hspec HUnit + monad-logger persistent persistent-template persistent-test + QuickCheck resourcet system-fileio system-filepath temporary text + time transformers unliftio-core + ]; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -172886,8 +175028,8 @@ self: { pname = "persistent-template"; version = "2.5.4"; sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc"; - revision = "3"; - editedCabalFile = "12f4pqxwfv2li78sd9s56p66xd0w465cmjycpkqvg8n1rjxkc8vs"; + revision = "4"; + editedCabalFile = "08yb4kcmpqmm50lwrbmavd0zhgg6p7bl8dy026xw644cazrzcvr1"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -172901,23 +175043,27 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_6_0" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers - , ghc-prim, hspec, http-api-data, monad-control, monad-logger - , path-pieces, persistent, QuickCheck, tagged, template-haskell - , text, transformers, unordered-containers + "persistent-template_2_7_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, deepseq-generics, file-embed, hspec, http-api-data + , monad-control, monad-logger, path-pieces, persistent, QuickCheck + , template-haskell, text, transformers, unordered-containers }: mkDerivation { pname = "persistent-template"; - version = "2.6.0"; - sha256 = "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv"; + version = "2.7.0"; + sha256 = "0pz750b7ybg27nl9b7hiw25vg0dwjy8196c6kpj1xwfgcxkdizq5"; libraryHaskellDepends = [ - aeson aeson-compat base bytestring containers ghc-prim - http-api-data monad-control monad-logger path-pieces persistent - tagged template-haskell text transformers unordered-containers + aeson base bytestring containers http-api-data monad-control + monad-logger path-pieces persistent template-haskell text + transformers unordered-containers ]; testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text transformers + aeson base bytestring hspec persistent QuickCheck text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq deepseq-generics file-embed persistent + template-haskell text ]; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; @@ -172995,8 +175141,8 @@ self: { }: mkDerivation { pname = "persistent-typed-db"; - version = "0.0.1.1"; - sha256 = "0cn9dyv5gzkjn9jbv2srw94akz1rpgxsvn1hv1ik90a8sl3drh9n"; + version = "0.1.0.0"; + sha256 = "0wlz2d6v4ks376amp26fxw5wj381kqaghp25mry073krc7yqz6yv"; libraryHaskellDepends = [ aeson base bytestring conduit http-api-data monad-logger path-pieces persistent persistent-template resource-pool resourcet @@ -174421,6 +176567,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-brotli" = callPackage + ({ mkDerivation, base, brotli, bytestring, pipes, pipes-bytestring + , QuickCheck + }: + mkDerivation { + pname = "pipes-brotli"; + version = "0.0.0.0"; + sha256 = "0qld1j404sddw850pdm5y65n8rld5vqzpr38kq9xcnlxmfs29zhp"; + libraryHaskellDepends = [ base brotli bytestring pipes ]; + testHaskellDepends = [ + base bytestring pipes pipes-bytestring QuickCheck + ]; + description = "Brotli (RFC7932) compressors and decompressors for the Pipes package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "pipes-bytestring" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse , stringsearch, transformers @@ -174994,6 +177158,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-network-ws" = callPackage + ({ mkDerivation, base, bytestring, network-simple-ws, pipes }: + mkDerivation { + pname = "pipes-network-ws"; + version = "0.1"; + sha256 = "1jb59wl3xh0jkp4njj7xhybhnanwrx6h0zzj647lgxg6wpf8f704"; + libraryHaskellDepends = [ + base bytestring network-simple-ws pipes + ]; + description = "WebSockets support for pipes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-ordered-zip" = callPackage ({ mkDerivation, base, foldl, pipes }: mkDerivation { @@ -175660,20 +177837,20 @@ self: { "planb-token-introspection" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , exceptions, http-client, http-client-tls, http-types, lens, mtl - , random, safe-exceptions, tasty, tasty-hunit, text, th-format - , transformers, unliftio-core + , random, safe-exceptions, tasty, tasty-hunit, text, transformers + , unliftio-core }: mkDerivation { pname = "planb-token-introspection"; - version = "0.1.3.0"; - sha256 = "1n7ck623ik3rss5vhby9wz8q5r1kfww678d3yiqkx7pg5fn4rwmk"; + version = "0.1.4.0"; + sha256 = "0rgjvxs1bb6qz02g2y8b4cldmgn05kfzjbb81ny57724yv60xyp7"; libraryHaskellDepends = [ aeson aeson-casing base bytestring containers http-client http-client-tls http-types mtl safe-exceptions text transformers ]; testHaskellDepends = [ aeson base bytestring containers exceptions http-client http-types - lens mtl random safe-exceptions tasty tasty-hunit text th-format + lens mtl random safe-exceptions tasty tasty-hunit text unliftio-core ]; description = "Token Introspection for PlanB"; @@ -175838,8 +178015,8 @@ self: { }: mkDerivation { pname = "playlists-http"; - version = "0.2.1.0"; - sha256 = "1kzc1awfqk979h2hmpqh2pjiy33v140pibbp703hqbq0fkrynj2k"; + version = "0.2.1.1"; + sha256 = "1smshj9ib0fp9kd7bsj15nq6vglzrdy8wzs3l6pi1rf6sjhjhb3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176697,6 +178874,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "poly" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes + , semirings, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "poly"; + version = "0.2.0.0"; + sha256 = "19jdm2508ncwcci8bi9hwpaak3cymhbynnk3whmh0g6rny6zdla4"; + libraryHaskellDepends = [ base primitive semirings vector ]; + testHaskellDepends = [ + base QuickCheck quickcheck-classes semirings tasty tasty-quickcheck + vector + ]; + description = "Polynomials"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "poly-arity" = callPackage ({ mkDerivation, base, constraints }: mkDerivation { @@ -176818,6 +179014,8 @@ self: { pname = "polynomial"; version = "0.7.3"; sha256 = "0wl9wdaqrs6hs83xi27m879j7i2q04v14jqkrwns2qy3f2yhq2rr"; + revision = "1"; + editedCabalFile = "1cn1fj9hlzwvk65rpn60n74bdzk2bdicwp2rqb34ps5sccvbm1ij"; libraryHaskellDepends = [ base deepseq pretty vector vector-space vector-th-unbox ]; @@ -176860,8 +179058,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "0.1.1.0"; - sha256 = "02x99b3pral2sclx4zizib9a7yrnahg0d5kc4w37yk15mpr5lmys"; + version = "0.1.2.0"; + sha256 = "18713nqrijbciwhazy7nvs3zizkxz2cs3c7q8xkc5j4bgk90vsxm"; libraryHaskellDepends = [ base mtl random syb template-haskell transformers ]; @@ -176877,6 +179075,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polysemy-plugin" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, hspec, polysemy }: + mkDerivation { + pname = "polysemy-plugin"; + version = "0.1.0.0"; + sha256 = "0zsgvb5l740a1mxjrjaxmzlcqd9qvzx973slnvb299z0l2h322fr"; + libraryHaskellDepends = [ base ghc ghc-tcplugins-extra polysemy ]; + testHaskellDepends = [ + base ghc ghc-tcplugins-extra hspec polysemy + ]; + description = "Disambiguate obvious uses of effects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "polysemy-zoo" = callPackage + ({ mkDerivation, base, containers, hspec, polysemy, polysemy-plugin + }: + mkDerivation { + pname = "polysemy-zoo"; + version = "0.1.0.0"; + sha256 = "0hiwv4fnila9ql3wxyni84z1209w7cd088gllw9n903qa41ncsqj"; + libraryHaskellDepends = [ + base containers polysemy polysemy-plugin + ]; + testHaskellDepends = [ + base containers hspec polysemy polysemy-plugin + ]; + description = "Experimental, user-contributed effects and interpreters for polysemy"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "polyseq" = callPackage ({ mkDerivation, array, base, bytestring, cgi, containers , free-theorems, haskell-src, mtl, network, old-locale, old-time @@ -176961,8 +179190,10 @@ self: { }: mkDerivation { pname = "pomaps"; - version = "0.0.2.0"; - sha256 = "08mlj61archpiqq8375gi5ha9mpxgpnsfpsx3kqja92dgj0aq5q6"; + version = "0.0.2.1"; + sha256 = "1p0sqh87scpff1j4q4mpb3dyml0vsh2yrhdc7hv0rbm0vhy2bvla"; + revision = "1"; + editedCabalFile = "0v1s35ddx697rzgp08p6brn801w7gky73w1qll3d10vy4qbhs435"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -177260,8 +179491,8 @@ self: { ({ mkDerivation, async, base, hspec, network, stm, transformers }: mkDerivation { pname = "port-utils"; - version = "0.2.0.0"; - sha256 = "1lvalwbizmvrrpbl2l1lblbv0c3qln1ln61x61zn26jxq2h8p7g1"; + version = "0.2.1.0"; + sha256 = "1phpf6n7bjg3a22syh45xsiczqlay82z3isdn6dq5alxdaa31y5n"; libraryHaskellDepends = [ base network ]; testHaskellDepends = [ async base hspec network stm transformers ]; description = "Utilities for creating and waiting on ports"; @@ -177951,8 +180182,8 @@ self: { }: mkDerivation { pname = "postgresql-simple"; - version = "0.6.1"; - sha256 = "0hc3zarmykf0hvc5jr0rm66z4kar73zp737m4vg0y2nc2k5yp9m8"; + version = "0.6.2"; + sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -179354,8 +181585,8 @@ self: { }: mkDerivation { pname = "pretty-ghci"; - version = "0.1.0.0"; - sha256 = "0g3vssp09n77p05z7y36iddq05gymzlaar6k3k3si49il0cl56v7"; + version = "0.2.0.0"; + sha256 = "1ng4ypjz3yq2f536pd89bkwsdc2icfkw54ys5j5kzm75khgkhqg1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179828,6 +182059,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive-atomic" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-atomic"; + version = "0.1.0.0"; + sha256 = "0qprxv3y1ayrdz9spgg1vkx5jkh0p5pz49c3gaaxcz8v0pdk0bzv"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base primitive ]; + description = "Wrappers for primops around atomic operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primitive-checked" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { @@ -180248,6 +182491,8 @@ self: { pname = "proc-net"; version = "1.0.0.2"; sha256 = "04zx462sj8kh21a8n7kk3jpcvdh6s64pvgdb0la0sxq0jycfybzz"; + revision = "1"; + editedCabalFile = "1ng8xnvzylj2f635kfwmdwhgjshbsmcm1x5c7bscz2m9x10brmhn"; libraryHaskellDepends = [ attoparsec base bytestring network unix ]; @@ -181251,8 +183496,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.7.0"; - sha256 = "0a46lqc77l4dlimvqf57n48zf0qschk04xyjbvyhcj4yw9jn9jdn"; + version = "5.8.0"; + sha256 = "0dzil48ayfy30cx1mxhp712nibr7qc3hn2pkc11nawkf2g73552f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181483,8 +183728,8 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.6"; - sha256 = "1ij221zy2m7g9wp05ksk7labminvp6zynylfh4bc7z50qmhbwgr3"; + version = "0.1.2.7"; + sha256 = "092gdxw1jbhp0pxzgyg8jmcwiimyhzvhxh29h7c7vmvb6m956d0f"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -181720,6 +183965,69 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto3-suite" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, binary, bytestring, cereal, containers + , contravariant, deepseq, doctest, filepath, foldl, hashable + , haskell-src, insert-ordered-containers, lens, mtl + , neat-interpolation, optparse-generic, parsec, parsers, pretty + , pretty-show, proto3-wire, QuickCheck, quickcheck-instances + , range-set-list, safe, semigroups, swagger2, system-filepath + , tasty, tasty-hunit, tasty-quickcheck, text, transformers, turtle + , vector + }: + mkDerivation { + pname = "proto3-suite"; + version = "0.3.0.0"; + sha256 = "1dmblb640jc2smm023py3sg49k07v85qmalir5swkj154vlszgli"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring binary + bytestring cereal containers contravariant deepseq filepath foldl + hashable haskell-src insert-ordered-containers lens mtl + neat-interpolation parsec parsers pretty pretty-show proto3-wire + QuickCheck quickcheck-instances safe semigroups swagger2 + system-filepath text transformers turtle vector + ]; + executableHaskellDepends = [ + base containers optparse-generic proto3-wire range-set-list + system-filepath text turtle + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring cereal + containers doctest pretty-show proto3-wire QuickCheck semigroups + swagger2 tasty tasty-hunit tasty-quickcheck text transformers + turtle vector + ]; + description = "A low level library for writing out data in the Protocol Buffers wire format"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "proto3-wire" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, deepseq + , doctest, hashable, QuickCheck, safe, tasty, tasty-hunit + , tasty-quickcheck, text, unordered-containers + }: + mkDerivation { + pname = "proto3-wire"; + version = "1.0.0"; + sha256 = "1r090s4mqmx0ixr8y6xyzkgcwv0sfjwah7jhb4vr75zpzsvx0bqk"; + libraryHaskellDepends = [ + base bytestring cereal containers deepseq hashable QuickCheck safe + text unordered-containers + ]; + testHaskellDepends = [ + base bytestring cereal doctest QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; + license = stdenv.lib.licenses.asl20; + }) {}; + "protobuf" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cereal, containers , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged @@ -182738,8 +185046,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.1.0.0"; - sha256 = "01r6pzv0c49lk2z68jz6z9fppdhdjyg7igl6ji44w1rmgpiaircj"; + version = "0.1.0.1"; + sha256 = "0igjid6rfg13bhgkm51np0ml2sfnkg5a6z3231mmiynkdja7l5zl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182773,8 +185081,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.12.4"; - sha256 = "1lkicclh9gm3lwgi2vl7qqa2vzf763rw06m79mr1j291z4h2ym76"; + version = "0.12.5"; + sha256 = "0dpn0v510lgzd9zqglqan4m8l7bf891psqmih147pnrmigmiaa39"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182996,6 +185304,8 @@ self: { testHaskellDepends = [ aeson base hspec ]; description = "Send push notifications to mobile iOS devices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "push-notify-ccs" = callPackage @@ -183845,6 +186155,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quadratic-irrational_0_1_0" = callPackage + ({ mkDerivation, arithmoi, base, containers, directory, doctest + , filepath, mtl, numbers, QuickCheck, tasty, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "quadratic-irrational"; + version = "0.1.0"; + sha256 = "0kfgvixvcawfhw4vv0zg2r0d6hrlak01q9isqc3n3lc63qaifxgy"; + libraryHaskellDepends = [ arithmoi base containers transformers ]; + testHaskellDepends = [ + arithmoi base directory doctest filepath mtl numbers QuickCheck + tasty tasty-quickcheck + ]; + description = "An implementation of quadratic irrationals"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quandl-api" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , http-conduit, http-types, syb, text, time, time-locale-compat @@ -184289,6 +186618,29 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; + version = "0.6.0.0"; + sha256 = "02ssvvhi87ggyxi3jsg2h1xirwqyydda88n5ax4imfljvig366cy"; + libraryHaskellDepends = [ + aeson base base-orphans bifunctors containers fail primitive + QuickCheck semigroupoids semigroups semirings tagged transformers + ]; + testHaskellDepends = [ + aeson base base-orphans containers primitive QuickCheck + semigroupoids tagged tasty tasty-quickcheck transformers vector + ]; + description = "QuickCheck common typeclasses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "quickcheck-classes_0_6_1_0" = callPackage + ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers + , fail, primitive, QuickCheck, semigroupoids, semigroups, semirings + , tagged, tasty, tasty-quickcheck, transformers, vector + }: + mkDerivation { + pname = "quickcheck-classes"; version = "0.6.1.0"; sha256 = "01mqsffks1d0wf3vwrlmalqxqha2gfqa389gqq0zr5b9y7ka5a8h"; libraryHaskellDepends = [ @@ -184530,6 +186882,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-simple_0_1_1_0" = callPackage + ({ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-special" = callPackage ({ mkDerivation, base, QuickCheck, special-values }: mkDerivation { @@ -185572,6 +187936,8 @@ self: { pname = "ralist"; version = "0.2.1.1"; sha256 = "0fy8c36ygdn609nq6wasc685y3z7g188nkhym7bpb7rigi1si7xj"; + revision = "1"; + editedCabalFile = "187idyc9b2q476xxxnpgglf818vp701ww0ir5j4dn96g0qwni8xb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -186159,6 +188525,26 @@ self: { broken = true; }) {}; + "rank2classes_1_3" = callPackage + ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit + , template-haskell, transformers + }: + mkDerivation { + pname = "rank2classes"; + version = "1.3"; + sha256 = "1mwwismxafz43qjqh74gjd8d1hiflkilkxkwfvwhq0gx4h4i0rq1"; + libraryHaskellDepends = [ + base distributive template-haskell transformers + ]; + testHaskellDepends = [ + base distributive doctest tasty tasty-hunit + ]; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rapid" = callPackage ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { @@ -186558,6 +188944,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rattle" = callPackage + ({ mkDerivation, base, bytestring, cryptohash-sha256, deepseq + , directory, extra, filepath, filepattern, hashable, shake, time + , transformers, unordered-containers + }: + mkDerivation { + pname = "rattle"; + version = "0.1"; + sha256 = "10ra58lqhi9pn92rgyv6lkz7036kbq9gr6ly5w1lqdayla10fqhr"; + revision = "1"; + editedCabalFile = "1ppli9l28b4pg6h57kx7vvy0wqacn4vx86bvrgjcwwlvlir49scw"; + libraryHaskellDepends = [ + base bytestring cryptohash-sha256 deepseq directory extra filepath + hashable shake time transformers unordered-containers + ]; + testHaskellDepends = [ base directory extra filepattern shake ]; + description = "Forward build system, with caching and speculation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, clock, containers, filepath, http-client @@ -186591,7 +188999,7 @@ self: { broken = true; }) {}; - "rattletrap_6_2_3" = callPackage + "rattletrap_6_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, clock, containers, filepath, http-client , http-client-tls, HUnit, template-haskell, temporary, text @@ -186599,8 +189007,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "6.2.3"; - sha256 = "0h542a6i1rc1zh2xy4fc9cdaq424hka77mxndg2ka8a0c0mj0jfp"; + version = "6.3.0"; + sha256 = "0b20ih5b1g74zpdyhlpi9j98zjimad1b6lwmxqqdcviw2wwih28p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186884,14 +189292,44 @@ self: { broken = true; }) {}; + "rcu_0_2_4" = callPackage + ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest + , containers, criterion, deepseq, doctest, fail, ghc-prim + , optparse-applicative, parallel, primitive, rdtsc, time + , transformers + }: + mkDerivation { + pname = "rcu"; + version = "0.2.4"; + sha256 = "1zl6gl6b9x2ppxzrvb356216f7gi1kpwxsqb0w220f86wyzf9gbr"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + atomic-primops base fail ghc-prim parallel primitive transformers + ]; + executableHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base doctest parallel ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq ghc-prim optparse-applicative + primitive rdtsc time transformers + ]; + description = "Read-Copy-Update for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rdf" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq , dlist, fgl, text, transformers }: mkDerivation { pname = "rdf"; - version = "0.1.0.2"; - sha256 = "0vqznprx5r7lqyj8b850pfyy7mvin55l1v4krmi1wyacynv977c8"; + version = "0.1.0.3"; + sha256 = "0bypvzr4xj3nvq839slhjcl6lzs4zp34yg6q3hdkwa5vgall6x2s"; + revision = "1"; + editedCabalFile = "0x5zdjbyrpap5qs40yl0m96fcgy11f6s5r3v0n8n5904cxa5sqy3"; libraryHaskellDepends = [ attoparsec base bytestring deepseq dlist fgl text transformers ]; @@ -187971,8 +190409,10 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.1.2"; - sha256 = "0mya8lijdnxw3vm0dqp878gqmd3qfymk1dnp6hqihbvsnzm5l910"; + version = "5.1.3"; + sha256 = "0a0mkwy3sxg5f1mdlblpn0xl3lwgilnmzs94jqab0pqx9gjkc5xj"; + revision = "1"; + editedCabalFile = "0zxcmga4fy42arbyv1kzbyfnsghnll3prkpva58x654x4cg4diwk"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers @@ -188753,6 +191193,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reflex-dom-svg" = callPackage + ({ mkDerivation, base, containers, lens, reflex, reflex-dom-core + , safe, text + }: + mkDerivation { + pname = "reflex-dom-svg"; + version = "0.3.2.0"; + sha256 = "0xmhccim3n6qk1dj4qyf6rhaygrpb2wzhl00rwm74cqw7ljrf5y9"; + libraryHaskellDepends = [ + base containers lens reflex reflex-dom-core safe text + ]; + description = "Reflex functions for SVG elements"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-gloss" = callPackage ({ mkDerivation, base, dependent-sum, gloss, mtl, reflex , transformers @@ -189704,8 +192161,37 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.3.4"; - sha256 = "1l26b1isxqfax7c91l23fqx2kyl5cw4j2b6i0jiiz8lcn71qy0ha"; + version = "0.1.3.5"; + sha256 = "1nyk32bimkhsbz2597hdy089c7w5025wj9yfj1i3gd0145liaf2h"; + libraryHaskellDepends = [ + base containers exceptions hashable mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions generic-lens hashable hedgehog + hedgehog-corpus io-memoize 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_3_6" = callPackage + ({ mkDerivation, async, base, containers, exceptions, generic-lens + , hashable, hedgehog, hedgehog-corpus, io-memoize, 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.3.6"; + sha256 = "19wch1vd41r3hvgr9a1yjvbiz7fmib1qlhviqivsdd5apncgn2jk"; libraryHaskellDepends = [ base containers exceptions hashable mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -190822,6 +193308,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "repline_0_2_1_0" = callPackage + ({ mkDerivation, base, containers, fail, haskeline, mtl, process }: + mkDerivation { + pname = "repline"; + version = "0.2.1.0"; + sha256 = "0yxfn6p4gprnv8hzpzh7872fs3l661d587v4kkp51mjyydpiihs5"; + libraryHaskellDepends = [ + base containers fail haskeline mtl process + ]; + description = "Haskeline wrapper for GHCi-like REPL interfaces"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "repo-based-blog" = callPackage ({ mkDerivation, base, blaze-html, containers, data-default , directory, dyre, filepath, filestore, hspec, hspec-discover @@ -191005,6 +193505,8 @@ self: { pname = "req"; version = "2.0.1"; sha256 = "1mfm6yy23l64kqbxvp1yn3yqf7fl46as87rz4yazg7f5x13bas3r"; + revision = "1"; + editedCabalFile = "1ghz63gcgkfd7hqx3ff97fg6m3cw1ariqk06ck2x75cn4y42myvn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -191910,15 +194412,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "retry_0_8_0_0" = callPackage + "retry_0_8_0_1" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers }: mkDerivation { pname = "retry"; - version = "0.8.0.0"; - sha256 = "0m44firqn9bkspj2jjf88kksf7mjmbi00xz0855lnflc8b3377cf"; + version = "0.8.0.1"; + sha256 = "0x63grjv0r96gv8ksh6r6aja6fvnwr06bypigvkskzhjjbk3fhcx"; libraryHaskellDepends = [ base exceptions ghc-prim random transformers ]; @@ -193467,8 +195969,8 @@ self: { }: mkDerivation { pname = "ron-rdt"; - version = "0.5"; - sha256 = "0djqbr5wiillk0ksbhvnswrxq3jz8cfd7m2kw0g1207kd29vvbd3"; + version = "0.6"; + sha256 = "0npd4fh3flywfrpnwfsfpss4zbzd9jj9xsbpxlcc4hhjh45x1b6b"; libraryHaskellDepends = [ base containers Diff hashable integer-gmp mtl ron text time transformers unordered-containers @@ -193484,8 +195986,8 @@ self: { }: mkDerivation { pname = "ron-schema"; - version = "0.5"; - sha256 = "13i7hnl3l890r5y106b957nlvv3v2h6l2gmkq77pizlqlyv73jzi"; + version = "0.6"; + sha256 = "07nn74vwx26flam7klwfvj4yz5mqh8d5flf5ps7wxxfn70z3g4yg"; libraryHaskellDepends = [ base bytestring containers hedn integer-gmp megaparsec mtl ron ron-rdt template-haskell text transformers @@ -193501,8 +196003,8 @@ self: { }: mkDerivation { pname = "ron-storage"; - version = "0.6"; - sha256 = "07bnvlamw8cdw9s8fra9fd1jz3sw203jnimj2ad50rahn2r3zrnq"; + version = "0.7"; + sha256 = "0wqvbnylz2wx85c7qfqzima3axif6r65vc0iwl8lrmxpif2zs41c"; libraryHaskellDepends = [ base bytestring containers directory filepath integer-gmp mtl network-info ron ron-rdt stm text transformers @@ -194767,6 +197269,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safe-decimal" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hspec, hspec-discover + , QuickCheck, scientific + }: + mkDerivation { + pname = "safe-decimal"; + version = "0.1.0.0"; + sha256 = "10y618swfxvz38fm95i6jbki5ax6w6xxhrdizqlrbwnqdjlsj681"; + revision = "1"; + editedCabalFile = "0449df25rah097rsbrbkb8sb4n80yms06isg0g8mp7v8ah4ssrs3"; + libraryHaskellDepends = [ base deepseq exceptions scientific ]; + testHaskellDepends = [ base deepseq hspec QuickCheck scientific ]; + testToolDepends = [ hspec-discover ]; + description = "Safe and very efficient arithmetic operations on fixed decimal point numbers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "safe-exceptions" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, transformers , void @@ -194864,6 +197383,32 @@ self: { broken = true; }) {}; + "safe-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , generic-arbitrary, hashable, quickcheck-instances, scientific + , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time + , unordered-containers, uuid, uuid-types, vector + }: + mkDerivation { + pname = "safe-json"; + version = "0.1.0"; + sha256 = "17h5z20fcqp6gsmml1zqhckxgvc7jrx4mzdcqbsjlmpy52hb0lxq"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist hashable scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers dlist generic-arbitrary hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + temporary text time unordered-containers uuid uuid-types vector + ]; + description = "Automatic JSON format versioning"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "safe-lazy-io" = callPackage ({ mkDerivation, base, extensible-exceptions, parallel, strict-io }: @@ -195327,22 +197872,23 @@ self: { broken = true; }) {}; - "salak_0_2_9" = callPackage - ({ mkDerivation, attoparsec, base, containers, data-default - , directory, filepath, hspec, menshen, mtl, pqueue, QuickCheck - , scientific, text, time + "salak_0_2_9_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, directory, filepath, hspec, menshen, mtl, pqueue + , QuickCheck, scientific, text, time, unliftio-core }: mkDerivation { pname = "salak"; - version = "0.2.9"; - sha256 = "1zq8sr5m10bkglwiscadprs4rdj5irpkgpd4ya72r4f61waba5fd"; + version = "0.2.9.3"; + sha256 = "0y1p2cf8bpglqf20a16d2h5xfknzz6wcdgwv6mamh24mdqv0c3rn"; libraryHaskellDepends = [ - attoparsec base containers data-default directory filepath menshen - mtl pqueue scientific text time + attoparsec base bytestring containers data-default directory + filepath menshen mtl pqueue scientific text time unliftio-core ]; testHaskellDepends = [ - attoparsec base containers data-default directory filepath hspec - menshen mtl pqueue QuickCheck scientific text time + attoparsec base bytestring containers data-default directory + filepath hspec menshen mtl pqueue QuickCheck scientific text time + unliftio-core ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; @@ -195356,8 +197902,8 @@ self: { }: mkDerivation { pname = "salak-toml"; - version = "0.2.9"; - sha256 = "1v5lc98dva6y2d6pqbwipnan2hyrhisx6c57r1rbw0lsalh7vpqx"; + version = "0.2.9.3"; + sha256 = "1hb5ddm7a9acwri730w50p14vyk6z8q1wnx2b87386d80am5mbpy"; libraryHaskellDepends = [ base mtl salak text time tomland unordered-containers ]; @@ -195377,9 +197923,9 @@ self: { }: mkDerivation { pname = "salak-yaml"; - version = "0.2.9"; - sha256 = "162gz0rs73ls1r3y9dfg3pz47nnc7mk5hmvxms814jspac27c1h5"; - libraryHaskellDepends = [ base conduit libyaml mtl salak text ]; + version = "0.2.9.3"; + sha256 = "0jjmw923zvm349q318iw7y5lfqhbr85xgp6ai3xx5w5d4mcb2f32"; + libraryHaskellDepends = [ base conduit libyaml salak text ]; testHaskellDepends = [ base conduit hspec libyaml mtl QuickCheck salak text ]; @@ -196583,6 +199129,8 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schedyield" = callPackage @@ -196988,8 +199536,8 @@ self: { pname = "scotty"; version = "0.11.3"; sha256 = "14570k1klrlwra58zz7ip3j41nc75gaswrp8m4xwlrjzgpdqm70a"; - revision = "1"; - editedCabalFile = "0pcaw6wr8nqs7pl64pb00zxd359np5x35159lqkqlcziiv0n2g3b"; + revision = "2"; + editedCabalFile = "0d5ls120fq9xfdsdzj1xgfh2prpcz46i4kc54r6pd6ncpnkfalyi"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types monad-control mtl @@ -197005,6 +199553,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scotty_0_11_4" = callPackage + ({ mkDerivation, aeson, async, base, blaze-builder, bytestring + , case-insensitive, data-default-class, directory, exceptions, fail + , hspec, hspec-discover, hspec-wai, http-types, lifted-base + , monad-control, mtl, nats, network, regex-compat, text + , transformers, transformers-base, transformers-compat, wai + , wai-extra, warp + }: + mkDerivation { + pname = "scotty"; + version = "0.11.4"; + sha256 = "13z0zmginaa1y5iywbbygvb9q3cmfgjkv6n2drs8gfbv3sirrf7i"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class exceptions fail http-types monad-control mtl + nats network regex-compat text transformers transformers-base + transformers-compat wai wai-extra warp + ]; + testHaskellDepends = [ + async base bytestring data-default-class directory hspec hspec-wai + http-types lifted-base network text wai + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scotty-binding-play" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl , scotty, template-haskell, text, transformers @@ -198564,16 +201140,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semirings_0_3_1_2" = callPackage + "semirings_0_4_1" = callPackage ({ mkDerivation, base, containers, hashable, integer-gmp - , unordered-containers, vector + , unordered-containers }: mkDerivation { pname = "semirings"; - version = "0.3.1.2"; - sha256 = "1zh5fgm1xidd03c00wh9llscx529qd1n6cnpv7k172xp4rd2w261"; + version = "0.4.1"; + sha256 = "1zzq4x1x7fxj3zrzys1zbqidwmm7wh7ykxgr5f8bxysxbs98qjdp"; libraryHaskellDepends = [ - base containers hashable integer-gmp unordered-containers vector + base containers hashable integer-gmp unordered-containers ]; description = "two monoids as one, in holy haskimony"; license = stdenv.lib.licenses.bsd3; @@ -199135,8 +201711,8 @@ self: { pname = "serialize-instances"; version = "0.1.0.0"; sha256 = "1m88jd5w68vpk7z2x2fffd5ljrzr93y20246dkkzn1md9ky0fclw"; - revision = "2"; - editedCabalFile = "1jbp16c0zg0g85m4cmn0wd5zm6z13ks93wm3q7qhxcaa1qrm8mgr"; + revision = "3"; + editedCabalFile = "1apx6j68l0gyicf8bxh010r1xy6sp2nbw3zj79lfqbw7fm3swv52"; libraryHaskellDepends = [ base cereal hashable semigroups unordered-containers ]; @@ -199279,7 +201855,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_16" = callPackage + "servant_0_16_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, Cabal, cabal-doctest, case-insensitive, deepseq , doctest, hspec, hspec-discover, http-api-data, http-media @@ -199289,8 +201865,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.16"; - sha256 = "0flpk4hd459lglxxyrbcvsk1401lcl5qrcr4ixz87jrs6vx97h37"; + version = "0.16.0.1"; + sha256 = "0ial3gvmsbaa26lgqlxk5sigpdqrr982cgkp2amlgniwg85sa2wp"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring @@ -199299,8 +201875,9 @@ self: { text transformers vault ]; testHaskellDepends = [ - aeson base base-compat bytestring doctest hspec mtl QuickCheck - quickcheck-instances string-conversions text transformers + aeson base base-compat bytestring doctest hspec http-media mtl + QuickCheck quickcheck-instances string-conversions text + transformers ]; testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs"; @@ -199408,6 +201985,8 @@ self: { pname = "servant-auth-client"; version = "0.4.0.0"; sha256 = "1kh4kq3cc9fn49vmh304zyzn7idb4k1j0803yp7a6qc733panf9g"; + revision = "1"; + editedCabalFile = "0cynalya2y5bfnhkc49vwf0ldxg4km6nklk77nlxjcrvwas21g7z"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core ]; @@ -199463,8 +202042,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.0"; sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; - revision = "2"; - editedCabalFile = "0309a6pc8jj24xwqmzj1yslgij9g212hnaqh2qkcvlm6k6riffil"; + revision = "3"; + editedCabalFile = "0in6rhgwn5idc2rsl4zbh6kkhxq471iczjd3i6ap60xg46ciymga"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -199527,6 +202106,8 @@ self: { pname = "servant-auth-server"; version = "0.4.4.0"; sha256 = "13196aknmb125ri3szqx8z5hdkk8lglv4795ck5glpn953vgq51c"; + revision = "1"; + editedCabalFile = "1wxiakkcx7d0j6zasjd84y7k98j94sy5nkj0vngjpd2jzlv79bb0"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -199551,8 +202132,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.0"; sha256 = "04ndbbhdmpgb8yshki6q2j46a5q8fzvlb4nn8x8gv0mqkriq79sh"; - revision = "1"; - editedCabalFile = "105rniz4cmmwr0ynyv75s4ap1fgfwxy2k5mvvj66gwpvzmj55cnx"; + revision = "2"; + editedCabalFile = "1vr0qss87gi6r9z876v9vnmfhr4m58n5x44fgzpmjkn7wlh1i6m7"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -199751,8 +202332,8 @@ self: { pname = "servant-blaze"; version = "0.9"; sha256 = "1pfnpc6m7i8knndc1734fbzpfgmvdcpkd8cj0jyw139b70siz63r"; - revision = "1"; - editedCabalFile = "06lq9lyli0pnmpw9489vzindjs0s9f982v6y9zk1lwc043nzg3ax"; + revision = "2"; + editedCabalFile = "0icqk00h03d6slfha8ylb07jj69y4chnhczxk8zskvgc89f6jl97"; libraryHaskellDepends = [ base blaze-html http-media servant ]; testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; @@ -199878,6 +202459,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-cli" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, free, http-client, http-types + , kan-extensions, optparse-applicative, profunctors, random + , recursion-schemes, servant, servant-client, servant-client-core + , servant-docs, servant-server, text, vinyl, warp + }: + mkDerivation { + pname = "servant-cli"; + version = "0.1.0.0"; + sha256 = "1jvdygdbz6rd4cnzp063a44m56b7dzskicbihjgkrpk73b9mvx7w"; + revision = "1"; + editedCabalFile = "06yzqhvzb9zmwidik05vndi4rphdbmciqij6azp3ng3ph8wmvd38"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers filepath free + http-types kan-extensions optparse-applicative profunctors + recursion-schemes servant servant-client-core servant-docs text + vinyl + ]; + executableHaskellDepends = [ + aeson base bytestring containers http-client optparse-applicative + random servant servant-client servant-server text vinyl warp + ]; + description = "Command line interface for Servant API clients"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-client" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , deepseq, entropy, exceptions, generics-sop, hspec, hspec-discover @@ -199924,6 +202534,8 @@ self: { pname = "servant-client"; version = "0.16"; sha256 = "0641fqlvqkm5075pcgcg5q81j7jil79sjpifg1snagfisrsxifxj"; + revision = "1"; + editedCabalFile = "0grjsgdmyr9mp7mnmf5qw6wkciigpzxsyzsj6l8fbb7mq5rsid78"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -199973,6 +202585,8 @@ self: { pname = "servant-client-core"; version = "0.16"; sha256 = "0cvv9a7z6ahwjp433c4sxa9i1ifabbih63bx71r9gvqzl85pb3dz"; + revision = "1"; + editedCabalFile = "1hanl8sz14z11441ng8vkzpxrl6igk3xzp6fcm6wg59fsb30fh29"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe @@ -200100,6 +202714,8 @@ self: { pname = "servant-dhall"; version = "0.1.0.2"; sha256 = "09fvyhkqpypg73cxs7y2asvlch83i4sqzh2w0d5ix0zl5i7f6rz3"; + revision = "1"; + editedCabalFile = "19jdp0xj1nl21wzfnk2y3qrzi7cag1m3wk0zqvqayc2czq9h0k08"; libraryHaskellDepends = [ base base-compat bytestring dhall http-media megaparsec prettyprinter servant text @@ -200125,8 +202741,8 @@ self: { pname = "servant-docs"; version = "0.11.3"; sha256 = "0cys1h3m0aq77aw0szj7k6p7zqcr8074zrxzsjp58lss1daqisq7"; - revision = "1"; - editedCabalFile = "1f5vdd096yrb0fsnzy709xw3x1r5q1pymscqaaarz3h2sky385lv"; + revision = "2"; + editedCabalFile = "1zzv3mbfyvpqddhz8a7z8wfwy4w4y21rwpi7k15xzm9647sdgga5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200452,6 +203068,8 @@ self: { pname = "servant-http-streams"; version = "0.16"; sha256 = "1gkgk13zxi8y071i9dx0i1kbs14rgp8cfnfcd7rpg86pffxkx6cp"; + revision = "1"; + editedCabalFile = "0i3668fw4h503hig1vd9d7k0mxlsis81cs7a5fh2k5yja5sj81ik"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -200611,8 +203229,8 @@ self: { pname = "servant-lucid"; version = "0.9"; sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf"; - revision = "1"; - editedCabalFile = "0fgik3s4vqyx5f8r777x82baj42qqgnxwi8gfp8iz3wfifvpc43k"; + revision = "2"; + editedCabalFile = "17p1xxzmr3ya0k4cy9n5mqf356gm35jdcm8mw1cxg2v80sd6nr4j"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -200718,6 +203336,8 @@ self: { pname = "servant-multipart"; version = "0.11.4"; sha256 = "0vcwrdzj1xyjg11yvfcds9rql3gcwgdcdq4z085g44fpabjxj50s"; + revision = "1"; + editedCabalFile = "0sf5vmzdcfzy01d65dd2f5l4k67znmjvp86d4xgkrmqsqmgxcgpg"; libraryHaskellDepends = [ base bytestring directory http-media lens resourcet servant servant-docs servant-foreign servant-server text transformers wai @@ -200995,8 +203615,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.7.3"; - sha256 = "0d904xfw5q7qcwkp5n7v18drc1idssvfwic2ksfmqlxisnxmyp5r"; + version = "0.0.7.4"; + sha256 = "1z47fgzdwfqb0byr8wa0s9n3g8hcbf112nbgaifm0zmxx6w4jlcf"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -201215,6 +203835,8 @@ self: { pname = "servant-server"; version = "0.16"; sha256 = "18rv99hyb448mcv1cjvs0p6cqrkw9f3zpdh18nsd29fskcybsv3b"; + revision = "1"; + editedCabalFile = "1v0zr3mqzjhiqrgyqgbnixa9zjvgknis3rjwyi2a3ig5l36y6ifh"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -201497,8 +204119,8 @@ self: { pname = "servant-swagger"; version = "1.1.7"; sha256 = "0dnyh4g55x70cb6xwksm0rk23v5lawdws5bxgq27ja1walh106p3"; - revision = "1"; - editedCabalFile = "0maasfw086a2iy4dyfaap4f1ncq1cg3p2mw6ypqhfr3dipgj5d3v"; + revision = "2"; + editedCabalFile = "1crl8c71ns8mnp056ba1zph57cf1l4dajbgw07gpcw2cvni6x560"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -201541,8 +204163,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.2"; sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2"; - revision = "3"; - editedCabalFile = "1di8fz3kcyp395yvjx3i48p68kx3qg83vbjc81c5jdp1i8w0kmww"; + revision = "4"; + editedCabalFile = "0vvfqf9zh8a5sgd4sn4mkay803lqc5zd9dz175gxs3wmca0gr3fk"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -201687,8 +204309,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.1"; sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01"; - revision = "1"; - editedCabalFile = "05j3hqvqiq8wa45jsdx72xa5phbhvn2lxbkbhh1g0j13ky8x2waw"; + revision = "2"; + editedCabalFile = "0scpm5dshnb7izn1xx8q3xm1m5f52y1s7nzgp7sa7zcv3pp6n7lw"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -201812,8 +204434,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.8.6"; - sha256 = "1ji1rkgrygsmrvgpirvc1pr2rw2xq15ff1v86ckwn7gcb9q8z7jy"; + version = "0.8.7"; + sha256 = "0q73j6n6552ajv5sm52rbcj4kk86wjmvrh6khci1nbln4wxgbwq2"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -202750,8 +205372,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.17.8"; - sha256 = "18j9xhl7h3sc6jswac4dz78i4rq7004150b98kq49w20flpidr5d"; + version = "0.17.9"; + sha256 = "0kkglnw7cwj9xkxg7ffj09dnjyribgs1vrsyl2hmpl3xy4gs0sdk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -203667,13 +206289,13 @@ self: { "shh" = callPackage ({ mkDerivation, async, base, containers, deepseq, directory - , filepath, hashable, mtl, process, split, tasty, tasty-hunit + , doctest, filepath, mtl, process, split, tasty, tasty-hunit , tasty-quickcheck, template-haskell, temporary, unix }: mkDerivation { pname = "shh"; - version = "0.3.1.3"; - sha256 = "0dsb4q83zsxx78xa4cx5vgkkyrbj50567vlvxk8g10pwah0lkr4c"; + version = "0.4.0.0"; + sha256 = "0ghkiz720g4p8gs5h3h43pkdsgcl7iffnqdis122qhvfliwqcmpr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203681,11 +206303,15 @@ self: { template-haskell unix ]; executableHaskellDepends = [ - async base directory hashable split temporary + async base deepseq directory temporary unix + ]; + testHaskellDepends = [ + async base directory doctest tasty tasty-hunit tasty-quickcheck ]; - testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Simple shell scripting from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shh-extras" = callPackage @@ -203698,22 +206324,23 @@ self: { testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shift" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring - , composition-prelude, microlens, optparse-applicative - , system-fileio, system-filepath, text, turtle + , composition-prelude, directory, filepath, optparse-applicative }: mkDerivation { pname = "shift"; - version = "0.2.1.1"; - sha256 = "1sxzgbdha8caf4xhsma45wiqagzga1zifkp14a5s01a2013pdizm"; + version = "0.2.1.2"; + sha256 = "1g3qvk3b6qiawrjvzxv6nbr71zxb8c5rsi4agjhq8d1d6g9m9f42"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal base binary bytestring composition-prelude microlens - optparse-applicative system-fileio system-filepath text turtle + ansi-terminal base binary bytestring composition-prelude directory + filepath optparse-applicative ]; description = "A tool to quickly switch between directories"; license = stdenv.lib.licenses.mit; @@ -204803,6 +207430,19 @@ self: { broken = true; }) {}; + "simple-ltl" = callPackage + ({ mkDerivation, base, criterion, deepseq, tasty, tasty-hunit }: + mkDerivation { + pname = "simple-ltl"; + version = "2.1.0"; + sha256 = "1hq9s9s9rslsq0ccdi92mjcxvvv3ficdfbfbbplgclzmlwbmwqzw"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "A simple LTL checker"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-money" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -204961,6 +207601,8 @@ self: { pname = "simple-sendfile"; version = "0.2.28"; sha256 = "0w4qn8dslcky7cq36jjjnlqwl2s46m8q1cwk3hc9cf0wsiwhp059"; + revision = "2"; + editedCabalFile = "16pyj7b4i1dzpzqbarzjamcjdyiy8j6lh5vf1ggchx69x44dqcr3"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -205151,8 +207793,8 @@ self: { }: mkDerivation { pname = "simple-ui"; - version = "0.1.1"; - sha256 = "1phag0frz7l4xgrgjc72x9iwjl1z1l6mpz7lnifjgn7zp3wdkwzs"; + version = "0.1.2"; + sha256 = "106fcxl97gnkpv2bc50bg5zv8j7f1cdyxbl1l99p3rsq6wr6mr0m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base data-default-class exceptions lens mtl stm template-haskell @@ -205164,6 +207806,19 @@ self: { broken = true; }) {}; + "simple-units" = callPackage + ({ mkDerivation, base, first-class-families }: + mkDerivation { + pname = "simple-units"; + version = "1.0.1.1"; + sha256 = "1dzsr15lq32dqsbhb639vzlx2d6m2kx0qax75ik2z765r5h9f9sa"; + libraryHaskellDepends = [ base first-class-families ]; + description = "Simple arithmetic with SI units using type-checked dimensional analysis"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "simple-vec3" = callPackage ({ mkDerivation, base, criterion, doctest, doctest-driver-gen , QuickCheck, tasty, tasty-quickcheck, vector @@ -205340,8 +207995,8 @@ self: { }: mkDerivation { pname = "simplest-sqlite"; - version = "0.1.0.0"; - sha256 = "0vjx01bls2z99hmynqhxm4j2cq17334wz3pz0gm5saxslkldw2sz"; + version = "0.1.0.1"; + sha256 = "06ccads286air3m6xys60aap5dckjimp6rvchk3v6927z9vgrn0v"; libraryHaskellDepends = [ base bytestring exception-hierarchy template-haskell text ]; @@ -208101,8 +210756,8 @@ self: { }: mkDerivation { pname = "snaplet-postgresql-simple"; - version = "1.1.0.0"; - sha256 = "0k82g3540jx7bddg0x6764c8xr955y8v5rc69kagi01nvhh7n2z5"; + version = "1.2.0.0"; + sha256 = "0an9b72vfnb562k49bz5wh72s637r3vrbm4x9brwf483rrmlmvrf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -209072,6 +211727,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "socks_0_6_0" = callPackage + ({ mkDerivation, base, basement, bytestring, cereal, network }: + mkDerivation { + pname = "socks"; + version = "0.6.0"; + sha256 = "10bkf2gw5l48j6g1i2slndcg4nzdqj8syrnbj21gjz6sms3zlqlp"; + libraryHaskellDepends = [ + base basement bytestring cereal network + ]; + description = "Socks proxy (ver 5)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sodium" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -209113,6 +211782,19 @@ self: { broken = true; }) {softfloat = null;}; + "solar" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "solar"; + version = "0.1.0.0"; + sha256 = "1dyg4g89bxnik3hqzqbwmlv6278w8d6gpmjwm06af248vn34kvhk"; + revision = "1"; + editedCabalFile = "0r4786crxih8z4dwi0grpga2kp8ivvnmwa0lhddmn16bfqwa16s9"; + libraryHaskellDepends = [ base time ]; + description = "Simple library for solar calculations"; + license = stdenv.lib.licenses.mit; + }) {}; + "solga" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck @@ -211516,10 +214198,10 @@ self: { }: mkDerivation { pname = "stack"; - version = "1.9.3"; - sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf"; - revision = "7"; - editedCabalFile = "0gc09yfhrphzn6r2g1ifx6l5k3g78q38myg83f2djjmy9vp047bl"; + version = "1.9.3.1"; + sha256 = "0lxx2gwwh4kjhy9d67ykdnhm5z9zsflv515jgsf97nkf6b8db8lj"; + revision = "2"; + editedCabalFile = "1fypvcvjlhyxnr81gll1w0l4nw6zvsr1vhb1y5g1jnyzy8f278zj"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -211871,6 +214553,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stack2nix_0_2_3" = callPackage + ({ mkDerivation, async, base, bytestring, Cabal, cabal2nix + , containers, directory, distribution-nixpkgs, filepath, hackage-db + , hspec, language-nix, lens, optparse-applicative, path, pretty + , process, regex-pcre, SafeSemaphore, stack, temporary, text, time + }: + mkDerivation { + pname = "stack2nix"; + version = "0.2.3"; + sha256 = "0vc87jb5vam47ghh2bzs20wfsnxjs133j9qrxa6kzbw0s2ff75p3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring Cabal cabal2nix containers directory + distribution-nixpkgs filepath hackage-db language-nix lens + optparse-applicative path pretty process regex-pcre SafeSemaphore + stack temporary text time + ]; + executableHaskellDepends = [ + base Cabal optparse-applicative time + ]; + testHaskellDepends = [ base hspec ]; + description = "Convert stack.yaml files into Nix build instructions."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stackage" = callPackage ({ mkDerivation, base, stackage-build-plan, stackage-cabal , stackage-cli, stackage-install, stackage-sandbox, stackage-setup @@ -212312,8 +215021,8 @@ self: { }: mkDerivation { pname = "standalone-haddock"; - version = "1.1.4.5"; - sha256 = "1ssfxkzjpprjn9smrgrgskr07zjj8zjs2wgvzcfpk9j0nvps0p9d"; + version = "1.3.0.0"; + sha256 = "1s9b2frpsgvc7nghi314adga8z8rmj1x40j7cic2m3m88nqz3g77"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -212944,8 +215653,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.3.0"; - sha256 = "012j2gcmcyjqsmfcpll2y61j7n191y8wipdki49p7i0d2n4ak88v"; + version = "0.2.3.1"; + sha256 = "0y3x0bylpiad1l87gzdwbgbaizqas6r9l83cngg3anqsg1gpd7a6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213344,16 +216053,14 @@ self: { }: mkDerivation { pname = "stm-containers"; - version = "1.1.0.2"; - sha256 = "1yhivblfxycr2vk09gwg904n6fqkzn5g5rvg3whm40fnabdfa9av"; - revision = "1"; - editedCabalFile = "14dy3rxa009bgx534583g11i8986pjcgygzh8l15fk3rv9q1iwb8"; + version = "1.1.0.4"; + sha256 = "0mcn4v9gjkqp27xcwvqphiqnaj4grvxpsflhq0rwqp5ymnzlccyl"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t stm-hamt transformers ]; testHaskellDepends = [ - deferred-folds focus foldl free HTF QuickCheck quickcheck-text - rerebase + deferred-folds focus foldl free HTF list-t QuickCheck + quickcheck-text rerebase ]; description = "Containers for STM"; license = stdenv.lib.licenses.mit; @@ -213447,10 +216154,8 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "stm-lifted"; - version = "0.1.1.0"; - sha256 = "1xp3cfpkhkhpva170vwwrwqm0spwm2g778s98gwbil24icx0p32c"; - revision = "1"; - editedCabalFile = "0mh0gdfwky4qxyhxrysqj1sr913pffvf420mf8cl9i53fsx4f255"; + version = "2.5.0.0"; + sha256 = "0zsah3s288cgb2h4gdjqvby1c3xp95nvgd561sdhigxcwlxk2658"; libraryHaskellDepends = [ base stm transformers ]; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; @@ -213689,6 +216394,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stopwatch_0_1_0_6" = callPackage + ({ mkDerivation, base, clock, hspec, transformers }: + mkDerivation { + pname = "stopwatch"; + version = "0.1.0.6"; + sha256 = "1gvlh58hkg02a5814lm5f123p853z92dlmv4r5mhhlg5j6g7c62h"; + libraryHaskellDepends = [ base clock transformers ]; + testHaskellDepends = [ base clock hspec ]; + description = "A simple stopwatch utility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "storable" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -213832,8 +216550,10 @@ self: { }: mkDerivation { pname = "store"; - version = "0.5.0.1"; - sha256 = "0dpm7752p8lhlwq5nlhqxwq1c5nyi97rnj83j2im3i9wvs2qb3i3"; + version = "0.5.1.0"; + sha256 = "0r15b04vxfca45a0rv1n4lcd6zpxhlhc9gmg9if17r1bm63x59hr"; + revision = "1"; + editedCabalFile = "0nfy8lrvj9kzhmbx8nkg8vlvlha8hkr4k23vs9xasvrw2wp5rfhj"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory @@ -213846,18 +216566,7 @@ self: { ]; testHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors - bytestring cereal cereal-vector clock containers contravariant - criterion cryptohash deepseq directory filepath free ghc-prim - hashable hspec hspec-smallcheck integer-gmp lifted-base - monad-control mono-traversable network primitive resourcet safe - semigroups smallcheck store-core syb template-haskell text th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unordered-containers vector vector-binary-instances - void weigh - ]; - benchmarkHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant criterion cryptohash deepseq + bytestring clock containers contravariant cryptohash deepseq directory filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base monad-control mono-traversable network primitive resourcet safe semigroups smallcheck store-core syb @@ -213865,6 +216574,17 @@ self: { th-reify-many th-utilities time transformers unordered-containers vector void ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable network primitive resourcet safe semigroups + smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector vector-binary-instances + void weigh + ]; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; }) {}; @@ -214303,6 +217023,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streaming-brotli" = callPackage + ({ mkDerivation, base, brotli, bytestring, HUnit, QuickCheck + , streaming, streaming-bytestring, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "streaming-brotli"; + version = "0.0.0.0"; + sha256 = "12bp033sjcjf3l16ihg2xa69yl7ai0886jriqpipsddfkcjnx7mr"; + libraryHaskellDepends = [ + base brotli bytestring streaming streaming-bytestring + ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck streaming streaming-bytestring + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Streaming interface for Brotli (RFC7932) compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "streaming-bytestring" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl , resourcet, smallcheck, streaming, tasty, tasty-smallcheck @@ -214466,6 +217208,28 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "streaming-lzma" = callPackage + ({ mkDerivation, base, bytestring, HUnit, lzma, QuickCheck + , streaming, streaming-bytestring, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "streaming-lzma"; + version = "0.0.0.0"; + sha256 = "0nqy6400fzr7mrl70wshcdfzz531wxy5x1mqg8zixg128xc0cnfb"; + libraryHaskellDepends = [ + base bytestring lzma streaming streaming-bytestring + ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck streaming streaming-bytestring + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Streaming interface for LZMA/XZ compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "streaming-osm" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , criterion, streaming, streaming-bytestring, streaming-utils @@ -214747,17 +217511,17 @@ self: { , base64-bytestring, bifunctors, bytestring , bytestring-tree-builder, hashable, http-media, mtl, scientific , semigroups, strelka-core, text, text-builder, time, transformers - , unordered-containers, url-decoders + , unordered-containers, url-decoders, uuid }: mkDerivation { pname = "strelka"; - version = "2.0.2.2"; - sha256 = "14n4wk7xzqrl795flxvks7kzf9mm93b626r2x657xjsy7rwkw7y3"; + version = "2.0.5"; + sha256 = "04z2ibka7gzgkcwqjg6xi0cj42hmix1pm4r8kmfqbb68a39hqbp6"; libraryHaskellDepends = [ attoparsec attoparsec-data base base-prelude base64-bytestring bifunctors bytestring bytestring-tree-builder hashable http-media mtl scientific semigroups strelka-core text text-builder time - transformers unordered-containers url-decoders + transformers unordered-containers url-decoders uuid ]; description = "A simple, flexible and composable web-router"; license = stdenv.lib.licenses.mit; @@ -215593,6 +218357,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "structs_0_1_2" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory + , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "structs"; + version = "0.1.2"; + sha256 = "0myv13g48y8vn397lvg45lb942fmw4n9gs80v5nnjfvgika7qbw4"; + revision = "1"; + editedCabalFile = "1snsprlbv9npn06iliy937vxqpsjpcmv880bnkbzj3nz4c6c59pa"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base deepseq ghc-prim primitive template-haskell + ]; + testHaskellDepends = [ + base directory doctest filepath parallel primitive QuickCheck tasty + tasty-hunit tasty-quickcheck + ]; + description = "Strict GC'd imperative object-oriented programming with cheap pointers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "structural-induction" = callPackage ({ mkDerivation, base, containers, genifunctors, geniplate , language-haskell-extract, mtl, pretty, QuickCheck, safe @@ -216272,6 +219060,8 @@ self: { pname = "summoner"; version = "1.3.0.1"; sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s"; + revision = "1"; + editedCabalFile = "0cw9vzvmmg13iyqh9g12c6yblv4ibxzcn61n4y7s59zmy4rqxg65"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216298,6 +219088,8 @@ self: { pname = "summoner-tui"; version = "0.1.0"; sha256 = "0ic9faw55qjljwz8r0nz8jmdw2pcc40nqc0zp07hshqh8qbiswl9"; + revision = "1"; + editedCabalFile = "0rjnrhh62m2jy74dqdiywkk2gqs1dds97h55qxc50qysdiiwmmal"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216733,6 +219525,8 @@ self: { pname = "sv"; version = "1.3.1"; sha256 = "0j92jgma41ggfjvd8a1la1wi2vms8ia1y6aqf6l7casavcn5vf2k"; + revision = "1"; + editedCabalFile = "19khsv0s2gk78fiwjkd3b1f2dkv78yhsl88rlb2jb2j48sjaqsgn"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -216760,8 +219554,8 @@ self: { pname = "sv-cassava"; version = "0.3"; sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b"; - revision = "1"; - editedCabalFile = "01xfdl296jcdh7c4yirzf6z0787z941h6p58dn5xhnsr965sncg1"; + revision = "2"; + editedCabalFile = "14grn815r54480jqpfib6qi3ivbaw0asa5ys0rp93allsprk96xb"; libraryHaskellDepends = [ attoparsec base bytestring cassava sv-core utf8-string validation vector @@ -216809,6 +219603,8 @@ self: { pname = "sv-core"; version = "0.4.1"; sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7"; + revision = "1"; + editedCabalFile = "1zdg2v5sxz0x6q6sgz79s71kqj79g8vn9pyl8hvqkw43b3g6zs4i"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -217123,6 +219919,8 @@ self: { pname = "swagger2"; version = "2.3.1.1"; sha256 = "19fslhjqcnk0da1c8sdflnnxjzbbzqb0nbknpgyd45q0psxr6xs7"; + revision = "1"; + editedCabalFile = "1g6jiadrvglrbf0857nzfbnjxmb3lwqamgs47j3qv9k6kfwilzyk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring containers cookie @@ -218746,8 +221544,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.8.0.3"; - sha256 = "03q3icqgxiwbyl9bhqzhdwsdirr9r40k20k1j8z1barg2309r2aa"; + version = "0.8.0.4"; + sha256 = "160ns7fd3xivlfirir7lk0ghv1f63b6cyfvnk8p2cn3jjfdp9xb3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219011,6 +221809,8 @@ self: { pname = "tagged"; version = "0.8.6"; sha256 = "1pciqzxf9ncv954v4r527xkxkn7r5hcr13mfw5dg1xjci3qdw5md"; + revision = "1"; + editedCabalFile = "070xwfw7y81hd63il76dmwbdl9ca1rd07c54zynfx6vpr4wyx4vh"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -219254,6 +222054,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagsoup_0_14_8" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , process, QuickCheck, text, time + }: + mkDerivation { + pname = "tagsoup"; + version = "0.14.8"; + sha256 = "1m9sx6gr9y9yxvkmcap8xsks8cnhznvma1mrfl39zljkv005azms"; + libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring deepseq directory process QuickCheck time + ]; + description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagsoup-ht" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , explicit-exception, old-time, tagsoup, transformers, utility-ht @@ -220126,8 +222943,8 @@ self: { pname = "tasty-hspec"; version = "1.1.5.1"; sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y"; - revision = "2"; - editedCabalFile = "1xrb7gyidbgbd1c94c1wa5dazsllp23xi4w7flsws09r267q8qpc"; + revision = "3"; + editedCabalFile = "1wgz3z5bnq5qml8d0i18gvz30dmmax3686lmqz3vf4hxd3vqfkpj"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -220339,6 +223156,8 @@ self: { testHaskellDepends = [ base QuickCheck tasty ]; description = "Pre-built tasty trees for checking lawful class properties using QuickCheck"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-rerun" = callPackage @@ -220840,21 +223659,6 @@ self: { broken = true; }) {}; - "telega" = callPackage - ({ mkDerivation, aeson, base, http-client, lens, tagged, text, time - , transformers, wreq - }: - mkDerivation { - pname = "telega"; - version = "0.2.0"; - sha256 = "1q2prviwbnwhi0xfwwblhncnpz2l0829i3zp2v573w9h91qc5yjn"; - libraryHaskellDepends = [ - aeson base http-client lens tagged text time transformers wreq - ]; - description = "Telegram Bot API binding"; - license = stdenv.lib.licenses.mit; - }) {}; - "telegram" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default , http-conduit, url, utf8-string @@ -221423,6 +224227,29 @@ self: { broken = true; }) {}; + "tensor-safe" = callPackage + ({ mkDerivation, base, casing, cmdargs, containers, extra + , formatting, ghc-typelits-extra, hint, singletons, text, vector + , vector-sized + }: + mkDerivation { + pname = "tensor-safe"; + version = "0.1.0.1"; + sha256 = "1b69k6mbhd0qbxjij44fgaw8xdnripr27x7xy106192cj7x3q9xf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base casing cmdargs containers extra formatting ghc-typelits-extra + hint singletons text vector vector-sized + ]; + executableHaskellDepends = [ + base casing cmdargs containers extra formatting ghc-typelits-extra + hint singletons text vector vector-sized + ]; + description = "Create valid deep neural network architectures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tensorflow" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, c2hs , containers, data-default, exceptions, fgl, HUnit, lens-family @@ -221704,12 +224531,12 @@ self: { }) {}; "termbox-banana" = callPackage - ({ mkDerivation, base, reactive-banana, stm, termbox }: + ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { pname = "termbox-banana"; - version = "0.1.0"; - sha256 = "0qyr2zykplxdg2x7k4xcg0cnv7lxx60lr55k8fs29556zalkgcgz"; - libraryHaskellDepends = [ base reactive-banana stm termbox ]; + version = "0.1.1"; + sha256 = "0584n8fq3rdq4rw20sglqwm76w8qmg8akhrkvda8scrvmgi5xbck"; + libraryHaskellDepends = [ base reactive-banana termbox ]; description = "reactive-banana + termbox"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -223352,7 +226179,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "text-show_3_8" = callPackage + "text-show_3_8_2" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers , contravariant, criterion, deepseq, deriving-compat @@ -223363,10 +226190,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.8"; - sha256 = "1yqmyfmnnph28v0c0rkh0z38xaxrrsljf1zg6zccqw322frw9fsi"; - revision = "1"; - editedCabalFile = "03q739smdz7z0nnx6pg7d58mmq65y7abhdxwy57akf7pichnw13b"; + version = "3.8.2"; + sha256 = "0n46q5gjlxz3g4flj5mn8s78dpdfd65fjl7b5174pykanwqsqqwz"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -223392,30 +226217,28 @@ self: { , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time , pretty, QuickCheck, quickcheck-instances, random, semigroups - , tagged, template-haskell, terminfo, text, text-show, th-orphans - , time, transformers, transformers-compat, unix + , tagged, template-haskell, terminfo, text, text-short, text-show + , th-orphans, time, transformers, transformers-compat, unix , unordered-containers, vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "3.7"; - sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c"; - revision = "1"; - editedCabalFile = "0rw9xbyinjrp0rgqwklsv4552k0g0n2nnq7n02i0015q8psfdz6z"; + version = "3.8"; + sha256 = "0n1bsvjnza6iyngsjavr7kh28hy78p7qf79plkjkb7xjskik6s0k"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random - semigroups tagged template-haskell terminfo text text-show time - transformers transformers-compat unix unordered-containers vector - xhtml + semigroups tagged template-haskell terminfo text text-short + text-show time transformers transformers-compat unix + unordered-containers vector xhtml ]; testHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec old-locale old-time pretty QuickCheck quickcheck-instances random - tagged template-haskell terminfo text-show th-orphans time - transformers transformers-compat unix unordered-containers vector - xhtml + tagged template-haskell terminfo text-short text-show th-orphans + time transformers transformers-compat unix unordered-containers + vector xhtml ]; testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; @@ -223778,6 +226601,21 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "th-abstraction_0_3_1_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.3.1.0"; + sha256 = "1f81w0gshvc816cf9qz0f19jsrzh6wpzmmy317xrgn63dv61p7jb"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + description = "Nicer interface for reified information about data types"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -223904,6 +226742,19 @@ self: { broken = true; }) {}; + "th-env" = callPackage + ({ mkDerivation, base, markdown-unlit, template-haskell }: + mkDerivation { + pname = "th-env"; + version = "0.1.0.0"; + sha256 = "19br06iq4cmnyk7s23s08yq6v2llzi9zq26yi2pigk6spwb4pyjn"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base markdown-unlit ]; + testToolDepends = [ markdown-unlit ]; + description = "Template Haskell splice that expands to an environment variable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-expand-syns" = callPackage ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { @@ -224057,6 +226908,8 @@ self: { pname = "th-lift"; version = "0.7.11"; sha256 = "131360zxb0hazbqwbkk6ab2p77jkxr79bwwm618mrwrwkm3x2g6m"; + revision = "1"; + editedCabalFile = "0whppp0p9df3fphv6pyg8f70bnm2kpyb3ylznknrklsl5vn2c49d"; libraryHaskellDepends = [ base ghc-prim template-haskell th-abstraction ]; @@ -224065,21 +226918,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-lift-instances_0_1_11" = callPackage - ({ mkDerivation, base, bytestring, containers, QuickCheck - , template-haskell, text, th-lift, vector + "th-lift_0_8" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: mkDerivation { - pname = "th-lift-instances"; - version = "0.1.11"; - sha256 = "1f56cp6ckcalld5jchv0kxpjkwcsixd7smd0g7r8cg67ppx6m90x"; + pname = "th-lift"; + version = "0.8"; + sha256 = "1594v53fqah949nazqrjhy17gxhvc43v2ffrk93bfhdy07wgikia"; libraryHaskellDepends = [ - base bytestring containers template-haskell text th-lift vector - ]; - testHaskellDepends = [ - base bytestring containers QuickCheck template-haskell text vector + base ghc-prim template-haskell th-abstraction ]; - description = "Lift instances for template-haskell for common data types"; + testHaskellDepends = [ base ghc-prim template-haskell ]; + description = "Derive Template Haskell's Lift class for datatypes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -224102,6 +226952,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-lift-instances_0_1_13" = callPackage + ({ mkDerivation, base, bytestring, containers, QuickCheck + , template-haskell, text, th-lift, transformers, vector + }: + mkDerivation { + pname = "th-lift-instances"; + version = "0.1.13"; + sha256 = "0zmhz593lfgi194ps8cv592j0wyc37mdn9pf2pchmr7h8bkmbksf"; + 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 { @@ -224123,6 +226993,8 @@ self: { pname = "th-orphans"; version = "0.13.7"; sha256 = "0qqxrm04nqh062cw6a2p6grvvfpg0nxkj3aymmar29yky17y8vgy"; + revision = "1"; + editedCabalFile = "1gf2rmphwgnqbbk4qcwfiprmsqp2d30xqlcxgs9h9ymazkwlh203"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -224182,8 +227054,8 @@ self: { }: mkDerivation { pname = "th-reify-many"; - version = "0.1.8"; - sha256 = "0hzy6hvhvcd6i60vx5cp2b7ggmnnjh9rx4h8bm8xw4grglcaxjnf"; + version = "0.1.9"; + sha256 = "0hxf56filzqnyrc8q7766vai80y6cgrrbrczx6n93caskl1dv2gq"; libraryHaskellDepends = [ base containers mtl safe template-haskell th-expand-syns ]; @@ -224292,6 +227164,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "th-utilities_0_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , hspec, primitive, syb, template-haskell, text, th-orphans, vector + }: + mkDerivation { + pname = "th-utilities"; + version = "0.2.3.0"; + sha256 = "0bl4j81k7szn0lza8rnn1db6glc57dsn63ni0hwbwr3kxa3pb4x4"; + libraryHaskellDepends = [ + base bytestring containers directory filepath primitive syb + template-haskell text th-orphans + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec primitive syb + template-haskell text th-orphans vector + ]; + description = "Collection of useful functions for use with Template Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thank-you-stars" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, filepath, hackage-db, hspec, req, split, text @@ -224338,8 +227231,8 @@ self: { }: mkDerivation { pname = "themoviedb"; - version = "1.1.5.0"; - sha256 = "05za904yimkf9vpkksyxw6j488xyd0wigjdkj25hf2xx4nw36j0v"; + version = "1.1.5.2"; + sha256 = "0pp603wvq03m56w0y12abjqbfv712aj3k6ki69jq60l9pxj4nni4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225039,15 +227932,15 @@ self: { }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;}; "tibetan-utils" = callPackage - ({ mkDerivation, base, composition-prelude, either, hspec - , hspec-megaparsec, megaparsec, text, text-show + ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec + , megaparsec, text }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.9"; - sha256 = "04xpncn9nnc51mzyvw1naydk47acbpkzpxipq1fgvvgclzda2gn8"; + version = "0.1.1.10"; + sha256 = "11bzcan2vfhdz6lwfvfgiyycqf30p4kdkzn47pm4ydr6bbpz8aia"; libraryHaskellDepends = [ - base composition-prelude either megaparsec text text-show + base composition-prelude megaparsec text ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec text @@ -225124,17 +228017,18 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, bifunctors, colour, containers, hosc - , microspec, mwc-random, network, parsec, template-haskell, text - , transformers, vector + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, hosc, microspec, mwc-random, network, parsec + , template-haskell, text, transformers, vector }: mkDerivation { pname = "tidal"; - version = "1.0.10"; - sha256 = "1pays7hjsv7rpc0ldmzhavxkyp3avcwz912zfm9y80fyhhyyf4jp"; + version = "1.0.13"; + sha256 = "0m28z3mlp6q51znzjgw1hsfy8g4npsxl8bydm8hm9dslqc7gdi7j"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bifunctors colour containers hosc mwc-random network parsec - template-haskell text transformers vector + base bifunctors bytestring clock colour containers hosc mwc-random + network parsec template-haskell text transformers vector ]; testHaskellDepends = [ base containers microspec parsec ]; description = "Pattern language for improvised music"; @@ -225522,10 +228416,8 @@ self: { }: mkDerivation { pname = "time-parsers"; - version = "0.1.2.0"; - sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f"; - revision = "3"; - editedCabalFile = "0im963wjcmwf6ii9a00mbi8lhmx5cy7cs6rmp0qi2j2jddba78j2"; + version = "0.1.2.1"; + sha256 = "102k6l9888kbgng045jk170qjbmdnwv2lbzlc12ncybfk2yk7wdv"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -226290,6 +229182,24 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "tinylog_0_15_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , double-conversion, fast-logger, text, transformers, unix-time + }: + mkDerivation { + pname = "tinylog"; + version = "0.15.0"; + sha256 = "0pwdymx4kx3im9pzah0lmh64x7agdklf6dwqpjx93ybswi61cwfb"; + libraryHaskellDepends = [ + base bytestring containers double-conversion fast-logger text + transformers unix-time + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Simplistic logging using fast-logger"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tinytemplate" = callPackage ({ mkDerivation, base, QuickCheck, text }: mkDerivation { @@ -226602,16 +229512,17 @@ self: { }) {}; "tmp-postgres" = callPackage - ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover - , network, postgresql-simple, process, temporary, unix + ({ mkDerivation, async, base, bytestring, directory, hspec + , hspec-discover, network, port-utils, postgresql-simple, process + , temporary, unix }: mkDerivation { pname = "tmp-postgres"; - version = "0.1.1.1"; - sha256 = "0qz85flbg2ihkcsjdhambgj07xrz75pgpiz8wpapj0gnady5ap9c"; + version = "0.1.2.2"; + sha256 = "1lsf8ydf21dql452jk3x6maicip65r4jyb9xd5a98687j798bm6n"; libraryHaskellDepends = [ - base bytestring directory network postgresql-simple process - temporary unix + async base bytestring directory network port-utils + postgresql-simple process temporary unix ]; testHaskellDepends = [ base bytestring directory hspec hspec-discover postgresql-simple @@ -226620,6 +229531,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Start and stop a temporary postgres for testing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tmpl" = callPackage @@ -227085,8 +229998,8 @@ self: { }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.39"; - sha256 = "1kz3bbrymh23b8iadq8baircqh11r3q3zv75390ymxiz3ns26vh8"; + version = "0.1.0.40"; + sha256 = "0r56fzmngylwcnykhn22hnlaj553m5l29rsjplmlhy3b2rdb10hj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -228570,6 +231483,20 @@ self: { broken = true; }) {}; + "treap" = callPackage + ({ mkDerivation, base, deepseq, doctest, Glob, hspec, hspec-core + , mersenne-random-pure64 + }: + mkDerivation { + pname = "treap"; + version = "0.0.0.0"; + sha256 = "0zq2jislk5fg7lshya6iivcksxh5wgb54kgllgqqra07w0sp6bd9"; + libraryHaskellDepends = [ base deepseq mersenne-random-pure64 ]; + testHaskellDepends = [ base doctest Glob hspec hspec-core ]; + description = "Efficient implementation of the implicit treap data structure"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "tree-diff" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base-compat, bytestring, containers, generics-sop, hashable @@ -229311,10 +232238,8 @@ self: { }: mkDerivation { pname = "ttl-hashtables"; - version = "1.3.0.0"; - sha256 = "1qlwwxylj9d2p4jm4bi0a3x60cfzd6g982v6q0crs323zn8q5cj5"; - revision = "1"; - editedCabalFile = "0nbf825s51pls4y0nc9jzik8z6szfvqd66dfjp6ybbywrrdzckf3"; + version = "1.3.1.0"; + sha256 = "0ny9iynlhpaqvqip7i9n5as21mk0kzm6akbcy7xgkams8dv76k5h"; libraryHaskellDepends = [ base clock containers data-default failable hashable hashtables mtl transformers @@ -229721,8 +232646,10 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.13"; - sha256 = "1124yhw0l8924cwkmap1qn2z0hf4vn3r73h4pmi9icahg8zpc1hg"; + version = "1.5.14"; + sha256 = "10sxbmis82z5r2ksfkik5kryz5i0xwihz9drc1dzz4fb76kkb67z"; + revision = "1"; + editedCabalFile = "0jfa861ch7cibalcqszywjiyqa95xs7k1dqjjkqqx6fih9y13n0l"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -231529,8 +234456,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.3.1"; - sha256 = "15wgcf0q3xj3npb1ivfj8b0w78dwcz90fyxqp75wcnxyv2ksvd3m"; + version = "0.7.4.1"; + sha256 = "1nm74fj819kws9rrksk80gyrl3m5dxsm17bm2a18mp8dca76iix2"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -232874,8 +235801,8 @@ self: { pname = "uniprot-kb"; version = "0.1.2.0"; sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l"; - revision = "3"; - editedCabalFile = "1a532yhvgs7n096f6mjwm7811d2c6xbgr45gscg7d4ys042c0586"; + revision = "4"; + editedCabalFile = "1g4qds20lwsbn5hqrgbhb4yd5w5vx2gkw47mjvxr8z8nj20g2pii"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec neat-interpolation QuickCheck text @@ -233173,19 +236100,18 @@ self: { }) {}; "universe" = callPackage - ({ mkDerivation, universe-instances-base - , universe-instances-extended, universe-instances-trans - , universe-reverse-instances + ({ mkDerivation, universe-base, universe-dependent-sum + , universe-instances-extended, universe-reverse-instances }: mkDerivation { pname = "universe"; - version = "1.0"; - sha256 = "19zr9zcqc5sfp5qfn8slkk2732j1814m3j1jkbim739limwf900z"; + version = "1.1"; + sha256 = "0zghqcv6jyl9x3qfmbnqyfvr4pkf3m6lil0vg66m16xlrgz68hds"; libraryHaskellDepends = [ - universe-instances-base universe-instances-extended - universe-instances-trans universe-reverse-instances + universe-base universe-dependent-sum universe-instances-extended + universe-reverse-instances ]; - description = "Classes for types where we know all the values"; + description = "A class for finite and recursively enumerable types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -233202,6 +236128,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-base_1_1" = callPackage + ({ mkDerivation, base, containers, QuickCheck, tagged, transformers + }: + mkDerivation { + pname = "universe-base"; + version = "1.1"; + sha256 = "1alr2gbmdp9lsarnhfl72zkcqrfwxwvmlq3nyb9ilmwinahlzf0n"; + libraryHaskellDepends = [ base containers tagged transformers ]; + testHaskellDepends = [ base containers QuickCheck ]; + description = "A class for finite and recursively enumerable types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "universe-dependent-sum" = callPackage + ({ mkDerivation, base, dependent-sum, template-haskell + , th-abstraction, transformers, universe-base + }: + mkDerivation { + pname = "universe-dependent-sum"; + version = "1.1.0.1"; + sha256 = "1mfvfh7rnk8lnd5lgxbhi40y31sar11dmgh5s7g2kgsprzmg1qpi"; + libraryHaskellDepends = [ + base dependent-sum template-haskell th-abstraction transformers + universe-base + ]; + testHaskellDepends = [ + base dependent-sum template-haskell universe-base + ]; + description = "Universe instances for types from dependent-sum"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "universe-instances-base" = callPackage ({ mkDerivation, base, containers, universe-base }: mkDerivation { @@ -233215,20 +236176,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-instances-base_1_1" = callPackage + ({ mkDerivation, base, universe-base }: + mkDerivation { + pname = "universe-instances-base"; + version = "1.1"; + sha256 = "17g4xf7zcxd9a2am0p401b0l87ynxwpm3c2lqc4vmw4sz071kccb"; + libraryHaskellDepends = [ base universe-base ]; + description = "Universe instances for types from the base package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "universe-instances-extended" = callPackage - ({ mkDerivation, adjunctions, base, comonad - , universe-instances-base, void - }: + ({ mkDerivation, adjunctions, base, comonad, universe-base }: mkDerivation { pname = "universe-instances-extended"; - version = "1.0.0.1"; - sha256 = "15y9f0hbxqsksclxrssj4h08y0yb3nm9clqasjw6nsmi04kjfnv6"; - revision = "3"; - editedCabalFile = "1f7mzwn97kmnm1p1hscz5mzly700q2pw5awwdzzsxfkxv3law7xn"; - libraryHaskellDepends = [ - adjunctions base comonad universe-instances-base void - ]; - description = "Universe instances for types from select extra packages"; + version = "1.1"; + sha256 = "12ads0n5md27wznrv7ah668ip2pp3gryn8d6my74kyhsz6g2fn5q"; + libraryHaskellDepends = [ adjunctions base comonad universe-base ]; + description = "Universe instances for types from selected extra packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -233251,6 +236218,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-instances-trans_1_1" = callPackage + ({ mkDerivation, base, universe-base }: + mkDerivation { + pname = "universe-instances-trans"; + version = "1.1"; + sha256 = "0dp37rb61g5mqj4kfkgi6zxcjhrm9npz197sksqwg1skgjdgbbn6"; + libraryHaskellDepends = [ base universe-base ]; + description = "Universe instances for types from the transformers and mtl packages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "universe-reverse-instances" = callPackage ({ mkDerivation, base, containers, universe-instances-base }: mkDerivation { @@ -233266,6 +236245,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-reverse-instances_1_1" = callPackage + ({ mkDerivation, base, containers, universe-base }: + mkDerivation { + pname = "universe-reverse-instances"; + version = "1.1"; + sha256 = "0pdmv146ap0dh38mxhjf11jx3fbr9im7mc0zxb3bsnwpfrv1kfqd"; + libraryHaskellDepends = [ base containers universe-base ]; + description = "Instances of standard classes that are made possible by enumerations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "universe-th" = callPackage ({ mkDerivation, base, checkers, composition, DebugTraceHelpers , HUnit, mtl, QuickCheck, template-haskell, test-framework @@ -233540,8 +236531,8 @@ self: { pname = "unliftio-core"; version = "0.1.2.0"; sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4"; - revision = "1"; - editedCabalFile = "0s6xfg9d0i3sfil5gjbamlq017wdxa69csk73bcqjkficg43vm29"; + revision = "2"; + editedCabalFile = "0jqrjjbgicx48wzcjxs1xmih48ay79rhmrz6081dldlfxynli6vz"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = stdenv.lib.licenses.mit; @@ -234037,14 +237028,14 @@ self: { }: mkDerivation { pname = "up"; - version = "1.0.0.4"; - sha256 = "03rlzqaj148mmxlr0h783z4cm2p7qsdzhx7s861mkfnra8pp84il"; + version = "1.0.0.5"; + sha256 = "1b41pqj2v6j0vgj7j18wlparbbkvf92xcfr59lvgf9k8xvarl43k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath lambda-options mtl split ]; - description = "Command line tool to generate pathnames to facilitate moving upward in a file system"; + description = "Command-line tool to generate paths for moving upward in a file system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -235642,6 +238633,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "validation_1_1" = callPackage + ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens + , semigroupoids, semigroups + }: + mkDerivation { + pname = "validation"; + version = "1.1"; + sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5"; + libraryHaskellDepends = [ + base bifunctors deepseq lens semigroupoids semigroups + ]; + testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; + description = "A data-type like Either but with an accumulating Applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validations" = callPackage ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -236013,8 +239021,8 @@ self: { }: mkDerivation { pname = "vault-tool"; - version = "0.1.0.0"; - sha256 = "00hnbd34chi7nm8vwq80vhl0629gklfkyfwic80q7i17kzsdvx90"; + version = "0.1.0.1"; + sha256 = "13bxbzamd3mca5bngmzn82fzk66b4vp5crw33bzg01nmbprxfcbb"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types text unordered-containers @@ -236031,8 +239039,8 @@ self: { }: mkDerivation { pname = "vault-tool-server"; - version = "0.1.0.0"; - sha256 = "06h4cslkb54p3yydcnkzlzysn54cy801i5fwc02hc4gi3kvia84k"; + version = "0.1.0.1"; + sha256 = "0svgjr2qxsiwx5i0lrwzfcmaikgavls8vc9p0wcj3w1ndrbjk1y5"; libraryHaskellDepends = [ aeson async base bytestring filepath http-client process temporary text vault-tool @@ -236255,17 +239263,15 @@ self: { "vec" = callPackage ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq , distributive, fin, hashable, inspection-testing, lens - , semigroupoids, tagged, vector + , semigroupoids, tagged, transformers, vector }: mkDerivation { pname = "vec"; - version = "0.1"; - sha256 = "0m70ld5vy96vca4wdm45q1ixwznl3yfj8jzil2kjfkzzac5fym5y"; - revision = "3"; - editedCabalFile = "093q5qlhlia12ckhvax322lyy3sb554pg46ghabvsvx8znixw2hh"; + version = "0.1.1"; + sha256 = "1ryc6jshm26dh21xlf4wg4fhkw035bxx4smd3xyisjqm7nncq7n5"; libraryHaskellDepends = [ adjunctions base base-compat deepseq distributive fin hashable lens - semigroupoids + semigroupoids transformers ]; testHaskellDepends = [ base fin inspection-testing tagged ]; benchmarkHaskellDepends = [ base criterion fin vector ]; @@ -236358,6 +239364,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector_0_12_0_3" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit + , primitive, QuickCheck, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "vector"; + version = "0.12.0.3"; + sha256 = "1a756s4w759ji3als5alfxwlckh5zcmykfg9rll4mlr2knzvz8mq"; + revision = "1"; + editedCabalFile = "0nkx1kwrvskp7xx1193d7b72fk7b678nlljzjqazhcbvi7qxpdxr"; + libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; + testHaskellDepends = [ + base base-orphans HUnit primitive QuickCheck random + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; + description = "Efficient Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-algorithms" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random , primitive, QuickCheck, vector @@ -236505,6 +239533,22 @@ self: { broken = true; }) {}; + "vector-endian" = callPackage + ({ mkDerivation, base, cpu, deepseq, vector, zenhack-prelude }: + mkDerivation { + pname = "vector-endian"; + version = "0.1.0.0"; + sha256 = "0qfs19l2d56w6jl8niiq8vsjldb8mabf56xfsj45ai7ipi92cx13"; + libraryHaskellDepends = [ + base cpu deepseq vector zenhack-prelude + ]; + doHaddock = false; + description = "Storable vectors with cpu-independent representation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "vector-extras" = callPackage ({ mkDerivation, base, containers, deferred-folds, foldl, hashable , unordered-containers, vector @@ -237014,10 +240058,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "3.5.0"; - sha256 = "1g6db0ah78yk1m5wyxp0az7bzlbxsfkychqjcj423wzx90z7ww4w"; - revision = "1"; - editedCabalFile = "13gb4n3bdkbgf199q3px7ihaqycbx76cb8isrs3qn16n67mx5b2f"; + version = "3.5.1"; + sha256 = "1qbihyqw99wkdmslvxqkj6h8x0ih9w86h4s7k51maaicmgijm94w"; libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; testHaskellDepends = [ base base-prelude checkers megaparsec microlens QuickCheck tasty @@ -237220,8 +240262,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.2.5.0"; - sha256 = "03ykd8pz7wn9dcj78zgq15ip04g8b4b7945g6fj5a7bfz0y9asbf"; + version = "0.2.5.1"; + sha256 = "1v46b0215mcyhxma3ascg3paz683j8xqsf4czs8syx4amyls36qg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237814,23 +240856,23 @@ self: { "vt-utils" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , case-insensitive, directory, http-client, http-types, HUnit - , parsec, process, text, time, transformers, unordered-containers - , vector, wai, warp + , case-insensitive, directory, either, hashable, http-client + , http-types, HUnit, parsec, process, text, time, transformers + , unordered-containers, vector, wai, warp }: mkDerivation { pname = "vt-utils"; - version = "1.2.0.0"; - sha256 = "1mbc4a8s6h3f5w3da2ln95050c1ssnh7pyj4i34nvmm5gqrb3jb9"; + version = "1.3.0.0"; + sha256 = "07xn1izv59h8b6nk294gyxcfn489n2f6fcpi5g9nkscr59hmkj2v"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive directory - http-client http-types HUnit parsec process text time transformers - unordered-containers vector wai + either hashable http-client http-types HUnit parsec process text + time transformers unordered-containers vector wai ]; testHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive directory - http-client http-types HUnit parsec process text time transformers - unordered-containers vector wai warp + either hashable http-client http-types HUnit parsec process text + time transformers unordered-containers vector wai warp ]; description = "Vector and Text utilities"; license = stdenv.lib.licenses.mit; @@ -238157,21 +241199,20 @@ self: { ({ mkDerivation, array, attoparsec, attoparsec-conduit, base , bytestring, case-insensitive, conduit, conduit-extra, containers , data-default-class, directory, doctest, filepath, hspec, HTTP - , http-client, http-conduit, http-date, http-types, io-choice - , lifted-base, mime-types, network, process, sockaddr, static-hash - , text, transformers, unix, wai, wai-conduit, warp, word8 + , http-client, http-conduit, http-date, http-types, mime-types + , network, process, sockaddr, static-hash, text, transformers, unix + , wai, wai-conduit, warp, word8 }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.1.6"; - sha256 = "1w2hmy0q8dvg575sxmc69f9x7pcf1fx6lypzxsaxyfyazvhi4krc"; + version = "3.1.7"; + sha256 = "17cj50p16adyzqr28f28ll64g3gr8ri756dngrdgly0g7060fg53"; libraryHaskellDepends = [ array attoparsec attoparsec-conduit base bytestring case-insensitive conduit conduit-extra containers data-default-class directory filepath http-client http-conduit - http-date http-types io-choice lifted-base mime-types network - process sockaddr static-hash text transformers unix wai wai-conduit - warp word8 + http-date http-types mime-types network process sockaddr + static-hash text transformers unix wai wai-conduit warp word8 ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory doctest filepath @@ -238417,6 +241458,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_26" = 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.26"; + sha256 = "1vax87kchm92az0f4axn793bavp8pwjh7a9mc1lwwwni678h35gq"; + revision = "1"; + editedCabalFile = "02475xywcp12xysa6l2p6ibx800978lsa6rkgx9gnhans7z6yj16"; + 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 @@ -239306,8 +242379,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.2"; sha256 = "1z5yapcf8j9w71f2na30snmalsajlyi8an2f9qrjdmajabyykr0b"; - revision = "1"; - editedCabalFile = "0n7i81jrjsrav8bpg31avrd18vh95l5z6bfj4fqkrdj4h1v6armi"; + revision = "2"; + editedCabalFile = "17vq38dh7x1kqzfwla1s0rldd5hzm5mcrx49sjlzy8b66gd2n3ac"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups @@ -239567,8 +242640,8 @@ self: { }: mkDerivation { pname = "wai-secure-cookies"; - version = "0.1.0.3"; - sha256 = "01jqwl9z7p3vkh7jvlxzvqcq2bgkcfx559pnc87qgp7ldh018z7f"; + version = "0.1.0.4"; + sha256 = "0m77h2xnm3h3axchvmbylrhm4s7d31zxsv0bgqvmh9zhydr90d2v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239992,13 +243065,15 @@ self: { , bytestring, case-insensitive, containers, directory, doctest , gauge, ghc-prim, hashable, hspec, http-client, http-date , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 + , QuickCheck, simple-sendfile, stm, streaming-commons, text, time + , transformers, unix, unix-compat, vault, wai, word8 }: mkDerivation { pname = "warp"; - version = "3.2.26"; - sha256 = "1s83313cs6w84a8yfwqkixfz4a94aszma4phsqv7x1ivi9b3i8sc"; + version = "3.2.27"; + sha256 = "0p2w88q0zd55ms20qylipbi0qzbf324i9r8b9qqxyds5yc1anq76"; + revision = "1"; + editedCabalFile = "19ggrgki5rdmphpg0sh5n286yfzdz6pi31gksdbbpfzxk29wx4ab"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -240009,7 +243084,7 @@ self: { array async auto-update base bsb-http-chunked bytestring case-insensitive containers directory doctest ghc-prim hashable hspec http-client http-date http-types http2 HUnit iproute - lifted-base network process QuickCheck silently simple-sendfile stm + lifted-base network process QuickCheck simple-sendfile stm streaming-commons text time transformers unix unix-compat vault wai word8 ]; @@ -240087,8 +243162,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.2.4.3"; - sha256 = "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4"; + version = "3.2.5"; + sha256 = "1z98jxn1l9mp6hh2jja6cz48nx8zvp5iqrr23wmbp235vva4llmf"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class network streaming-commons tls tls-session-manager wai warp @@ -240098,18 +243173,20 @@ self: { }) {}; "warp-tls-uid" = callPackage - ({ mkDerivation, base, bytestring, network, streaming-commons, unix - , wai, warp, warp-tls + ({ mkDerivation, base, bytestring, data-default, network + , streaming-commons, tls, unix, wai, warp, warp-tls, x509 }: mkDerivation { pname = "warp-tls-uid"; - version = "0.2.0.5"; - sha256 = "1b3kxpbai9nxqqv9kww4cr1vgaa0cz4fpkd3pfmj0hin10hr6mmq"; + version = "0.2.0.6"; + sha256 = "09xvwvb6nc6ymp6x389dxbllisrj24srcdli6d19h05cwlqbay4w"; libraryHaskellDepends = [ - base bytestring network streaming-commons unix wai warp warp-tls + base bytestring data-default network streaming-commons tls unix wai + warp warp-tls x509 ]; testHaskellDepends = [ - base bytestring network streaming-commons unix wai warp warp-tls + base bytestring data-default network streaming-commons tls unix wai + warp warp-tls x509 ]; description = "set group and user id before running server"; license = stdenv.lib.licenses.bsd3; @@ -241447,6 +244524,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets-snap_0_10_3_1" = callPackage + ({ mkDerivation, base, bytestring, bytestring-builder, io-streams + , mtl, snap-core, snap-server, websockets + }: + mkDerivation { + pname = "websockets-snap"; + version = "0.10.3.1"; + sha256 = "1hpszqb61xhbgfvxd6g56kdfxsyi14q7xh12jbdnyycbfijb9bqk"; + libraryHaskellDepends = [ + base bytestring bytestring-builder io-streams mtl snap-core + snap-server websockets + ]; + description = "Snap integration for the websockets library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webwire" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html , bytestring, case-insensitive, containers, cookie, cprng-aes @@ -241850,8 +244944,8 @@ self: { }: mkDerivation { pname = "wikicfp-scraper"; - version = "0.1.0.10"; - sha256 = "1j6aizgsf387pm6ajr6zjj1l4nnaq8mryq4vr09jji91ix9zhnw7"; + version = "0.1.0.11"; + sha256 = "1f6zrgjhid1fps02hbd6lmaxpi635bdzcxbsfkfk8xd7wmj0x91b"; libraryHaskellDepends = [ attoparsec base bytestring scalpel-core text time ]; @@ -242063,7 +245157,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "winery_1_0_1" = callPackage + "winery_1_1_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal , containers, cpu, deepseq, directory, fast-builder, gauge , hashable, HUnit, megaparsec, mtl, prettyprinter @@ -242073,8 +245167,8 @@ self: { }: mkDerivation { pname = "winery"; - version = "1.0.1"; - sha256 = "03g397c7s13brm5jsdzrwg5vyanvj6yznhn95aax7a8dwvhphk2n"; + version = "1.1.1"; + sha256 = "0jyr5vwz55rjwqvvh2ys3aq426i6jhfrykz0mx4kidr9l9yd0yls"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242096,7 +245190,7 @@ self: { aeson base binary bytestring cereal deepseq directory gauge serialise text ]; - description = "Sustainable serialisation library"; + description = "A compact, well-typed seralisation format for Haskell values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -242195,16 +245289,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "with" = callPackage - ({ mkDerivation }: - mkDerivation { - pname = "with"; - version = "0.1.0"; - sha256 = "0jgm6w1xisyww81ak9rrrqmhgaiwdgk5rgvzax72rknzg9rb6701"; - description = "Simple open product type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -242292,8 +245376,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "wizard"; - version = "0.1.0.0"; - sha256 = "0j485hbk42ipmc14ydickfm268b7z183rs37ih3j99lbzrdm1s8l"; + version = "0.1.1"; + sha256 = "0bldcvd7zjask8myh1nwj59ml4q6wlinp2h7q6hdfjg8djf2mnca"; libraryHaskellDepends = [ base transformers ]; description = "the fantastical wizard monoid"; license = stdenv.lib.licenses.bsd3; @@ -243424,8 +246508,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "writer-cps-transformers"; - version = "0.5.6.0"; - sha256 = "132qd8rvvksjr8klvgr3y2acmlsw9jvirlfl8hdm3ipi4i7hy4fr"; + version = "0.5.6.1"; + sha256 = "071jiwdpjh5d7nm5jfgmk0lgpms0x3bijwjh25nnpy7q7lfczskn"; libraryHaskellDepends = [ base transformers ]; doHaddock = false; description = "WriteT and RWST monad transformers"; @@ -243721,6 +246805,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wuss_1_1_13" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "1.1.13"; + sha256 = "16ll4wfk3i570id7ki5ab34q5wwzgr5k7fqmx8hvnxmdsr8h85cy"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + description = "Secure WebSocket (WSS) clients"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { @@ -244132,8 +247231,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.7.0"; - sha256 = "1b9qp3z0j3qpxwh8kczkarbqa0hb6x8wxm6by6j49qhd7fn6dkin"; + version = "0.8.0"; + sha256 = "1779i674hppv6samc73mq56pcyr2w69iw0p8qbqdmf3ixsaqhanf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244554,6 +247653,8 @@ self: { pname = "xkcd"; version = "0.1.1"; sha256 = "15zwx7rkxm52pnxjhx3p979h48cls1ipb7hmryxll5rcxz9aga29"; + revision = "1"; + editedCabalFile = "0sy66hmwgk5mb9nxlqh7k1nzb2r6cw617sn31aaf54hwk0gkx32m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -246406,6 +249507,41 @@ self: { broken = true; }) {}; + "yam_0_6_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring + , data-default, exceptions, fast-logger, hspec, http-client + , http-types, lens, menshen, monad-logger, mtl, mwc-random + , QuickCheck, reflection, salak, scientific, servant-client + , servant-server, servant-swagger, servant-swagger-ui, swagger2 + , text, transformers, unliftio-core, unordered-containers, vault + , vector, wai, warp + }: + mkDerivation { + pname = "yam"; + version = "0.6.1"; + sha256 = "1llgyx9giibm1yzgk61c47jnr0ppgj5q4sq0ml9bz99j5c16id70"; + libraryHaskellDepends = [ + aeson base base16-bytestring binary bytestring data-default + exceptions fast-logger http-client http-types lens menshen + monad-logger mtl mwc-random reflection salak scientific + servant-client servant-server servant-swagger servant-swagger-ui + swagger2 text transformers unliftio-core unordered-containers vault + vector wai warp + ]; + testHaskellDepends = [ + aeson base base16-bytestring binary bytestring data-default + exceptions fast-logger hspec http-client http-types lens menshen + monad-logger mtl mwc-random QuickCheck reflection salak scientific + servant-client servant-server servant-swagger servant-swagger-ui + swagger2 text transformers unliftio-core unordered-containers vault + vector wai warp + ]; + description = "A wrapper of servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yam-app" = callPackage ({ mkDerivation, aeson, base, conduit, containers, ctrie , data-default, directory, exceptions, fast-logger, monad-control @@ -246462,6 +249598,25 @@ self: { broken = true; }) {}; + "yam-datasource_0_6_1" = callPackage + ({ mkDerivation, base, conduit, data-default, monad-logger + , persistent, resource-pool, resourcet, salak, servant-server, text + , unliftio-core, yam + }: + mkDerivation { + pname = "yam-datasource"; + version = "0.6.1"; + sha256 = "1k373bhh7pyb6i021a0akvsjfkpw7h3vw33a2ag57f97yalfwha4"; + libraryHaskellDepends = [ + base conduit data-default monad-logger persistent resource-pool + resourcet salak servant-server text unliftio-core yam + ]; + description = "Yam DataSource Middleware"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yam-job" = callPackage ({ mkDerivation, base, cron, yam-app }: mkDerivation { @@ -246489,6 +249644,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yam-redis" = callPackage + ({ mkDerivation, base, bytestring, data-default, hedis, menshen + , monad-logger, mtl, salak, servant-server, text, yam + }: + mkDerivation { + pname = "yam-redis"; + version = "0.6.1"; + sha256 = "07qswsac1ygsfm97njry4ar1j9hb6ghkzmna7hw7f7a1y77x9m9p"; + libraryHaskellDepends = [ + base bytestring data-default hedis menshen monad-logger mtl salak + servant-server text yam + ]; + description = "Yam Redis Middleware"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yam-servant" = callPackage ({ mkDerivation, aeson, base, http-types, lens, servant , servant-server, servant-swagger, servant-swagger-ui, swagger2 @@ -246833,6 +250006,8 @@ self: { pname = "yampa-canvas"; version = "0.2.3"; sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r"; + revision = "1"; + editedCabalFile = "0i1nni9skh2xdp3z8gd137v0l7z8zxcmwhpaq1i4qbgx1llyi96b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -247479,6 +250654,8 @@ self: { pname = "yesod-auth"; version = "1.6.6"; sha256 = "0ibmv3ghxrrjjjqb9jg4wnwr7w4hl4lsvwic13ys8fihg40ln6ka"; + revision = "1"; + editedCabalFile = "14l8v1znq9y628vc6vj7dlgbryjkhf09kk2l2f5spr697lygh3qp"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -247647,8 +250824,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.7.1"; - sha256 = "1rfz2xanm6d70fx8ywh8j8py8003akzgi10s9n7syqm8kaj2fvqd"; + version = "1.7.1.1"; + sha256 = "0a1mz7nfrrgw0dalfbj72kd76nbgr9in63zrpijl4nd1p1j99br5"; libraryHaskellDepends = [ aeson base bytestring persistent text yesod-auth yesod-core yesod-form yesod-persistent @@ -248292,8 +251469,8 @@ self: { }: mkDerivation { pname = "yesod-fay"; - version = "0.9.0"; - sha256 = "186mxq6b5hl0ylsx9lajisywkc9klvbfbhq39pq497wk519ppc8s"; + version = "0.10.0"; + sha256 = "1qpcfiscwhb5rcdm335v6qi17rjxc0zc0qpv26lmyikdslj4jr9s"; libraryHaskellDepends = [ aeson base bytestring data-default directory fay fay-dom filepath monad-loops process pureMD5 shakespeare template-haskell text @@ -248601,8 +251778,6 @@ self: { testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yesod-media-simple" = callPackage @@ -248672,22 +251847,27 @@ self: { "yesod-paginator" = callPackage ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces - , persistent, safe, text, transformers, uri-encode, yesod-core - , yesod-test + , persistent, QuickCheck, quickcheck-classes, safe, text + , transformers, uri-encode, yesod-core, yesod-test }: mkDerivation { pname = "yesod-paginator"; - version = "1.1.0.1"; - sha256 = "140b4cikshl5f229awnp5jcbnyln0bmzlqjfcwxzxssxwnviy93f"; + version = "1.1.0.2"; + sha256 = "0r0qprsr2nkhy2b44xixmys32hp3wwhp5x521jzpcrd1jc5x38s9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blaze-markup path-pieces persistent safe text transformers uri-encode yesod-core ]; - testHaskellDepends = [ base doctest hspec yesod-core yesod-test ]; + testHaskellDepends = [ + base doctest hspec QuickCheck quickcheck-classes yesod-core + yesod-test + ]; description = "A pagination approach for yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-paypal-rest" = callPackage @@ -248734,8 +251914,8 @@ self: { }: mkDerivation { pname = "yesod-persistent"; - version = "1.6.0.1"; - sha256 = "0kxxm43d64lp4p7kmmpc9c0rany9nblf5dd1424m8wg3105cr2kl"; + version = "1.6.0.2"; + sha256 = "17adw0aaj29ia7ii3jka301442860b5wvfrms079q973gzahz5fd"; libraryHaskellDepends = [ base blaze-builder conduit persistent persistent-template resource-pool resourcet transformers yesod-core @@ -249283,6 +252463,8 @@ self: { pname = "yesod-test"; version = "1.5.9.1"; sha256 = "05l5n28azbh6r1vsi7xvz1h19if5zrwn1b3jsr2913axfs3d9r3y"; + revision = "1"; + editedCabalFile = "1s3rfrk122ag4j0jzmym8nj6iql5jxv6ilsf0671f63824x3kgas"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit @@ -249323,6 +252505,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_6_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , bytestring, case-insensitive, conduit, containers, cookie, hspec + , hspec-core, html-conduit, http-types, HUnit, network, pretty-show + , semigroups, text, time, transformers, unliftio, wai, wai-extra + , xml-conduit, xml-types, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.6.1"; + sha256 = "1mr0ad6z6s9rnxnv5ayg8xr93xfx9gxm8zym0866339w7p292wqd"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit network pretty-show semigroups text time + transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio wai wai-extra xml-conduit yesod-core yesod-form + ]; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -251113,10 +254321,10 @@ self: { }: mkDerivation { pname = "zip-archive"; - version = "0.4"; - sha256 = "06fs9959w807iy4xmngpnv1rps5sr1kqr2pd7b3iw6xfjlfskgjz"; + version = "0.4.1"; + sha256 = "1cdix5mnxrbs7b2kivhdydhfzgxidd9dqlw71mdw5p21cabwkmf5"; revision = "1"; - editedCabalFile = "1y4i0xblglhkj6nv2p0r2xgw8gqrhnsamkh7d389z68sf9zpgl6c"; + editedCabalFile = "1mv6jns7zf0fi7lrhzk007g12v6x7yf5ycbj67rbh83xfkf4nxsi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch b/nixpkgs/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch deleted file mode 100644 index e5ad00ee009f..000000000000 --- a/nixpkgs/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/beam-core/Database/Beam/Backend/SQL.hs b/beam-core/Database/Beam/Backend/SQL.hs -index e2cd37d0..6f9db126 100644 ---- a/Database/Beam/Backend/SQL.hs -+++ b/Database/Beam/Backend/SQL.hs -@@ -10,6 +10,7 @@ - import Database.Beam.Backend.Types - - import Control.Monad.IO.Class -+import Control.Monad.Fail (MonadFail) - - -- * MonadBeam class - -@@ -29,7 +30,7 @@ - -- strategies. More complicated strategies (for example, Postgres's @COPY@) - -- are supported in individual backends. See the documentation of those - -- backends for more details. --class (BeamBackend be, Monad m, MonadIO m, Sql92SanityCheck syntax) => -+class (BeamBackend be, Monad m, MonadIO m, MonadFail m, Sql92SanityCheck syntax) => - MonadBeam syntax be handle m | m -> syntax be handle where - - {-# MINIMAL withDatabaseDebug, runReturningMany #-} -diff --git a/Database/Beam/Backend/SQL/Builder.hs b/Database/Beam/Backend/SQL/Builder.hs -index 9e734036..e9849912 100644 ---- a/Database/Beam/Backend/SQL/Builder.hs -+++ b/Database/Beam/Backend/SQL/Builder.hs -@@ -33,6 +33,7 @@ - import Data.Hashable - import Data.Int - import Data.String -+import qualified Control.Monad.Fail as Fail - #if !MIN_VERSION_base(4, 11, 0) - import Data.Semigroup - #endif -@@ -507,8 +508,10 @@ - type BackendFromField SqlSyntaxBackend = Trivial - - newtype SqlSyntaxM a = SqlSyntaxM (IO a) -- deriving (Applicative, Functor, Monad, MonadIO) -+ deriving (Applicative, Functor, Monad, MonadIO, Fail.MonadFail) - - instance MonadBeam SqlSyntaxBuilder SqlSyntaxBackend SqlSyntaxBackend SqlSyntaxM where -- withDatabaseDebug _ _ _ = fail "absurd" -- runReturningMany _ _ = fail "absurd" -+ withDatabaseDebug _ _ _ = Fail.fail "absurd" -+ runReturningMany _ _ = Fail.fail "absurd" -+ -+ -diff --git a/Database/Beam/Schema/Lenses.hs b/Database/Beam/Schema/Lenses.hs -index b21dddb6..5df0654c 100644 ---- a/Database/Beam/Schema/Lenses.hs -+++ b/Database/Beam/Schema/Lenses.hs -@@ -1,4 +1,5 @@ - {-# LANGUAGE PolyKinds #-} -+{-# LANGUAGE UndecidableInstances #-} - module Database.Beam.Schema.Lenses - ( tableLenses - , TableLens(..) -diff --git a/beam-core.cabal b/beam-core.cabal -index 4bf4ffd9..251d4d85 100644 ---- a/beam-core.cabal -+++ b/beam-core.cabal -@@ -64,8 +64,8 @@ - time >=1.6 && <1.10, - hashable >=1.1 && <1.3, - network-uri >=2.6 && <2.7, -- containers >=0.5 && <0.6, -- vector-sized >=0.5 && <1.1, -+ containers >=0.5 && <0.7, -+ vector-sized >=0.5 && <1.3, - tagged >=0.8 && <0.9 - Default-language: Haskell2010 - default-extensions: ScopedTypeVariables, OverloadedStrings, GADTs, RecursiveDo, FlexibleInstances, FlexibleContexts, TypeFamilies, diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch b/nixpkgs/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch deleted file mode 100644 index b715140be0a5..000000000000 --- a/nixpkgs/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/Database/Beam/Migrate/Generics/Types.hs b/Database/Beam/Migrate/Generics/Types.hs -index 553e208b..0cf9b2c8 100644 ---- a/Database/Beam/Migrate/Generics/Types.hs -+++ b/Database/Beam/Migrate/Generics/Types.hs -@@ -1,3 +1,5 @@ -+{-# LANGUAGE UndecidableInstances #-} -+ - module Database.Beam.Migrate.Generics.Types where - - import Database.Beam.Migrate.Types -diff --git a/beam-migrate.cabal b/beam-migrate.cabal -index f53b280d..9cf3722c 100644 ---- a/beam-migrate.cabal -+++ b/beam-migrate.cabal -@@ -69,13 +69,12 @@ library - mtl >=2.2 && <2.3, - scientific >=0.3 && <0.4, - vector >=0.11 && <0.13, -- containers >=0.5 && <0.6, - unordered-containers >=0.2 && <0.3, - hashable >=1.2 && <1.3, - parallel >=3.2 && <3.3, - deepseq >=1.4 && <1.5, - ghc-prim >=0.5 && <0.6, -- containers >=0.5 && <0.6, -+ containers >=0.5 && <0.7, - haskell-src-exts >=1.18 && <1.21, - pretty >=1.1 && <1.2, - dependent-map >=0.2 && <0.3, diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch b/nixpkgs/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch deleted file mode 100644 index ede2bce12570..000000000000 --- a/nixpkgs/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/Database/Beam/Postgres/Connection.hs b/Database/Beam/Postgres/Connection.hs -index 433f55b9..5836c53d 100644 ---- a/Database/Beam/Postgres/Connection.hs -+++ b/Database/Beam/Postgres/Connection.hs -@@ -52,6 +52,8 @@ import qualified Database.PostgreSQL.Simple.Types as Pg (Null(..), Query(..)) - - import Control.Monad.Reader - import Control.Monad.State -+import Control.Monad.Fail (MonadFail) -+import qualified Control.Monad.Fail as Fail - - import Data.ByteString (ByteString) - import Data.ByteString.Builder (toLazyByteString, byteString) -@@ -302,6 +304,9 @@ deriving instance Functor PgF - newtype Pg a = Pg { runPg :: F PgF a } - deriving (Monad, Applicative, Functor, MonadFree PgF) - -+instance MonadFail Pg where -+ fail e = fail $ "Internal Error with: " <> show e -+ - instance MonadIO Pg where - liftIO x = liftF (PgLiftIO x id) - -diff --git a/beam-postgres.cabal b/beam-postgres.cabal -index e14b84f5..d29a5b67 100644 ---- a/beam-postgres.cabal -+++ b/beam-postgres.cabal -@@ -31,7 +31,7 @@ library - beam-migrate >=0.3 && <0.4, - - postgresql-libpq >=0.8 && <0.10, -- postgresql-simple >=0.5 && <0.6, -+ postgresql-simple >=0.5 && <0.7, - - text >=1.0 && <1.3, - bytestring >=0.10 && <0.11, -@@ -38,7 +38,7 @@ library - - hashable >=1.1 && <1.3, - lifted-base >=0.2 && <0.3, -- free >=4.12 && <5.1, -+ free >=4.12 && <5.2, - time >=1.6 && <1.10, - monad-control >=1.0 && <1.1, - mtl >=2.1 && <2.3, diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch b/nixpkgs/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch deleted file mode 100644 index ebfca8a2f655..000000000000 --- a/nixpkgs/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Database/Beam/Sqlite/Connection.hs b/Database/Beam/Sqlite/Connection.hs -index f034b272..4e459ea3 100644 ---- a/Database/Beam/Sqlite/Connection.hs -+++ b/Database/Beam/Sqlite/Connection.hs -@@ -37,6 +37,7 @@ import Database.SQLite.Simple.Types (Null) - - import Control.Exception (bracket_, onException, mask) - import Control.Monad (forM_, replicateM_) -+import Control.Monad.Fail (MonadFail) - import Control.Monad.Free.Church - import Control.Monad.IO.Class (MonadIO(..)) - import Control.Monad.Identity (Identity) -@@ -143,7 +144,7 @@ newtype SqliteM a - { runSqliteM :: ReaderT (String -> IO (), Connection) IO a - -- ^ Run an IO action with access to a SQLite connection and a debug logging - -- function, called or each query submitted on the connection. -- } deriving (Monad, Functor, Applicative, MonadIO) -+ } deriving (Monad, Functor, Applicative, MonadIO, MonadFail) - - newtype BeamSqliteParams = BeamSqliteParams [SQLData] - instance ToRow BeamSqliteParams where diff --git a/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix b/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix index 5e1288685a7e..c67d53f8d9c2 100644 --- a/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix +++ b/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix @@ -53,8 +53,20 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall + idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs + IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg || true + + # If the ipkg file defines an executable, install that + executable=$(grep -Po '^executable = \K.*' ${ipkgName}.ipkg || true) + # $executable intentionally not quoted because it must be quoted correctly + # in the ipkg file already + if [ ! -z "$executable" ] && [ -f $executable ]; then + mkdir -p $out/bin + mv $executable $out/bin/$executable + fi + runHook postInstall ''; diff --git a/nixpkgs/pkgs/development/idris-modules/glfw.nix b/nixpkgs/pkgs/development/idris-modules/glfw.nix index 535f549a5ebe..882058bb1856 100644 --- a/nixpkgs/pkgs/development/idris-modules/glfw.nix +++ b/nixpkgs/pkgs/development/idris-modules/glfw.nix @@ -10,8 +10,14 @@ build-idris-package { idrisDeps = [ effects ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; extraBuildInputs = [ pkgs.glfw ]; + postPatch = '' + substituteInPlace src/MakefileGlfw \ + --replace glfw3 "glfw3 gl" + ''; + src = fetchFromGitHub { owner = "eckart"; repo = "glfw-idris"; diff --git a/nixpkgs/pkgs/development/idris-modules/idris-wrapper.nix b/nixpkgs/pkgs/development/idris-modules/idris-wrapper.nix index f395bcd95d7c..4e1d2f9c82eb 100644 --- a/nixpkgs/pkgs/development/idris-modules/idris-wrapper.nix +++ b/nixpkgs/pkgs/development/idris-modules/idris-wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }: +{ stdenv, lib, symlinkJoin, makeWrapper, idris-no-deps, gmp }: symlinkJoin { inherit (idris-no-deps) name src meta; @@ -6,7 +6,9 @@ symlinkJoin { buildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/idris \ - --run 'export IDRIS_CC=''${IDRIS_CC:-${lib.getBin gcc}/bin/gcc}' \ - --suffix LIBRARY_PATH : ${lib.makeLibraryPath [ gmp ]} + --run 'export IDRIS_CC=''${IDRIS_CC:-${stdenv.cc}/bin/cc}' \ + --set NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST 1 \ + --prefix NIX_CFLAGS_COMPILE " " "-I${lib.getDev gmp}/include" \ + --prefix NIX_CFLAGS_LINK " " "-L${lib.getLib gmp}/lib" ''; } diff --git a/nixpkgs/pkgs/development/interpreters/hy/default.nix b/nixpkgs/pkgs/development/interpreters/hy/default.nix index 02ce07bdf471..12631cee38ae 100644 --- a/nixpkgs/pkgs/development/interpreters/hy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/hy/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; - sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1"; + sha256 = "00lq38ppikrpyw38fn5iy9iwrsamsv22507cp146dsjbzkwjpzrd"; }; + patches = [ + (fetchpatch { + name = "bytecode-error-handling.patch"; + url = "https://github.com/hylang/hy/commit/57326785b97b7b0a89f6258fe3d04dccdc06cfc0.patch"; + sha256 = "1lxxs7mxbh0kaaa25b1pbqs9d8asyjnlf2n86qg8hzsv32jfcq92"; + excludes = [ "AUTHORS" "NEWS.rst" ]; + }) + ]; + propagatedBuildInputs = with pythonPackages; [ appdirs astor clint + fastentrypoints funcparserlib rply ]; diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/5.1.nix b/nixpkgs/pkgs/development/interpreters/lua-5/5.1.nix deleted file mode 100644 index b2948b392d5e..000000000000 --- a/nixpkgs/pkgs/development/interpreters/lua-5/5.1.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ stdenv, fetchurl, readline -, self -, callPackage -, packageOverrides ? (self: super: {}) -}: - -let - dsoPatch = fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51"; - sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw"; - name = "lua-arch.patch"; - }; - luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; -in -stdenv.mkDerivation rec { - name = "lua-${version}"; - version = "5.1.5"; - luaversion = "5.1"; - - src = fetchurl { - url = "https://www.lua.org/ftp/${name}.tar.gz"; - sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; - }; - - LuaPathSearchPaths = luaPackages.getLuaPathList luaversion; - LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion; - setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; - - buildInputs = [ readline ]; - - patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ]) - ++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ]; - - configurePhase = - if stdenv.isDarwin - then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDFLAGS="" CC="$CC" ) - installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.5.1.5.dylib" INSTALL_DATA='cp -d' ) - '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) - installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' ) - ''; - - postInstall = '' - mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" - sed <"etc/lua.pc" >"$out/lib/pkgconfig/lua.pc" -e "s|^prefix=.*|prefix=$out|" - mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" - rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua - ''; - - passthru = rec { - buildEnv = callPackage ./wrapper.nix { - lua=self; - inherit (luaPackages) requiredLuaModules; - }; - withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; - pkgs = luaPackages; - interpreter = "${self}/bin/lua"; - }; - - meta = { - homepage = http://www.lua.org; - description = "Powerful, fast, lightweight, embeddable scripting language"; - longDescription = '' - Lua combines simple procedural syntax with powerful data - description constructs based on associative arrays and extensible - semantics. Lua is dynamically typed, runs by interpreting bytecode - for a register-based virtual machine, and has automatic memory - management with incremental garbage collection, making it ideal - for configuration, scripting, and rapid prototyping. - ''; - license = stdenv.lib.licenses.mit; - platforms = with stdenv.lib.platforms; linux ++ darwin; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/5.2.nix b/nixpkgs/pkgs/development/interpreters/lua-5/5.2.nix deleted file mode 100644 index e89a2cbece6d..000000000000 --- a/nixpkgs/pkgs/development/interpreters/lua-5/5.2.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv, fetchurl, readline -# compiles compatibility layer with lua5.1 -, compat ? false -, callPackage -, self -, packageOverrides ? (self: super: {}) -}: - -let - dsoPatch = fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua52"; - sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9"; - name = "lua-arch.patch"; - }; - luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; -in -stdenv.mkDerivation rec { - name = "lua-${version}"; - luaversion = "5.2"; - version = "${luaversion}.4"; - - LuaPathSearchPaths = luaPackages.getLuaPathList luaversion; - LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion; - setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; - - src = fetchurl { - url = "https://www.lua.org/ftp/${name}.tar.gz"; - sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; - }; - - buildInputs = [ readline ]; - - patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch ]; - - - passthru = rec { - buildEnv = callPackage ./wrapper.nix { - lua = self; - inherit (luaPackages) requiredLuaModules; - }; - withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; - pkgs = luaPackages; - interpreter = "${self}/bin/lua"; - }; - - enableParallelBuilding = true; - - configurePhase = - if stdenv.isDarwin - then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" ) - installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) - '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) - installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' ) - ''; - - postInstall = '' - mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" - mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" - rmdir $out/{share,lib}/lua/${luaversion} $out/{share,lib}/lua - mkdir -p "$out/lib/pkgconfig" - cat >"$out/lib/pkgconfig/lua.pc" <<EOF - prefix=$out - libdir=$out/lib - includedir=$out/include - INSTALL_BIN=$out/bin - INSTALL_INC=$out/include - INSTALL_LIB=$out/lib - INSTALL_MAN=$out/man/man1 - - Name: Lua - Description: An Extensible Extension Language - Version: ${version} - Requires: - Libs: -L$out/lib -llua -lm - Cflags: -I$out/include - EOF - ''; - - meta = { - homepage = http://www.lua.org; - description = "Powerful, fast, lightweight, embeddable scripting language"; - longDescription = '' - Lua combines simple procedural syntax with powerful data - description constructs based on associative arrays and extensible - semantics. Lua is dynamically typed, runs by interpreting bytecode - for a register-based virtual machine, and has automatic memory - management with incremental garbage collection, making it ideal - for configuration, scripting, and rapid prototyping. - ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix index 6b356831b3bb..bc41d86256b2 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -150,6 +150,9 @@ builtins.removeAttrs attrs ["disabled" "checkInputs"] // { installPhase = attrs.installPhase or '' runHook preInstall + # work around failing luarocks test for Write access + mkdir -p $out + # luarocks make assumes sources are available in cwd # After the build is complete, it also installs the rock. # If no argument is given, it looks for a rockspec in the current directory diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix new file mode 100644 index 000000000000..fb709227180f --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix @@ -0,0 +1,65 @@ +# similar to interpreters/python/default.nix +{ stdenv, lib, callPackage, fetchurl }: +let + dsoPatch51 = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51"; + sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw"; + name = "lua-arch.patch"; + }; + + dsoPatch52 = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua52"; + sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9"; + name = "lua-arch.patch"; + }; + +in rec { + + lua5_3 = callPackage ./interpreter.nix { + sourceVersion = { major = "5"; minor = "3"; patch = "5"; }; + hash = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"; + patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ] ; + postConfigure = lib.optionalString (!stdenv.isDarwin) '' + cat ${./lua-5.3-dso.make} >> src/Makefile + sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile + ''; + + postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) '' + ( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so ) + ''; + }; + + lua5_3_compat = lua5_3.override({ + compat = true; + }); + + + lua5_2 = callPackage ./interpreter.nix { + sourceVersion = { major = "5"; minor = "2"; patch = "4"; }; + hash = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; + patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch52 ]; + }; + + lua5_2_compat = lua5_2.override({ + compat = true; + }); + + + lua5_1 = callPackage ./interpreter.nix { + sourceVersion = { major = "5"; minor = "1"; patch = "5"; }; + hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; + patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch51 ]) + ++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ]; + }; + + luajit_2_0 = import ../luajit/2.0.nix { + self = luajit_2_0; + inherit callPackage lib; + }; + + luajit_2_1 = import ../luajit/2.1.nix { + self = luajit_2_1; + inherit callPackage lib; + }; + +} diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/5.3.nix b/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix index c1fdc0fd9904..26db917c9002 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/5.3.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, readline, compat ? false +{ stdenv, fetchurl, readline +, compat ? false , callPackage -, self , packageOverrides ? (self: super: {}) +, sourceVersion +, hash +, patches ? [] +, postConfigure ? null +, postBuild ? null }: let - luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; -in -stdenv.mkDerivation rec { - name = "lua-${version}"; - luaversion = "5.3"; - version = "${luaversion}.5"; +luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; + +self = stdenv.mkDerivation rec { + pname = "lua"; + luaversion = with sourceVersion; "${major}.${minor}"; + version = "${luaversion}.${sourceVersion.patch}"; src = fetchurl { - url = "https://www.lua.org/ftp/${name}.tar.gz"; - sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"; + url = "https://www.lua.org/ftp/${pname}-${luaversion}.tar.gz"; + sha256 = hash; }; LuaPathSearchPaths = luaPackages.getLuaPathList luaversion; @@ -22,29 +27,43 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; - patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else []; - - configurePhase = - if stdenv.isDarwin - then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" ) - installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) - '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) - installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' ) - cat ${./lua-5.3-dso.make} >> src/Makefile - sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile - ''; + inherit patches; + + # see configurePhase for additional flags (with space) + makeFlags = [ + "INSTALL_TOP=${placeholder "out"}" + "INSTALL_MAN=${placeholder "out"}/share/man/man1" + "R=${version}" + "LDFLAGS=-fPIC" + "V=${luaversion}" + ] ++ (if stdenv.isDarwin then [ + "PLAT=macosx" + ] else [ + "PLAT=linux" + ]) + ; + + configurePhase = '' + runHook preConfigure - postBuild = stdenv.lib.optionalString (! stdenv.isDarwin) '' - ( cd src; make liblua.so "''${makeFlagsArray[@]}" ) + makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" ) + makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}) + + installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ + TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" ) + + runHook postConfigure ''; + inherit postConfigure; + + inherit postBuild; postInstall = '' mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" rmdir $out/{share,lib}/lua/${luaversion} $out/{share,lib}/lua mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/lua.pc" <<EOF prefix=$out libdir=$out/lib @@ -88,4 +107,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; -} +}; +in self diff --git a/nixpkgs/pkgs/development/interpreters/perl/default.nix b/nixpkgs/pkgs/development/interpreters/perl/default.nix index ac13f006f3c5..c95d9b3009a7 100644 --- a/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -171,11 +171,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "276849e62f472c1b241d9e7b38a28e4cc9f98563"; # Dez 02, 2018 + crossVersion = "9e4051cd28b7b3afb162776f5627c7abe4c7b9ea"; # Apr 21, 2019 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1fpr1m9lgkwdp1vmdr0s6gvmcpd0m8q6jwn024bkczc2h37bdynd"; + sha256 = "0dj99w2dicbp3c3wn0k32785pc4c68iqnlyxswnza6mhw6wvl9v7"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -194,8 +194,8 @@ in rec { # the latest Maint version perl528 = common { self = perl528; - version = "5.28.1"; - sha256 = "0iy3as4hnbjfyws4in3j9d6zhhjxgl5m95i5n9jy2bnzcpz8bgry"; + version = "5.28.2"; + sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da"; }; # the latest Devel version diff --git a/nixpkgs/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix index 97aa610273b1..073f3dfdc30e 100644 --- a/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -258,24 +258,24 @@ let in { php71 = generic { - version = "7.1.28"; - sha256 = "1jal5kr3h9krgb4x46l7wg9czfiigax6vni6cagfdi8zzqrqg7kk"; + version = "7.1.29"; + sha256 = "0dc3p3xq430vawcryw3xb4d1ckkz44rdnvfr833jsrl2zrzd2a45"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch; }; php72 = generic { - version = "7.2.17"; - sha256 = "0xag1735q92kj8p09gyydxknisgz7h56pksr44qwnykddymi3a4i"; + version = "7.2.18"; + sha256 = "0wjb9j5slqjx1fn00ljwgy4vlxvz9a6s9677h5z20wqi5nqjf6ps"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.4"; - sha256 = "0y1bl4nwpr0z11wsdizrs3nvkx1xs3xzy7mn8gj4jdn82a13sb1f"; + version = "7.3.5"; + sha256 = "0pn3c9fj24v0r57d3cz67nisg6vjyw2yn5il7j1c6rw2z47bi023"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index 7727b984d969..73d1e0ea9fd7 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -3,10 +3,10 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "python27-docs-html-2.7.3"; + name = "python27-docs-html-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-html.tar.bz2; - sha256 = "1hg92n0mzl9w6j33b2h0bf2vy6fsxnpxfdc3qw760vcm0y00155j"; + url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2; + sha256 = "1razs1grzhai65ihaiyph8kz6ncjkgp1gsn3c8v7kanf13lqim02"; }; installPhase = '' mkdir -p $out/share/doc/python27 diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index 0c9673b7d7a9..54c0954ae5d0 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -3,10 +3,10 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "python27-docs-pdf-a4-2.7.3"; + name = "python27-docs-pdf-a4-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-pdf-a4.tar.bz2; - sha256 = "13da88panq5b6qfhf8k4dgqgxkg4ydcac5cx69a3f35s1w90xdjr"; + url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2; + sha256 = "14ml1ynrlbhg43737bdsb8k5y39wsffqj4iwhylhb8n8l5dplfdq"; }; installPhase = '' mkdir -p $out/share/doc/python27 diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 9b0018e7cd78..059908029c0b 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -3,10 +3,10 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "python27-docs-pdf-letter-2.7.3"; + name = "python27-docs-pdf-letter-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-pdf-letter.tar.bz2; - sha256 = "0x41phsdrpivhzkchswsliyx3a10n7gzc9irkrw6rz22j81bfydg"; + url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2; + sha256 = "019i8n48m71mn31v8d85kkwyqfgcgqnqh506y4a7fcgf656bajs0"; }; installPhase = '' mkdir -p $out/share/doc/python27 diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index b7bcfb51d29a..53c5aa3b629b 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -3,10 +3,10 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "python27-docs-text-2.7.3"; + name = "python27-docs-text-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-text.tar.bz2; - sha256 = "1rxlb3jhh3892y65i45nk1y2lx981fr22a5hmfkp9gvjvdykjnzp"; + url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2; + sha256 = "1da7swlykvc013684nywycinfz3v8dqkcmv0zj8p7l5lyi5mq03r"; }; installPhase = '' mkdir -p $out/share/doc/python27 diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix new file mode 100644 index 000000000000..5a6dcc63225e --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix @@ -0,0 +1,18 @@ +# This file was generated and will be overwritten by ./generate.sh + +{ stdenv, fetchurl, lib }: + +stdenv.mkDerivation rec { + name = "python37-docs-html-3.7.2"; + src = fetchurl { + url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2; + sha256 = "19wbrawpdam09fmyipfy92sxwn1rl93v8jkfqsfx028qhvzf0422"; + }; + installPhase = '' + mkdir -p $out/share/doc/python37 + cp -R ./ $out/share/doc/python37/html + ''; + meta = { + maintainers = [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix new file mode 100644 index 000000000000..a122d7519f5d --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix @@ -0,0 +1,18 @@ +# This file was generated and will be overwritten by ./generate.sh + +{ stdenv, fetchurl, lib }: + +stdenv.mkDerivation rec { + name = "python37-docs-pdf-a4-3.7.2"; + src = fetchurl { + url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2; + sha256 = "0vdx762m30hjaabn6w88awcj2qpbz0b6z59zn9wmamd35k59lfba"; + }; + installPhase = '' + mkdir -p $out/share/doc/python37 + cp -R ./ $out/share/doc/python37/pdf-a4 + ''; + meta = { + maintainers = [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix new file mode 100644 index 000000000000..4473f2e351c4 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix @@ -0,0 +1,18 @@ +# This file was generated and will be overwritten by ./generate.sh + +{ stdenv, fetchurl, lib }: + +stdenv.mkDerivation rec { + name = "python37-docs-pdf-letter-3.7.2"; + src = fetchurl { + url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2; + sha256 = "17g57vlyvqx0k916q84q2pcx7y8myw0fda9fvg9kh0ph930c837x"; + }; + installPhase = '' + mkdir -p $out/share/doc/python37 + cp -R ./ $out/share/doc/python37/pdf-letter + ''; + meta = { + maintainers = [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix new file mode 100644 index 000000000000..d9d21bfe3a57 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix @@ -0,0 +1,18 @@ +# This file was generated and will be overwritten by ./generate.sh + +{ stdenv, fetchurl, lib }: + +stdenv.mkDerivation rec { + name = "python37-docs-text-3.7.2"; + src = fetchurl { + url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2; + sha256 = "0h50rlr8jclwfxa106b42q2vn2ynp219c4zsy5qz65n5m3b7y1g2"; + }; + installPhase = '' + mkdir -p $out/share/doc/python37 + cp -R ./ $out/share/doc/python37/text + ''; + meta = { + maintainers = [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/default.nix index 60e0a0bf1e6e..a538f731473b 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/default.nix @@ -7,23 +7,35 @@ pythonDocs = { python27 = import ./2.7-html.nix { inherit stdenv fetchurl lib; }; + python37 = import ./3.7-html.nix { + inherit stdenv fetchurl lib; + }; }; pdf_a4 = { recurseForDerivations = true; python27 = import ./2.7-pdf-a4.nix { inherit stdenv fetchurl lib; }; + python37 = import ./3.7-pdf-a4.nix { + inherit stdenv fetchurl lib; + }; }; pdf_letter = { recurseForDerivations = true; python27 = import ./2.7-pdf-letter.nix { inherit stdenv fetchurl lib; }; + python37 = import ./3.7-pdf-letter.nix { + inherit stdenv fetchurl lib; + }; }; text = { recurseForDerivations = true; python27 = import ./2.7-text.nix { inherit stdenv fetchurl lib; }; + python37 = import ./3.7-text.nix { + inherit stdenv fetchurl lib; + }; }; }; in pythonDocs diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/generate.sh b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/generate.sh index bebefc10ccd0..a4b2e0893fcd 100755 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/generate.sh +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/generate.sh @@ -2,7 +2,7 @@ TYPES="html pdf-a4 pdf-letter text" URL=http://docs.python.org/ftp/python/doc/VERSION/python-VERSION-docs-TYPE.tar.bz2 -VERSIONS=$(curl http://www.python.org/download/releases/ 2>/dev/null | grep "releases/[123456789]"| cut -d/ -f4 |grep -v "^[12].[012345]" |grep -v "^1.6.1") +VERSIONS=$(for major in 2 3; do curl https://docs.python.org/$major/archives/ 2>/dev/null | perl -l -n -e'/<a href="python-([23].[0-9].[0-9]+)-docs-html.tar.bz2/ && print $1' | tail -n 1; done) echo "Generating expressions for: ${VERSIONS} " diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/nixpkgs/pkgs/development/interpreters/wasmtime/cargo-lock.patch new file mode 100644 index 000000000000..be5bd0ab3d3e --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/cargo-lock.patch @@ -0,0 +1,1481 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..f702de1 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1475 @@ ++[[package]] ++name = "aho-corasick" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atty" ++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)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (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)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++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)", ++] ++ ++[[package]] ++name = "bindgen" ++version = "0.49.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)", ++ "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)", ++ "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)", ++ "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)", ++ "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)", ++ "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" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "capstone" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "capstone-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "capstone-sys" ++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)", ++] ++ ++[[package]] ++name = "cast" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cc" ++version = "1.0.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cexpr" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++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)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clang-sys" ++version = "0.28.0" ++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)", ++] ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++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)", ++ "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)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++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)", ++] ++ ++[[package]] ++name = "cmake" ++version = "0.1.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-bforest" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-codegen" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-bforest 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen-meta 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)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashmap_core 0.1.10 (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)", ++] ++ ++[[package]] ++name = "cranelift-codegen-meta" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-entity" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cranelift-frontend" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashmap_core 0.1.10 (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)", ++] ++ ++[[package]] ++name = "cranelift-native" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-wasm" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cast 0.2.2 (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-frontend 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.3.1" ++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)", ++ "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)", ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++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)", ++] ++ ++[[package]] ++name = "docopt" ++version = "1.1.0" ++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)", ++] ++ ++[[package]] ++name = "dynasm" ++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)", ++ "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)", ++ "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)", ++] ++ ++[[package]] ++name = "dynasmrt" ++version = "0.3.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)", ++ "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "env_logger" ++version = "0.5.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "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)", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "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)", ++] ++ ++[[package]] ++name = "errno" ++version = "0.2.4" ++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)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "errno-dragonfly" ++version = "0.1.1" ++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)", ++] ++ ++[[package]] ++name = "faerie" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "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)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++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)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++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)", ++ "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)", ++] ++ ++[[package]] ++name = "fallible-iterator" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "file-per-thread-logger" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "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" ++ ++[[package]] ++name = "gimli" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fallible-iterator 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "glob" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "goblin" ++version = "0.0.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hashmap_core" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "heck" ++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)", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[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 = [ ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.51" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libloading" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lightbeam" ++version = "0.0.0" ++dependencies = [ ++ "capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dynasm 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dynasmrt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itertools 0.8.0 (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)", ++ "multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++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)", ++] ++ ++[[package]] ++name = "mach" ++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)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memmap" ++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)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memoffset" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memoffset" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "multi_mut" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ndarray" ++version = "0.12.1" ++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)", ++] ++ ++[[package]] ++name = "nodrop" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "nom" ++version = "4.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[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" ++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-traits" ++version = "0.2.6" ++source = "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)", ++] ++ ++[[package]] ++name = "owning_ref" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "peeking_take_while" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "plain" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pretty_env_logger" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.27" ++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)", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quickcheck" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++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)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.5.6" ++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.51 (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_core" ++version = "0.2.2" ++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_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "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.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)", ++] ++ ++[[package]] ++name = "rawpointer" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rayon" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++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)", ++ "num_cpus 1.10.0 (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" ++ ++[[package]] ++name = "redox_termios" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.1.5" ++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)", ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "region" ++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)", ++ "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" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scopeguard" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scroll" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "scroll_derive" ++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)", ++ "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)", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.90" ++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)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.90" ++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)", ++ "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)", ++] ++ ++[[package]] ++name = "serde_json" ++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)", ++] ++ ++[[package]] ++name = "shlex" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "string-interner" ++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)", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "strsim" ++version = "0.9.1" ++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" ++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)", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.2.15" ++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)", ++ "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)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.15.31" ++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)", ++ "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" ++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)", ++ "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)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "take_mut" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "target-lexicon" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termion" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (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)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++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)", ++] ++ ++[[package]] ++name = "time" ++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)", ++ "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)", ++] ++ ++[[package]] ++name = "traitobject" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "typemap" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unsafe-any" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++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_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)", ++] ++ ++[[package]] ++name = "wabt-sys" ++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)", ++ "glob 0.2.11 (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" ++dependencies = [ ++ "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasmtime-debug" ++version = "0.1.0" ++dependencies = [ ++ "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)", ++ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gimli 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-environ" ++version = "0.1.0" ++dependencies = [ ++ "cast 0.2.2 (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)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "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)", ++ "lightbeam 0.0.0", ++ "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasmtime-jit" ++version = "0.1.0" ++dependencies = [ ++ "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-frontend 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)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-debug 0.1.0", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-runtime 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-obj" ++version = "0.1.0" ++dependencies = [ ++ "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)", ++ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-runtime" ++version = "0.1.0" ++dependencies = [ ++ "bindgen 0.49.0 (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)", ++ "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)", ++ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "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)", ++ "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)", ++ "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" ++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)", ++ "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-wast 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-wasi" ++version = "0.0.0" ++dependencies = [ ++ "bindgen 0.49.0 (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)", ++ "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)", ++ "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", ++ "wasmtime-jit 0.1.0", ++ "wasmtime-runtime 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-wast" ++version = "0.1.0" ++dependencies = [ ++ "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-native 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)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (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-environ 0.1.0", ++ "wasmtime-jit 0.1.0", ++ "wasmtime-runtime 0.1.0", ++] ++ ++[[package]] ++name = "which" ++version = "2.0.1" ++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)", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wincolor" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" ++"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 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 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 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 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 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" ++"checksum cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b66e28877b75b3d2b31250f780bb5db8f68ae3df681cd56add803b2567ac4fd" ++"checksum cranelift-frontend 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b72d55fd732b1f7a99d043a36c54a5679b6ec8bc777c8d954fb97c4fa0fce7eb" ++"checksum cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0239f34836621a127c2132980b2f5c32a1be1c40e2d1a9a1a9bd5af33c12aee" ++"checksum cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "740ebfba28c8433f06750f84819f1eb663ea9f5e4b9a81c01f4e52262d868b56" ++"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3" ++"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150" ++"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9" ++"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" ++"checksum dynasm 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f36d49ab6f8ecc642d2c6ee10fda04ba68003ef0277300866745cdde160e6b40" ++"checksum dynasmrt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c408a211e7f5762829f5e46bdff0c14bc3b1517a21a4bb781c716bf88b0c68" ++"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" ++"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" ++"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a" ++"checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e" ++"checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" ++"checksum faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f48412f92b56015a240e249847295b38b0a731435806c21a199403b2c317272c" ++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" ++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" ++"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 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" ++"checksum goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6a4013e9182f2345c6b7829b9ef6e670bce0dfca12c6f974457ed2160c2c7fe9" ++"checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" ++"checksum hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8e04cb7a5051270ef3fa79f8c7604d581ecfa73d520e74f554e45541c4b5881a" ++"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 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 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 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_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" ++"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 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_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 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 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-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_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 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_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 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 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-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 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 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" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix new file mode 100644 index 000000000000..33d00afd9e70 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -0,0 +1,31 @@ +{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }: + +rustPlatform.buildRustPackage rec { + name = "wasmtime-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "CraneStation"; + repo = "wasmtime"; + rev = "07a6ca8f4e1136ecd9f4af8d1f03a01aade60407"; + sha256 = "1cq6nz90kaf023mcyblca90bpvbzhq8xjq01laa28v7r50lagcn5"; + fetchSubmodules = true; + }; + + cargoSha256 = "0xy8vazb4nc4q1098ws92j1yfwp9w7q30z0yk2gindkn898603bc"; + + cargoPatches = [ ./cargo-lock.patch ]; + + nativeBuildInputs = [ python cmake clang ]; + buildInputs = [ llvmPackages.libclang ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + meta = with lib; { + description = "Standalone JIT-style runtime for WebAsssembly, using Cranelift"; + homepage = https://github.com/CraneStation/wasmtime; + license = licenses.asl20; + maintainers = [ maintainers.matthewbauer ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 8f1b7d93d002..2909b16d65d8 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -9,6 +9,7 @@ , dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, dbus , udevSupport ? false, udev , ibusSupport ? false, ibus +, fcitxSupport ? false, fcitx , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid , libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ] ++ dlopenBuildInputs ++ optional ibusSupport ibus + ++ optional fcitxSupport fcitx ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL # Needed for NSDefaultRunLoopMode symbols. diff --git a/nixpkgs/pkgs/development/libraries/accountsservice/default.nix b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix index b42240a26c4e..c20167138b72 100644 --- a/nixpkgs/pkgs/development/libraries/accountsservice/default.nix +++ b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.54"; + version = "0.6.55"; src = fetchurl { url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "1b115n0a4yfa06kgxc69qfc1rc0w4frgs3id3029czkrhhn0ds96"; + sha256 = "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz"; }; nativeBuildInputs = [ pkgconfig makeWrapper meson ninja python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch index ef1a59b0249f..0333f925d267 100644 --- a/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch +++ b/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch @@ -1,15 +1,15 @@ diff --git a/meson_post_install.py b/meson_post_install.py -index ba95055..17f7926 100644 +index 5cc2dc4..dd27ad5 100644 --- a/meson_post_install.py +++ b/meson_post_install.py @@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1]) # FIXME: meson will not track the creation of these directories # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39 dst_dirs = [ -- os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), -- os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), -+ #os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), -+ #os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), +- (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), +- (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), ++# (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), ++# (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), ] - for dst_dir in dst_dirs: + for (dst_dir, dst_dir_mode) in dst_dirs: diff --git a/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/nixpkgs/pkgs/development/libraries/appstream/qt.nix index c5a251cd5f9f..0013764d7791 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/qt.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/qt.nix @@ -1,5 +1,7 @@ { stdenv, appstream, qtbase, qttools }: +# TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here + stdenv.mkDerivation rec { name = "appstream-qt-${version}"; inherit (appstream) version src prePatch; @@ -10,15 +12,6 @@ stdenv.mkDerivation rec { mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; - postInstall = '' - rm -rf $out/{bin,etc,include/appstream,lib/pkgconfig,lib/libappstream.so*,share} - ''; - - preFixup = '' - patchelf --add-needed ${appstream}/lib/libappstream.so.4 \ - $out/lib/libAppStreamQt.so - ''; - meta = appstream.meta // { description = "Software metadata handling library - Qt"; }; diff --git a/nixpkgs/pkgs/development/libraries/aravis/default.nix b/nixpkgs/pkgs/development/libraries/aravis/default.nix index 2fbf7a0be2cf..ba68f046b0a0 100644 --- a/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "aravis"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "0v0hv1iyhp2azxij3ighp1b4rsw99zyqmkpdqnnxdmkcna031iga"; + sha256 = "0zlmw040iv0xx9qw7ygzbl96bli6ivll2fbziv19f4bdc0yhqjpw"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 3670bfd74784..7ef4feab188d 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.200.8"; + version = "9.300.2"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "09fcl6dgxg9203spplr7fwsbms3dvil5h5k3k6vfw7n7sm6ns3p2"; + sha256 = "1d2nsbspj9vzgzb6w2vgjv2wzidjzc8sr8wkz2zl7wxpgspl299n"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index cff960b29a73..7f7ef3336a4c 100644 --- a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,21 +1,28 @@ -{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: +{ stdenv, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }: let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "46ae2605c2de306f5740587107dcf333a527f2d1"; - sha256 = "07ps745gas2zcfmg56m3vwl63yyzmalnxwb5dc40vd004cx5hdik"; + 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"; }; in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "163s4i2cywq95jgrxbaq48qwmww0ibkq61k1aad4w9z9vpjfgnil"; + sha256 = "06irh5zx6lc7jjf6hpz1vzk0pvbdx08lcirc8cp8ksb8j7fpfamc"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -26,36 +33,31 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]; - buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ]; + buildInputs = [ + boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson + snappy thrift uriparser zlib zstd python.pkgs.python python.pkgs.numpy + ]; preConfigure = '' - substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - substituteInPlace cmake_modules/FindGLOG.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + + cp ${Finduriparser_cmake} cmake_modules/Finduriparser.cmake patchShebangs build-support/ - ''; - BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; }; - DOUBLE_CONVERSION_HOME = double-conversion; - FLATBUFFERS_HOME = flatbuffers; - GFLAGS_HOME = gflags; - GLOG_HOME = glog; - GTEST_HOME = symlinkJoin { name="gtest-wrap"; paths = [ gtest gtest.dev ]; }; - LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; }; - RAPIDJSON_HOME = rapidjson; - SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; - THRIFT_HOME = thrift; - ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib zlib.dev ]; }; - ZSTD_HOME = zstd; + # Fix build for ARROW_USE_SIMD=OFF + # https://jira.apache.org/jira/browse/ARROW-5007 + sed -i src/arrow/util/sse-util.h -e '1i#include "arrow/util/logging.h"' + sed -i src/arrow/util/neon-util.h -e '1i#include "arrow/util/logging.h"' + ''; cmakeFlags = [ "-DARROW_BUILD_TESTS=ON" - "-DARROW_PYTHON=ON" + "-DARROW_DEPENDENCY_SOURCE=SYSTEM" "-DARROW_PARQUET=ON" - ]; + "-DARROW_PYTHON=ON" + "-Duriparser_SOURCE=SYSTEM" + ] ++ stdenv.lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; doInstallCheck = true; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; diff --git a/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix index d802d70adf3b..0f9f5f5aac68 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libmysofa-${version}"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "160gcmsn6dwaca29bs95nsgjdalwc299lip0h37k3jcbxxkchgsh"; + sha256 = "0si0z7cfw6xcs3dkrb4zini55xpxwfp27yl8lbx39gx2pf8v2jls"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix index 7f1e3d941a1a..2adec665e1c0 100644 --- a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, rtmidi }: stdenv.mkDerivation rec { - version = "5.0.0"; + version = "5.1.0"; name = "rtaudio-${version}"; src = fetchFromGitHub { owner = "thestk"; repo = "rtaudio"; rev = "${version}"; - sha256 = "0jkqnhc2pq31nmq4daxhmqdjgv2qi4ib27hwms2r5zhnmvvzlr67"; + sha256 = "1pglnjz907ajlhnlnig3p0sx7hdkpggr8ss7b3wzf1lykzgv9l52"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index 5404c0a1fdfc..5b938ddb03cf 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "0wfqs77plb37gp586a0pclxjlpsjvq44991am8p2g5j46zfz6pdx"; + sha256 = "1z02ndb9jjn0p5bcc49pq0d8c0q2pq33dlszw77l76jkhrfx0921"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index e53c75e6f74e..f46571587efd 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.7.56"; + version = "1.7.90"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0vfw5bqlwm5r0ikziz3jx6yb5v24lwig0m62979zy3ndx36kpb9b"; + sha256 = "0zpqi612qmm0n53crxiisv0vdif43ymg13kafy6vv43j2wmh66ga"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/nixpkgs/pkgs/development/libraries/boost/1.70.nix b/nixpkgs/pkgs/development/libraries/boost/1.70.nix new file mode 100644 index 000000000000..5f7b39c1189e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boost/1.70.nix @@ -0,0 +1,11 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.70.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_70_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_70_0.html + sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778"; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index ec48a5a1ae46..c81b5ba57ad9 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -1,13 +1,13 @@ { config, stdenv, lib, fetchurl, fetchpatch, pkgconfig, autoreconfHook -, pixman, xorg +, pixman , zlibSupport ? true, zlib , pngSupport ? true, libpng , freetypeSupport ? true, freetype , fontconfigSupport ? freetypeSupport, fontconfig , gobjectSupport ? true, glib -, xlibSupport ? true -, xlibXrenderSupport ? xlibSupport -, xcbSupport ? true # no longer experimental since 1.12 +, x11Support ? !stdenv.isDarwin, libX11, libXext +, x11XrenderSupport ? x11Support, libXrender +, xcbSupport ? !stdenv.isDarwin, libxcb # no longer experimental since 1.12 , libGLSupported , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) , libGL ? null # libGLU_combined is no longer a big dependency @@ -15,7 +15,7 @@ }: assert fontconfigSupport -> freetypeSupport; -assert xlibXrenderSupport -> xlibSupport; +assert x11XrenderSupport -> x11Support; assert glSupport -> libGL != null; let @@ -67,9 +67,9 @@ in stdenv.mkDerivation rec { [ pixman ] ++ optional zlibSupport zlib ++ optional pngSupport libpng - ++ optionals xlibSupport (with xorg; [ libX11 libXext ]) - ++ optional xlibXrenderSupport xorg.libXrender - ++ optional xcbSupport xorg.libxcb + ++ optionals x11Support [ libX11 libXext ] + ++ optional x11XrenderSupport libXrender + ++ optional xcbSupport libxcb ++ optional freetypeSupport freetype ++ optional fontconfigSupport fontconfig ++ optional gobjectSupport glib diff --git a/nixpkgs/pkgs/development/libraries/cctz/default.nix b/nixpkgs/pkgs/development/libraries/cctz/default.nix index e61b5840cf93..2930ffa61e3c 100644 --- a/nixpkgs/pkgs/development/libraries/cctz/default.nix +++ b/nixpkgs/pkgs/development/libraries/cctz/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cctz-${version}"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "google"; repo = "cctz"; rev = "v${version}"; - sha256 = "0liiqz1swfc019rzfaa9y5kavs2hwabs2vnwbn9jfczhyxy34y89"; + sha256 = "0254xfwscfkjc3fbvx6qgifr3pwkc2rb03z8pbvvqy098di9alhr"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix index 5dece8328b41..c9ef618420ef 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.5.6"; + version = "2.5.7"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "02n3xjjs68xszvyk2830i03clbqlngnic0cw1rk6xca7gsvad3ij"; + sha256 = "155mmxrd2gm81v4ayff43xhi341ivqfpx2n6x9imldkr35hchzvm"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/cmark/default.nix b/nixpkgs/pkgs/development/libraries/cmark/default.nix index a7b604bc0d2e..ede2049b6ee9 100644 --- a/nixpkgs/pkgs/development/libraries/cmark/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmark/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.28.3"; + version = "0.29.0"; name = "cmark-${version}"; src = fetchFromGitHub { owner = "jgm"; repo = "cmark"; rev = version; - sha256 = "1lal6n6q7l84njgdcq1xbfxan56qlvr8xaw9m2jbd0jk4y2wkczg"; + sha256 = "0r7jpqhgnssq444i8pwji2g36058vfzwkl70wbiwj13h4w5rfc8f"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cogl/default.nix b/nixpkgs/pkgs/development/libraries/cogl/default.nix index e4296810f35f..cff32ca2d70f 100644 --- a/nixpkgs/pkgs/development/libraries/cogl/default.nix +++ b/nixpkgs/pkgs/development/libraries/cogl/default.nix @@ -7,11 +7,11 @@ let pname = "cogl"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.22.2"; + version = "1.22.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; + sha256 = "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj"; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/cracklib/default.nix b/nixpkgs/pkgs/development/libraries/cracklib/default.nix index d335a286c87b..ea3f5e6476bc 100644 --- a/nixpkgs/pkgs/development/libraries/cracklib/default.nix +++ b/nixpkgs/pkgs/development/libraries/cracklib/default.nix @@ -1,5 +1,5 @@ let version = "2.9.7"; in -{ stdenv, fetchurl, zlib, gettext +{ stdenv, lib, buildPackages, fetchurl, zlib, gettext , wordlists ? [ (fetchurl { url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; sha256 = "12fk8w06q628v754l357cf8kfjna98wj09qybpqr892az3x4a33z"; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1rimpjsdnmw8f5b7k558cic41p2qy2n2yrlqp5vh7mp4162hk0py"; }; + nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; buildInputs = [ zlib gettext ]; postPatch = '' @@ -25,12 +26,12 @@ stdenv.mkDerivation rec { ''; postInstall = '' - make dict + make dict-local ''; doInstallCheck = true; installCheckTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/cracklib/cracklib; description = "A library for checking the strength of passwords"; license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists diff --git a/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/nixpkgs/pkgs/development/libraries/crypto++/default.nix index cbd3e4054159..61a825cd3745 100644 --- a/nixpkgs/pkgs/development/libraries/crypto++/default.nix +++ b/nixpkgs/pkgs/development/libraries/crypto++/default.nix @@ -18,17 +18,11 @@ stdenv.mkDerivation rec { ]; - configurePhase = let - marchflags = - if stdenv.isi686 then "-march=i686" else - if stdenv.isx86_64 then "-march=nocona -mtune=generic" else - ""; - in - '' + configurePhase = '' sed -i GNUmakefile \ - -e 's|-march=native|${marchflags} -fPIC|g' \ + -e 's|-march=native|-fPIC|g' \ -e '/^CXXFLAGS =/s|-g ||' - ''; + ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix index 4b94f673a652..49536687a931 100644 --- a/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "130yjr82w0az4xsdcmcjdwkhd0sin5pm6q6s9dyn5yhrwfx1vf0p"; + sha256 = "08vysa3naqjfvld9w1k6l6hby4xfn4l2gvnfnan498g5nss4050h"; }; nativeBuildInputs = [ meson ninja nasm ]; diff --git a/nixpkgs/pkgs/development/libraries/ethash/default.nix b/nixpkgs/pkgs/development/libraries/ethash/default.nix new file mode 100644 index 000000000000..da2fd13465f2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ethash/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, cmake, boost, cryptopp, opencl-headers, opencl-info, + openmpi, ocl-icd, mesa, gbenchmark, gtest }: + +stdenv.mkDerivation rec { + pname = "ethash"; + version = "0.4.2"; + + src = + fetchFromGitHub { + owner = "chfast"; + repo = "ethash"; + rev = "v${version}"; + sha256 = "0qiixvxbpl2gz7jh1qs8lmyk7wzv6ffnl7kckqgrpgm547nnn8zy"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + cryptopp + opencl-headers + opencl-info + openmpi + ocl-icd + mesa + ]; + + checkInputs = [ + gbenchmark + gtest + ]; + + #preConfigure = '' + # sed -i 's/GTest::main//' test/unittests/CMakeLists.txt + # cat test/unittests/CMakeLists.txt + # ln -sfv ${gtest.src}/googletest gtest + #''; + + # NOTE: disabling tests due to gtest issue + cmakeFlags = [ + "-DHUNTER_ENABLED=OFF" + "-DETHASH_BUILD_TESTS=OFF" + #"-Dbenchmark_DIR=${gbenchmark}/lib/cmake/benchmark" + #"-DGTest_DIR=${gtest.dev}/lib/cmake/GTest" + #"-DGTest_DIR=${gtest.src}/googletest" + #"-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake" + ]; + + meta = with stdenv.lib; { + description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; + homepage = https://github.com/ethereum/ethash; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nand0p ]; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index 2dd58e64585a..a37a11f5cb0c 100644 --- a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas , fetchpatch , gmpxx -, optimize ? false # impure }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -40,19 +39,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-l${blas.linkName}" "--with-lapack-libs=-l${blas.linkName}" - ] ++ stdenv.lib.optionals (!optimize) [ + ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "--disable-sse" - "--disable-sse2" - "--disable-sse3" - "--disable-ssse3" - "--disable-sse41" - "--disable-sse42" - "--disable-avx" - "--disable-avx2" - "--disable-fma" - "--disable-fma4" - ]; + "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "haswell" = [ "--disable-fma4" ]; + "broadwell" = [ "--disable-fma4" ]; + "skylake" = [ "--disable-fma4" ]; + "skylake-avx512" = [ "--disable-fma4" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index a4a0bd1a263c..aff5737432f5 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -1,7 +1,7 @@ { 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, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3 }: +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "flatpak"; @@ -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 - gnome3.gsettings-desktop-schemas glib-networking + gsettings-desktop-schemas glib-networking ]; checkInputs = [ valgrind ]; diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index 37be3c01d937..d2f66ad55f0d 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.03.18.00"; + version = "2019.04.22.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0g7c2lq4prcw9dd5r4q62l8kqm8frczrfq8m4mgs22np60yvmb6d"; + sha256 = "08aniprv2a96d3k36k668maq9nysxh0cm58i0hvy71cqcmc97h7p"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix index 5c70df02cdc8..d8bb9e8e85b0 100644 --- a/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.111"; + version = "1.1.6"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "17vn95bjiib3ia3h64b7akcmgmj6wfjx7w538iylhf9whqvssi4j"; + sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/frei0r/default.nix b/nixpkgs/pkgs/development/libraries/frei0r/default.nix index b54c6d4e956f..cdeddd82b71d 100644 --- a/nixpkgs/pkgs/development/libraries/frei0r/default.nix +++ b/nixpkgs/pkgs/development/libraries/frei0r/default.nix @@ -9,15 +9,21 @@ stdenv.mkDerivation rec { sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf cairo opencv ]; + nativeBuildInputs = [ autoconf pkgconfig ]; + buildInputs = [ cairo opencv ]; + + postInstall = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + for f in $out/lib/frei0r-1/*.so* ; do + ln -s $f "''${f%.*}.dylib" + done + ''; meta = with stdenv.lib; { homepage = https://frei0r.dyne.org; description = "Minimalist, cross-platform, shared video plugins"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/givaro/default.nix b/nixpkgs/pkgs/development/libraries/givaro/default.nix index 0773daa2d09a..bfbce57b0a6a 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx -, optimize ? false # impure -}: +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "givaro"; @@ -19,19 +17,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-optimization" - ] ++ stdenv.lib.optionals (!optimize) [ + ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "--disable-sse" - "--disable-sse2" - "--disable-sse3" - "--disable-ssse3" - "--disable-sse41" - "--disable-sse42" - "--disable-avx" - "--disable-avx2" - "--disable-fma" - "--disable-fma4" - ]; + "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "haswell" = [ "--disable-fma4" ]; + "broadwell" = [ "--disable-fma4" ]; + "skylake" = [ "--disable-fma4" ]; + "skylake-avx512" = [ "--disable-fma4" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; # On darwin, tests are linked to dylib in the nix store, so we need to make # sure tests run after installPhase. diff --git a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix index ce78f3230882..f320c303123e 100644 --- a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix +++ b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, m4, cxx ? !stdenv.hostPlatform.useAndroidPrebuilt +{ stdenv, fetchurl, m4 +, cxx ? !stdenv.hostPlatform.useAndroidPrebuilt && !stdenv.hostPlatform.isWasm , buildPackages , withStatic ? false }: diff --git a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix index 3f0fcafa4475..7918fb7b9c4b 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl }: let - rev = "b75cdc942a6172f63b34faf642b8c797239f6776"; + rev = "a8d79c3130da83c7cacd6fee31b9acc53799c406"; # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv"; + sha256 = "0qbq49gr2cmf4gzrjvrmpwxxgzl3vap1xm902xa8pkcqdvriq0qw"; }; configSub = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc"; + sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4"; }; in stdenv.mkDerivation rec { name = "gnu-config-${version}"; - version = "2016-12-31"; + version = "2019-04-15"; buildCommand = '' mkdir -p $out diff --git a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix new file mode 100644 index 000000000000..c1bdcd6956e7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection +, meson +, ninja +, python3 + # just for passthru +, gnome3 }: + +stdenv.mkDerivation rec { + name = "gsettings-desktop-schemas-${version}"; + version = "3.32.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; + }; + + # meson installs the schemas to share/glib-2.0/schemas + # We add the override file there too so it will be compiled and later moved by + # glib's setup hook. + preInstall = '' + mkdir -p $out/share/glib-2.0/schemas + cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF + [org.gnome.desktop.background] + picture-uri=''' + + [org.gnome.desktop.screensaver] + picture-uri=''' + EOF + ''; + + postPatch = '' + chmod +x build-aux/meson/post-install.py + patchShebangs build-aux/meson/post-install.py + ''; + + buildInputs = [ glib gobject-introspection ]; + + nativeBuildInputs = [ pkgconfig python3 meson ninja ]; + + meta = with stdenv.lib; { + maintainers = gnome3.maintainers; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/gsl/default.nix b/nixpkgs/pkgs/development/libraries/gsl/default.nix index 9fd3f8a7a998..c8846509d004 100644 --- a/nixpkgs/pkgs/development/libraries/gsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsl/default.nix @@ -8,10 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04"; }; - patches = [ - # ToDo: there might be more impurities than FMA support check - ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html - ]; + # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; diff --git a/nixpkgs/pkgs/development/libraries/gsl/disable-fma.patch b/nixpkgs/pkgs/development/libraries/gsl/disable-fma.patch deleted file mode 100644 index bb1eda9ccccd..000000000000 --- a/nixpkgs/pkgs/development/libraries/gsl/disable-fma.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/configure.ac 2011-09-22 16:13:22 +0000 -+++ b/configure.ac 2011-11-26 23:55:24 +0000 -@@ -381,6 +381,28 @@ - AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE) - AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE) - -+dnl check for compiler flags to disable use of FMA -+save_cflags="$CFLAGS" -+AC_CACHE_CHECK([for compiler flags to disable use of FMA], ac_cv_c_fma_flags, -+[ -+if test X"$GCC" = Xyes; then -+ fma_flags='-ffp-contract=off' -+else -+ fma_flags= -+fi -+if test X"$fma_flags" != X; then -+ CFLAGS="$fma_flags $CFLAGS" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int foo;]])],[ac_cv_c_fma_flags="$fma_flags"],[ac_cv_c_fma_flags="none"]) -+else -+ ac_cv_c_fma_flags="none" -+fi]) -+ -+if test "$ac_cv_c_fma_flags" != "none" ; then -+ CFLAGS="$ac_cv_c_fma_flags $save_cflags" -+else -+ CFLAGS="$save_cflags" -+fi -+ - dnl Check for IEEE control flags - - save_cflags="$CFLAGS" - diff --git a/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix b/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix index 69fe1b0db554..e5772c8772ec 100644 --- a/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -8,9 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; + # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; + patches = [ - # ToDo: there might be more impurities than FMA support check - ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html (fetchpatch { name = "bug-39055.patch"; url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; diff --git a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix index 27c638d8a87f..30b33c7aea97 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi -, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook +, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook, gsettings-desktop-schemas , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon epoxy json-glib isocodes ] ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas fribidi + [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gsettings-desktop-schemas fribidi libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] diff --git a/nixpkgs/pkgs/development/libraries/http-parser/default.nix b/nixpkgs/pkgs/development/libraries/http-parser/default.nix index d63911ad24fc..68bf4ebec347 100644 --- a/nixpkgs/pkgs/development/libraries/http-parser/default.nix +++ b/nixpkgs/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: let - version = "2.9.1"; + version = "2.9.2"; in stdenv.mkDerivation { name = "http-parser-${version}"; - src = fetchurl { - url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "08fypqh3jkwvlznvmwwwir53ffg2xcxy0v8bjz6wxjlb41qhf8ik"; + src = fetchFromGitHub { + owner = "nodejs"; + repo = "http-parser"; + rev = "v${version}"; + sha256 = "1qs6x3n2nrcj1wiik5pg5i16inykf7rcfdfdy7rwyzf40pvdl3c2"; }; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -19,7 +21,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "An HTTP message parser written in C"; - homepage = https://github.com/joyent/http-parser; + homepage = https://github.com/nodejs/http-parser; maintainers = with maintainers; [ matthewbauer ]; license = licenses.mit; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 61d7b067ae82..50e97bfbfdb3 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "intel-gmmlib-${version}"; - version = "18.4.1"; + version = "19.1.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = name; - sha256 = "1nxbz54a0md9hf0asdbyglvi6kiggksy24ffmk4wzvkai6vinm17"; + sha256 = "1nw5qg10dqkchx39vqk9nkqggk0in2kr794dqjp73njpirixgr2b"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index b1c9f59b019e..a362b1ac6343 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "intel-media-driver-${version}"; - version = "18.4.1"; + version = "19.1.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "192rfv6dk9jagx0q92jq6n1slc1pllgcc7rm85fgachq9rjl7szh"; + sha256 = "072ry87h1lds14fqb2sfz3n2sssvacamaxv2gj4nd8agnzbwizn7"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 6ab10c24d3dc..274058b7ec99 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "intel-media-sdk-${version}"; - version = "18.4.1"; + version = "19.1.0"; src = fetchurl { url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz"; - sha256 = "0yqqw6hyjn28zk4f4wznqpyiz9vinnjj8067dim64bz1f4pjhyra"; + sha256 = "1gligrg6khzmwcy6miikljj75hhxqy0a95qzc8m61ipx5c8igdpv"; }; # patchelf is needed for binaries in $out/share/samples diff --git a/nixpkgs/pkgs/development/libraries/itk/default.nix b/nixpkgs/pkgs/development/libraries/itk/default.nix index 878c82215429..6e393ba02ce6 100644 --- a/nixpkgs/pkgs/development/libraries/itk/default.nix +++ b/nixpkgs/pkgs/development/libraries/itk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { - name = "itk-4.13.1"; + name = "itk-4.13.2"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.13.1.tar.xz; - sha256 = "0p4cspgbnjsnkjz8nfg092yaxz8qkqi2nkxjdv421d0zrmi0i2al"; + url = mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz; + sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 1c62d79ed328..b543d47a050d 100644 --- a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -1,10 +1,7 @@ -{ stdenv -, fetchFromGitHub -, cmake -, python -}: +{ stdenv , fetchFromGitHub , cmake , python }: + stdenv.mkDerivation rec { - name = "jsoncpp-${version}"; + pname = "jsoncpp"; version = "1.8.4"; src = fetchFromGitHub { @@ -36,13 +33,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" + "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" ]; meta = with stdenv.lib; { inherit version; homepage = https://github.com/open-source-parsers/jsoncpp; description = "A C++ library for interacting with JSON."; - maintainers = with maintainers; [ ttuegel cpages ]; + maintainers = with maintainers; [ ttuegel cpages nand0p ]; license = licenses.mit; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/kdb/default.nix b/nixpkgs/pkgs/development/libraries/kdb/default.nix index 1dedd3836c29..0cd8ab503566 100644 --- a/nixpkgs/pkgs/development/libraries/kdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/kdb/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "kdb"; - version = "3.1.0"; + version = "3.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1wi9z7j0nr9wi6aqqkdcpnr38ixyxbv00sblya7pakdf96hlamhp"; + sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg"; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/development/libraries/kproperty/default.nix b/nixpkgs/pkgs/development/libraries/kproperty/default.nix index 455fb5a711c0..c49402b74e86 100644 --- a/nixpkgs/pkgs/development/libraries/kproperty/default.nix +++ b/nixpkgs/pkgs/development/libraries/kproperty/default.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "kproperty"; - version = "3.1.0"; + version = "3.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "18qlwp7ajpx16bd0lfzqfx8y9cbrs8k4nax3cr30wj5sd3l8xpky"; + sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7"; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/development/libraries/kreport/default.nix b/nixpkgs/pkgs/development/libraries/kreport/default.nix index 256989992c5a..fc9c77e8fd61 100644 --- a/nixpkgs/pkgs/development/libraries/kreport/default.nix +++ b/nixpkgs/pkgs/development/libraries/kreport/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "kreport"; - version = "3.1.0"; + version = "3.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "0v7krpfx0isij9wzwam28fqn039i4wcznbplvnvl6hsykdi8ar1v"; + sha256 = "1mycsvkz5rphi9df2i4ch4ykvprd4m76acsdzs3zis2ljrqnsw92"; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/development/libraries/libbap/default.nix b/nixpkgs/pkgs/development/libraries/libbap/default.nix index 5153b63e91c5..2a129bc648f0 100644 --- a/nixpkgs/pkgs/development/libraries/libbap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libbap-${version}"; - version = "master-2018-03-01"; + version = "master-2019-04-05"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "bd125c379a784d4265c2ddcf1f6e34bde2e568d4"; - sha256 = "0dp90djyjc262v1b1cw5irp424a8394y86fyprdk8z741wg56m3v"; + rev = "1a89db62f1239a15d310b400f74e151c0a64f37f"; + sha256 = "0mln9adjgxzhjmjayq06ahgiay4vj5kmnzdxqz3nsik9h3npycd6"; }; nativeBuildInputs = [ autoreconfHook which ]; diff --git a/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/nixpkgs/pkgs/development/libraries/libbluray/default.nix index 7c7ba82ccde4..a98748d3b52b 100644 --- a/nixpkgs/pkgs/development/libraries/libbluray/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbluray/default.nix @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { name = "libbluray-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; - sha256 = "10zyqgccgl8kl9d9ljml86sm9s9l2424y55vilb3lifkdb9019p6"; + sha256 = "0f138xlldzci8wic89i9vpka3mdsn8r78khpnk3wijlbgjhphr0h"; }; patches = optional withJava ./BDJ-JARFILE-path.patch; diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix index 2ccdd14874a1..80cb6641bfba 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: +{ lib, stdenv, fetchpatch, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: assert enableCapabilities -> stdenv.isLinux; @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h"; }; + patches = stdenv.lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "fix-x86_64-apple-darwin.patch"; + sha256 = "138sfwl1avpy19320dbd63mskspc1khlc93j1f1zmylxx3w19csi"; + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=71939faa7c54e7b4b28d115e748a85f134876a02"; + }) + ]; + buildInputs = [ libgpgerror ] ++ lib.optional enableCapabilities libcap; diff --git a/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix index e3a6580038a2..d5edefc5d54b 100644 --- a/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "0.27.8"; + version = "0.28.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0d8rwgf69424ijy6fjbk3m863y9ml5bq7mshlqw7xqk9zngdd6f1"; + sha256 = "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libiconv/default.nix b/nixpkgs/pkgs/development/libraries/libiconv/default.nix index 92b6ec43d406..c5379692ad30 100644 --- a/nixpkgs/pkgs/development/libraries/libiconv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiconv/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "libiconv-${version}"; - version = "1.15"; + version = "1.16"; src = fetchurl { url = "mirror://gnu/libiconv/${name}.tar.gz"; - sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc"; + sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6"; }; setupHooks = [ diff --git a/nixpkgs/pkgs/development/libraries/libiio/default.nix b/nixpkgs/pkgs/development/libraries/libiio/default.nix index ec025d31ce3f..ee8029966dc2 100644 --- a/nixpkgs/pkgs/development/libraries/libiio/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "libiio-${version}"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "15lghy0zlq667abs1ggbvmb1qiw7vzhhzkw8dm9vzix4ffma2igg"; + sha256 = "1cmg3ipam101iy9yncwz2y48idaqaw4fg7i9i4c8vfjisfcycnkk"; }; outputs = [ "out" "lib" "dev" "python" ]; diff --git a/nixpkgs/pkgs/development/libraries/liblcf/default.nix b/nixpkgs/pkgs/development/libraries/liblcf/default.nix index 8154a74aef5d..313780a9f0f0 100644 --- a/nixpkgs/pkgs/development/libraries/liblcf/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblcf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "liblcf-${version}"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "liblcf"; rev = version; - sha256 = "1842hns0rbjncrhwjj7fzg9b3n47adn5jp4dg2zz34gfah3q4ig8"; + sha256 = "1nhwwb32c3x0y82s0w93k0xz8h6xsd0sb4r1a0my8fd8p5rsnwbi"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/nixpkgs/pkgs/development/libraries/liblinear/default.nix index 5f295009b994..1a177dc22374 100644 --- a/nixpkgs/pkgs/development/libraries/liblinear/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblinear/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "liblinear-${version}"; - version = "2.21"; + version = "2.30"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz"; - sha256 = "0jp0z3s32czf748i6dnlabs1psqx1dcn9w96c56m24xq5l789chs"; + sha256 = "1b66jpg9fdwsq7r52fccr8z7nqcivrin5d8zg2f134ygqqwp0748"; }; buildPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index 09eb7d95f370..172b9cd88da5 100644 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "18.12"; + version = "19.04"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0kvfhcij32jfkggbhqzy7bfiwrly5j51d5gdz5lrfdcjq113svwp"; + sha256 = "1yr2vl2z9z1kllr5ygi39r1ryw695cic8yj34yragkk33l1z6xc2"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libmwaw/default.nix b/nixpkgs/pkgs/development/libraries/libmwaw/default.nix index 9203928bd70f..a7e52376e3f5 100644 --- a/nixpkgs/pkgs/development/libraries/libmwaw/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.14"; + version="0.3.15"; name="${baseName}-${version}"; - hash="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.14/libmwaw-0.3.14.tar.xz"; - sha256="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c"; + hash="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.15/libmwaw-0.3.15.tar.xz"; + sha256="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libnotify/default.nix b/nixpkgs/pkgs/development/libraries/libnotify/default.nix index d427f7decf8b..ddadb3cd97b6 100644 --- a/nixpkgs/pkgs/development/libraries/libnotify/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnotify/default.nix @@ -1,22 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook -, glib, gdk_pixbuf, gobject-introspection }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, fetchpatch +, glib, gdk_pixbuf, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { - ver_maj = "0.7"; - ver_min = "7"; - name = "libnotify-${ver_maj}.${ver_min}"; + pname = "libnotify"; + version = "0.7.8"; src = fetchurl { - url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz"; - sha256 = "017wgq9n00hx39n0hm784zn18hl721hbaijda868cm96bcqwxd4w"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1371csx0n92g60b5dmai4mmzdnx8081mc3kcgc6a0xipcq5rw839"; }; - # disable tests as we don't need to depend on gtk+(2/3) - configureFlags = [ "--disable-tests" ]; + patches = [ + # Fix darwin build + # https://gitlab.gnome.org/GNOME/libnotify/merge_requests/9 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libnotify/commit/55eb69247fe2b479ea43311503042fc03bf4e67d.patch"; + sha256 = "1hlb5b7c5axiyir1i5j2pi94bm2gyr1ybkp6yaqy7yk6iiqlvv50"; + }) + ]; - nativeBuildInputs = [ pkgconfig autoreconfHook gobject-introspection ]; + mesonFlags = [ + # disable tests as we don't need to depend on gtk+(2/3) + "-Dtests=false" + "-Ddocbook_docs=disabled" + "-Dgtk_doc=false" + ]; + + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; buildInputs = [ glib gdk_pixbuf ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { homepage = https://developer.gnome.org/notification-spec/; description = "A library that sends desktop notifications to a notification daemon"; diff --git a/nixpkgs/pkgs/development/libraries/libpng/default.nix b/nixpkgs/pkgs/development/libraries/libpng/default.nix index 765f03d9825d..849f7d29ef6d 100644 --- a/nixpkgs/pkgs/development/libraries/libpng/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpng/default.nix @@ -3,31 +3,21 @@ assert zlib != null; let - patchVersion = "1.6.36"; + patchVersion = "1.6.37"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - sha256 = "03ywdwaq1k3pfslvbs2b33z3pdmazz6yp8g56mzafacvfgd367wc"; + sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2"; }; whenPatched = stdenv.lib.optionalString apngSupport; in stdenv.mkDerivation rec { name = "libpng" + whenPatched "-apng" + "-${version}"; - version = "1.6.36"; + version = "1.6.37"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc"; + sha256 = "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh"; }; - patches = [ - (fetchurl { # https://github.com/glennrp/libpng/issues/266 - url = "https://salsa.debian.org/debian/libpng1.6/raw/0e1348f3d/debian/patches/272.patch"; - sha256 = "1d36khgryq2p27bdx10xrr4kcjr7cdfdj2zhdcjzznpnpns97s6n"; - }) - (fetchurl { # https://github.com/glennrp/libpng/issues/275 - url = "https://salsa.debian.org/debian/libpng1.6/raw/853d1977/debian/patches/CVE-2019-7317.patch"; - sha256 = "0c8qc176mqh08kcxlnx40rzdggchihkrlzqw6qg6lf0c9ygkf55k"; - }) - ]; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/libpst/default.nix b/nixpkgs/pkgs/development/libraries/libpst/default.nix index 3478ae14e668..564fb96d0be4 100644 --- a/nixpkgs/pkgs/development/libraries/libpst/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpst/default.nix @@ -2,11 +2,11 @@ pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { - name = "libpst-0.6.71"; + name = "libpst-0.6.72"; src = fetchurl { url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "130nksrwgi3ih32si5alvxwzd5kmlg8yi7p03w0h7w9r3b90i4pv"; + sha256 = "01ymym0218805g7bqhr7x2rlhzsbsbidi3nr0z2r2w07xf8xh6ca"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 4aa33236a9eb..5127bd65c090 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0i21c92r94mp03673cvngvqph268ir4j89d5s9qzxgq2zjw5pc8q"; + sha256 = "1r0l0aik3fiyskpdgw93gxqgw109g6pa27y983rirhl6rricp3wf"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix b/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix index 160ce9fcabf6..a81e4ff07803 100644 --- a/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix @@ -1,26 +1,32 @@ { stdenv, fetchFromGitHub, cmake -, qtbase }: +, qtbase, qtmultimedia }: -stdenv.mkDerivation rec { - name = "libqmatrixclient-${version}"; - version = "0.4.2.1"; +let + generic = version: sha256: prefix: stdenv.mkDerivation rec { + name = "libqmatrixclient-${version}"; - src = fetchFromGitHub { - owner = "QMatrixClient"; - repo = "libqmatrixclient"; - rev = "v${version}"; - sha256 = "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid"; - }; + src = fetchFromGitHub { + owner = "QMatrixClient"; + repo = "libqmatrixclient"; + rev = "${prefix}${version}"; + inherit sha256; + }; - buildInputs = [ qtbase ]; + buildInputs = [ qtbase qtmultimedia ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { - description= "A Qt5 library to write cross-platfrom clients for Matrix"; - homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; - license = licenses.lgpl21; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ peterhoeg ]; + meta = with stdenv.lib; { + description= "A Qt5 library to write cross-platfrom clients for Matrix"; + homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; + license = licenses.lgpl21; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ peterhoeg ]; + }; }; + +in rec { + libqmatrixclient_0_4 = generic "0.4.2.1" "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid" "v"; + libqmatrixclient_0_5 = generic "0.5.1.2" "0vvpm1vlqfvhgfvavifrj4998g8v33hp5xjf0n8zfsmg4lxlnfg1" ""; + libqmatrixclient = libqmatrixclient_0_4; } diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 2da2963cfa66..db8dfcf2eecb 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "131qpmp2h43snx0fx7jc810mil0zy52gy2dci367ln38a2pwvyhg"; + sha256 = "0fg4js390gj9lhyh9hmr7k3lhg5q1r47skyvziv9dmbj9dqm1ll7"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix index 0571cc5b3ac5..54ca09a7b0db 100644 --- a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f"; + sha256 = "1s06h2cgk0xxwmhwj72z33bllafc1xqnxzk2yyra2rmg959778qw"; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix index 143919d148e5..c90e0ee009e8 100644 --- a/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre821_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre92_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "39e0ebd4fc66046bf733a47aaa899a556093ebc6"; - sha256 = "00c72fizxmwxd2jzmlzi4l82cw7h75lfpkkwzwcjpw9zdg9w0ci7"; + rev = "7b989f34191302011b5b49bf5b26b36862d54056"; + sha256 = "12kfqvwzxksmsm8667a1g4vxr6xsaq63cz9wrfhwq6hrsv3ynydc"; }; enableParallelBuilding = true; @@ -19,13 +19,12 @@ stdenv.mkDerivation rec { [ "prefix=$(out)" "includedir=$(dev)/include" "libdir=$(lib)/lib" + "mandir=$(man)/share/man" ]; - # Copy the examples into $out and man pages into $man. This should be handled - # by the build system in the future and submitted upstream. + # Copy the examples into $out. postInstall = '' - mkdir -p $out/bin $man/share/man/man2/ - cp -R ./man/* $man/share/man/man2 + mkdir -p $out/bin cp ./examples/io_uring-cp examples/io_uring-test $out/bin ''; diff --git a/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/nixpkgs/pkgs/development/libraries/libusb1/default.nix index ac5c38a34f11..0620163bb320 100644 --- a/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusb1/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit }: +{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, withStatic ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libusb-1.0.22"; src = fetchurl { @@ -32,4 +32,8 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = [ ]; }; -} +} // stdenv.lib.optionalAttrs withStatic { + # Carefully added here to avoid a mass rebuild. + # Inline this the next time this package changes. + dontDisableStatic = withStatic; +}) diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix index 7b8ea82e03de..32697bdc0e01 100644 --- a/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -17,11 +17,10 @@ stdenv.mkDerivation rec { "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "getaddrinfo_fail" "getaddrinfo_fail_sync" "threadpool_multiple_event_loops" # times out on slow machines - ] - # Sometimes: timeout (no output), failed uv_listen. Someone - # should report these failures to libuv team. There tests should - # be much more robust. - ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # Sometimes: timeout (no output), failed uv_listen. Someone + # should report these failures to libuv team. There tests should + # be much more robust. "process_title" "emfile" "poll_duplex" "poll_unidirectional" "ipc_listen_before_write" "ipc_listen_after_write" "ipc_tcp_connection" "tcp_alloc_cb_fail" "tcp_ping_pong" "tcp_ref3" "tcp_ref4" @@ -34,11 +33,16 @@ stdenv.mkDerivation rec { "multiple_listen" "delayed_accept" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" "tty_pty" "condvar_5" - ] ++ stdenv.lib.optionals stdenv.isAarch32 [ - # I observe this test failing with some regularity on ARMv7: - # https://github.com/libuv/libuv/issues/1871 - "shutdown_close_pipe" - ]; + # Tests that fail when sandboxing is enabled. + "fs_event_close_in_callback" "fs_event_watch_dir" + "fs_event_watch_dir_recursive" "fs_event_watch_file" + "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path" + "process_priority" "udp_create_early_bad_bind" + ] ++ stdenv.lib.optionals stdenv.isAarch32 [ + # I observe this test failing with some regularity on ARMv7: + # https://github.com/libuv/libuv/issues/1871 + "shutdown_close_pipe" + ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' sed '/${tdRegexp}/d' -i test/test-list.h @@ -55,6 +59,9 @@ stdenv.mkDerivation rec { doCheck = true; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = https://github.com/libuv/libuv; diff --git a/nixpkgs/pkgs/development/libraries/libwmf/CVE-2006-3376.patch b/nixpkgs/pkgs/development/libraries/libwmf/CVE-2006-3376.patch deleted file mode 100644 index 4c7519d9c101..000000000000 --- a/nixpkgs/pkgs/development/libraries/libwmf/CVE-2006-3376.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- libwmf-0.2.8.4.orig/src/player.c -+++ libwmf-0.2.8.4/src/player.c -@@ -23,6 +23,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <stdint.h> - #include <string.h> - #include <math.h> - -@@ -132,8 +133,14 @@ - } - } - --/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char)); -- */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); -+ if (MAX_REC_SIZE(API) > UINT32_MAX / 2) -+ { -+ API->err = wmf_E_InsMem; -+ WMF_DEBUG (API,"bailing..."); -+ return (API->err); -+ } -+ -+ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); - - if (ERR (API)) - { WMF_DEBUG (API,"bailing..."); - diff --git a/nixpkgs/pkgs/development/libraries/libwmf/CVE-2009-1364.patch b/nixpkgs/pkgs/development/libraries/libwmf/CVE-2009-1364.patch deleted file mode 100644 index e2a4501662c6..000000000000 --- a/nixpkgs/pkgs/development/libraries/libwmf/CVE-2009-1364.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libwmf-0.2.8.4.orig/src/extra/gd/gd_clip.c -+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c -@@ -70,6 +70,7 @@ - { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); - if (more == 0) return; - im->clip->max += 8; -+ im->clip->list = more; - } - im->clip->list[im->clip->count] = (*rect); - im->clip->count++; - diff --git a/nixpkgs/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch b/nixpkgs/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch deleted file mode 100644 index 54d47800298b..000000000000 --- a/nixpkgs/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch +++ /dev/null @@ -1,186 +0,0 @@ ---- libwmf-0.2.8.4.orig/src/player/meta.h -+++ libwmf-0.2.8.4/src/player/meta.h -@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API, - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -2593,9 +2593,10 @@ static int meta_dc_restore (wmfAPI* API, - polyrect.BR = 0; - - polyrect.count = 0; -+ -+ if (FR->region_clip) FR->region_clip (API,&polyrect); - } - -- if (FR->region_clip) FR->region_clip (API,&polyrect); - - return (changed); - } -@@ -3067,7 +3068,7 @@ static int meta_pen_create (wmfAPI* API, - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3181,7 +3182,7 @@ static int meta_brush_create (wmfAPI* AP - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3288,7 +3289,7 @@ static int meta_font_create (wmfAPI* API - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3396,7 +3397,7 @@ static int meta_palette_create (wmfAPI* - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); ---- libwmf-0.2.8.4.orig/src/ipa/ipa.h -+++ libwmf-0.2.8.4/src/ipa/ipa.h -@@ -48,7 +48,7 @@ static int ReadBlobByte (BMPS - static unsigned short ReadBlobLSBShort (BMPSource*); - static unsigned long ReadBlobLSBLong (BMPSource*); - static long TellBlob (BMPSource*); --static void DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); -+static int DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); - static void ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*); - static int ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int); - static void SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int); ---- libwmf-0.2.8.4.orig/src/ipa/ipa/bmp.h -+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h -@@ -859,7 +859,7 @@ static long TellBlob (BMPSource* src) - % - % - */ --static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) -+static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) - { int byte; - int count; - int i; -@@ -870,12 +870,14 @@ static void DecodeImage (wmfAPI* API,wmf - U32 u; - - unsigned char* q; -+ unsigned char* end; - - for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0; - - byte = 0; - x = 0; - q = pixels; -+ end = pixels + bmp->width * bmp->height; - - for (y = 0; y < bmp->height; ) - { count = ReadBlobByte (src); -@@ -884,7 +886,10 @@ static void DecodeImage (wmfAPI* API,wmf - { /* Encoded mode. */ - byte = ReadBlobByte (src); - for (i = 0; i < count; i++) -- { if (compression == 1) -+ { -+ if (q == end) -+ return 0; -+ if (compression == 1) - { (*(q++)) = (unsigned char) byte; - } - else -@@ -896,13 +901,15 @@ static void DecodeImage (wmfAPI* API,wmf - else - { /* Escape mode. */ - count = ReadBlobByte (src); -- if (count == 0x01) return; -+ if (count == 0x01) return 1; - switch (count) - { - case 0x00: - { /* End of line. */ - x = 0; - y++; -+ if (y >= bmp->height) -+ return 0; - q = pixels + y * bmp->width; - break; - } -@@ -910,13 +917,20 @@ static void DecodeImage (wmfAPI* API,wmf - { /* Delta mode. */ - x += ReadBlobByte (src); - y += ReadBlobByte (src); -+ if (y >= bmp->height) -+ return 0; -+ if (x >= bmp->width) -+ return 0; - q = pixels + y * bmp->width + x; - break; - } - default: - { /* Absolute mode. */ - for (i = 0; i < count; i++) -- { if (compression == 1) -+ { -+ if (q == end) -+ return 0; -+ if (compression == 1) - { (*(q++)) = ReadBlobByte (src); - } - else -@@ -943,7 +957,7 @@ static void DecodeImage (wmfAPI* API,wmf - byte = ReadBlobByte (src); /* end of line */ - byte = ReadBlobByte (src); - -- return; -+ return 1; - } - - /* -@@ -1143,8 +1157,18 @@ static void ReadBMPImage (wmfAPI* API,wm - } - } - else -- { /* Convert run-length encoded raster pixels. */ -- DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image); -+ { -+ if (bmp_info.bits_per_pixel == 8) /* Convert run-length encoded raster pixels. */ -+ { -+ if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image)) -+ { WMF_ERROR (API,"corrupt bmp"); -+ API->err = wmf_E_BadFormat; -+ } -+ } -+ else -+ { WMF_ERROR (API,"Unexpected pixel depth"); -+ API->err = wmf_E_BadFormat; -+ } - } - - if (ERR (API)) diff --git a/nixpkgs/pkgs/development/libraries/libwmf/default.nix b/nixpkgs/pkgs/development/libraries/libwmf/default.nix index bf685862adf1..e7aa5f7ecc9f 100644 --- a/nixpkgs/pkgs/development/libraries/libwmf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwmf/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchurl, fetchpatch, zlib, imagemagick, libpng, pkgconfig, glib -, freetype, libjpeg, libxml2 }: +{ stdenv, fetchFromGitHub, pkgconfig +, freetype, glib, imagemagick, libjpeg, libpng, libxml2, zlib +}: -stdenv.mkDerivation { - name = "libwmf-0.2.8.4"; +stdenv.mkDerivation rec { + pname = "libwmf"; + version = "0.2.12"; - src = fetchurl { - url = mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz; - sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v"; + src = fetchFromGitHub { + owner = "caolanm"; + repo = pname; + rev = "v${version}"; + sha256 = "0i2w5hg8mbgmgabxyd48qp1gx2mhk33hgr3jqvg72k0nhkd2jhf6"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ]; - - patches = [ - ./CVE-2006-3376.patch ./CVE-2009-1364.patch - ./CVE-2015-0848+4588+4695+4696.patch - (fetchpatch { - name = "libwmf-0.2.8.4-CVE-2016-9011-debian.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=842090;filename=libwmf-0.2.8.4-CVE-2016-9011-debian.patch;msg=10"; - sha256 = "15vnqrj1dlvn0g8ccrxj2r2cyb1rv0qf0kfangxfgsi5h8is0c2b"; - }) - ]; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "WMF library from wvWare"; - homepage = http://wvware.sourceforge.net/libwmf.html; - license = licenses.gpl2; + homepage = "http://wvware.sourceforge.net/libwmf.html"; + downloadPage = "https://github.com/caolanm/libwmf/releases"; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libx86emu/default.nix b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix index 93f78a7eb8f0..2e00b5b5ab9c 100644 --- a/nixpkgs/pkgs/development/libraries/libx86emu/default.nix +++ b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libx86emu-${version}"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "wfeldt"; repo = "libx86emu"; rev = version; - sha256 = "10amjaamd6jfwqxrinsbkqmm6jjrwzyqjp8qy3hm71vkg6fr20gy"; + sha256 = "158mrg9xb0sb4l3s60084j6i7nr90smpsks9f02gbssk495h2k8l"; }; nativeBuildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index 61cae1b68ba7..257ac8e277dc 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libxmlb-${version}"; - version = "0.1.7"; + version = "0.1.8"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "17q1kjkff0frvm26agbqi0hdhg5d4icwn36qzf3y53wrdv5s148x"; + sha256 = "0nry2a4vskfklykd20smp4maqpzibc65rzyv4i71nrc55dyjpy7x"; }; nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ]; diff --git a/nixpkgs/pkgs/development/libraries/linbox/default.nix b/nixpkgs/pkgs/development/libraries/linbox/default.nix index a9a649e2de76..ef2dbb10fba1 100644 --- a/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -7,7 +7,6 @@ , blas , fflas-ffpack , gmpxx -, optimize ? false # impure , withSage ? false # sage support }: stdenv.mkDerivation rec { @@ -37,19 +36,18 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-l${blas.linkName}" "--disable-optimization" - ] ++ stdenv.lib.optionals (!optimize) [ + ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "--disable-sse" - "--disable-sse2" - "--disable-sse3" - "--disable-ssse3" - "--disable-sse41" - "--disable-sse42" - "--disable-avx" - "--disable-avx2" - "--disable-fma" - "--disable-fma4" - ] ++ stdenv.lib.optionals withSage [ + "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "haswell" = [ "--disable-fma4" ]; + "broadwell" = [ "--disable-fma4" ]; + "skylake" = [ "--disable-fma4" ]; + "skylake-avx512" = [ "--disable-fma4" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"} + ++ stdenv.lib.optionals withSage [ "--enable-sage" ]; diff --git a/nixpkgs/pkgs/development/libraries/live555/default.nix b/nixpkgs/pkgs/development/libraries/live555/default.nix index f9d07d8d7373..0b063df51148 100644 --- a/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2019.03.06"; + version = "2019.04.24"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "1gasdl95yjabv811knkmy5laj21a54z1jdfq36jdj984k1nw5l0b"; + sha256 = "0wnxc4g04afsash1jn240zgdzh6lxa6rsaghahk34zlllb74dgdv"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/log4cplus/default.nix b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix index 7fb79c549be8..cc86ab19379d 100644 --- a/nixpkgs/pkgs/development/libraries/log4cplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-2.0.3"; + name = "log4cplus-2.0.4"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "0rwzwskvv94cqg2nn7jsvzlak7y01k37v345fcm040klrjvkbc3w"; + sha256 = "0lh2i22znx573jchcfy4n5lrr9yjg2hd3iphhlih61zzmd67p2hc"; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index 7d070364a63c..a72d5a825c6a 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = "mbedtls-${version}"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "14gw3rga9qr6j8ssfjy7k4l8spz37gamqxh9qcwas7w48303897l"; + sha256 = "1mk3xv61wvqqrzd6jnrz8csyfnwwwwpjzywj3fsfy99p51d7wqgw"; }; nativeBuildInputs = [ cmake ninja perl python ]; diff --git a/nixpkgs/pkgs/development/libraries/mdds/default.nix b/nixpkgs/pkgs/development/libraries/mdds/default.nix index 3b0a0441cc4e..16502ca4e612 100644 --- a/nixpkgs/pkgs/development/libraries/mdds/default.nix +++ b/nixpkgs/pkgs/development/libraries/mdds/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, boost }: stdenv.mkDerivation rec { - version = "1.3.1"; - name = "mdds-${version}"; + pname = "mdds"; + version = "1.4.3"; src = fetchurl { - url = "https://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; - sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w"; + url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; + sha256 = "10cw6irdm6d15nxnys2v5akp8yz52qijpcjvw0frwq7nz5d3vki5"; }; postInstall = '' - mkdir -p "$out/lib/pkgconfig" - cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" + mkdir -p "$out/lib/pkgconfig" + cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; checkInputs = [ boost ]; diff --git a/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix index c4c4d8e3a577..b63de43fd9b1 100644 --- a/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake +{ stdenv, fetchFromGitHub, catch, cmake }: let @@ -6,18 +6,19 @@ let in stdenv.mkDerivation rec { name = "microsoft_gsl-${version}"; - version = "2017-02-13"; + version = "2.0.0"; - src = fetchgit { - url = "https://github.com/Microsoft/GSL.git"; - rev = "3819df6e378ffccf0e29465afe99c3b324c2aa70"; - sha256 = "03d17mnx6n175aakin313308q14wzvaa9pd0m1yfk6ckhha4qf35"; + src = fetchFromGitHub { + owner = "Microsoft"; + repo = "GSL"; + rev = "v${version}"; + sha256 = "1kxfca9ik934nkzyn34ingkyvwpc09li81cg1yc6vqcrdw51l4ri"; }; # build phase just runs the unit tests, so skip it if # we're doing a cross build - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ catch cmake ]; buildPhase = if nativeBuild then "make" else "true"; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index 277ef7923e61..2642ee5510a1 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.37.0"; + version = "1.38.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "1bi3aw096kd51abazvv6ilplz6gjbm84yr3mzxklbhysv38y6xl2"; + sha256 = "156r3myrglkmrdv4zh151g9zcr7b92zjn15wx5i9ypw0naanjc4g"; }; outputs = [ "bin" "out" "dev" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/nlopt/default.nix b/nixpkgs/pkgs/development/libraries/nlopt/default.nix index bbbc818db63d..e9b89e83907f 100644 --- a/nixpkgs/pkgs/development/libraries/nlopt/default.nix +++ b/nixpkgs/pkgs/development/libraries/nlopt/default.nix @@ -1,12 +1,14 @@ -{ fetchurl, stdenv, octave ? null, cmake }: +{ stdenv, fetchFromGitHub, cmake, octave ? null }: stdenv.mkDerivation rec { - name = "nlopt-${version}"; - version = "2.5.0"; + pname = "nlopt"; + version = "2.6.1"; - src = fetchurl { - url = "https://github.com/stevengj/nlopt/archive/v${version}.tar.gz"; - sha256 = "1bmlsdzkw8xbigiihffyb0kdaqbyfn7dr8s5pdgavy7z05bpmpf6"; + src = fetchFromGitHub { + owner = "stevengj"; + repo = pname; + rev = "v${version}"; + sha256 = "1k6x14lgyfhfqpbs7xx8mrgklp8l6jkkcs39zgi2sj3kg6n0hdc9"; }; nativeBuildInputs = [ cmake ]; @@ -30,7 +32,6 @@ stdenv.mkDerivation rec { description = "Free open-source library for nonlinear optimization"; license = stdenv.lib.licenses.lgpl21Plus; hydraPlatforms = stdenv.lib.platforms.linux; - broken = (octave != null); # cannot cope with Octave 4.x }; } diff --git a/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix index d57c10b41e95..2d1e0ffb2005 100644 --- a/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix @@ -11,7 +11,7 @@ , doxygen }: -let version = "7.3.0p2"; +let version = "7.3.0p3"; commit = "V${builtins.replaceStrings ["."] ["_"] version}"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { name = "occt-${commit}.tar.gz"; url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0nc9k1nqpj0n99pr7qkva79irmqhh007dffwghiyzs031zhd7i6w"; + sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix index ef60b331fc6c..b67db91ef642 100644 --- a/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz +{ stdenv, fetchurl, pkgconfig, cairo, harfbuzz , libintl, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib +, x11Support? !stdenv.isDarwin, libXft }: with stdenv.lib; @@ -32,7 +33,8 @@ in stdenv.mkDerivation rec { CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo glib libXft libintl ]; + propagatedBuildInputs = [ cairo glib libintl ] ++ + optional x11Support libXft; patches = [ (fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix index 6e190a656f63..79b105a2d1c8 100644 --- a/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix +++ b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }: stdenv.mkDerivation rec { - name = "qca-qt5-2.1.3"; + pname = "qca-qt5"; + version = "2.2.1"; src = fetchurl { - url = "http://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz"; - sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"; + url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; + sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; }; buildInputs = [ openssl qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/qca-qt5/move-project.patch b/nixpkgs/pkgs/development/libraries/qca-qt5/move-project.patch index 2a109a3aa3c7..dcecb83d7db9 100644 --- a/nixpkgs/pkgs/development/libraries/qca-qt5/move-project.patch +++ b/nixpkgs/pkgs/development/libraries/qca-qt5/move-project.patch @@ -1,19 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 453fd8a..5f6ee11 100644 +index 2f2b5d0..971dee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX) +@@ -6,10 +6,11 @@ if(NOT CMAKE_INSTALL_PREFIX) unset(CMAKE_INSTALL_PREFIX CACHE) endif(NOT CMAKE_INSTALL_PREFIX) - + -project(qca) - - if(NOT APPLE) - cmake_minimum_required(VERSION 2.8.12) - else() - cmake_minimum_required(VERSION 3.0) - endif() + + cmake_minimum_required(VERSION 3.4) + +project(qca) - ++ set(QCA_LIB_MAJOR_VERSION "2") - set(QCA_LIB_MINOR_VERSION "1") + set(QCA_LIB_MINOR_VERSION "2") + set(QCA_LIB_PATCH_VERSION "1") diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 30383dda50cf..156a8c4c15cb 100644 --- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.4.0"; +let version = "8.4.1"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"; + sha256 = "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87"; }; nativeBuildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index 92ac8a242013..71d27c33a928 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -266,15 +266,18 @@ stdenv.mkDerivation { ++ ( if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" ] - else lib.optional (compareVersion "5.9.0" >= 0) [ "-sse2" ] + else lib.optionals (compareVersion "5.9.0" >= 0) { + "default" = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; + "westmere" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; + "sandybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + "ivybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + "haswell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + "broadwell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + "skylake" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + "skylake-avx512" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ) ++ [ - "-no-sse3" - "-no-ssse3" - "-no-sse4.1" - "-no-sse4.2" - "-no-avx" - "-no-avx2" "-no-mips_dsp" "-no-mips_dspr2" ] diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 91b7acf43654..af5804018874 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -103,7 +103,10 @@ EOF ''); NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin [ + # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 + # TODO: investigate and fix properly + lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ "-march=westmere" ] ++ + lib.optionals stdenv.isDarwin [ "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10" diff --git a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix index 2e5371e285bc..3de84d859111 100644 --- a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, qt4 ? null +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4 ? null , withQt5 ? false, qtbase ? null, qttools ? null , darwin ? null +, libsecret }: assert withQt5 -> qtbase != null; @@ -22,11 +23,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret + ; - buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ] + buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ libsecret ] + ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]) ++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation Security + CoreFoundation Security ]) ; diff --git a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix index 1ae46bad257c..30453086d457 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ipopt-${version}"; - version = "3.12.12"; + version = "3.12.13"; src = fetchurl { url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "1kh680ilw1c304hdh9i267gqhp0xg58jy8dk4svjvjc86sp1i23q"; + sha256 = "0kzf05aypx8q5mr3sciclk926ans0yi2d2chjdxxgpi3sza609dx"; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/nixpkgs/pkgs/development/libraries/smesh/default.nix b/nixpkgs/pkgs/development/libraries/smesh/default.nix new file mode 100644 index 000000000000..529f910c35ae --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/smesh/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, ninja, opencascade }: + +stdenv.mkDerivation rec { + pname = "smesh"; + version = "6.7.6"; + + src = fetchFromGitHub { + owner = "tpaviot"; + repo = "smesh"; + rev = version; + sha256 = "1b07j3bw3lnxk8dk3x1kkl2mbsmfwi98si84054038lflaaijzi0"; + }; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ opencascade ]; + + meta = with stdenv.lib; { + description = "Extension to OCE providing advanced meshing features"; + homepage = "https://github.com/tpaviot/smesh"; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/snappy/default.nix b/nixpkgs/pkgs/development/libraries/snappy/default.nix index 32c93b192ef0..36077d71126a 100644 --- a/nixpkgs/pkgs/development/libraries/snappy/default.nix +++ b/nixpkgs/pkgs/development/libraries/snappy/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + postInstall = '' + substituteInPlace "$out"/lib/cmake/Snappy/SnappyTargets.cmake \ + --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"' + ''; + checkTarget = "test"; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/nixpkgs/pkgs/development/libraries/uriparser/default.nix index a4f99b942eae..89efdc006a54 100644 --- a/nixpkgs/pkgs/development/libraries/uriparser/default.nix +++ b/nixpkgs/pkgs/development/libraries/uriparser/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { API documentation is available on uriparser website. ''; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bosu ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/nixpkgs/pkgs/development/libraries/utf8proc/default.nix index 5b05f9ffef4a..72f6f57553fb 100644 --- a/nixpkgs/pkgs/development/libraries/utf8proc/default.nix +++ b/nixpkgs/pkgs/development/libraries/utf8proc/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "utf8proc-${version}"; - version = "2.2.0"; + pname = "utf8proc"; + version = "2.3.0"; - src = fetchurl { - url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz"; - sha256 = "1gsxxp7vk36z1g5mg19kq10j35dks5f9slsab2xfazh5vgdx33rz"; + src = fetchFromGitHub { + owner = "JuliaStrings"; + repo = pname; + rev = "v${version}"; + sha256 = "1jhjl7nw6262ks5zrk447qmh6z2r5rrnnrm742dk33d7031g3s55"; }; makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { description = "A clean C library for processing UTF-8 Unicode data"; - homepage = https://julialang.org/utf8proc; + homepage = "https://juliastrings.github.io/utf8proc/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.ftrvxmtrx ]; diff --git a/nixpkgs/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix index 7089da984a97..33262325674e 100644 --- a/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.56.1"; + version = "0.56.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0z6w4vrz51bjnvk773j4pnrqfmkvaaa58yc6yi3jwcx90b68xyh2"; + sha256 = "0dyj2dqbzap37dvjax6vy2kwfqsw9d1hrc4ji33lha3mk1q3b5bf"; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/wasilibc/default.nix b/nixpkgs/pkgs/development/libraries/wasilibc/default.nix new file mode 100644 index 000000000000..229d67b81edd --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/wasilibc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation { + name = "wasilibc-20190413"; + src = fetchFromGitHub { + owner = "CraneStation"; + repo = "wasi-sysroot"; + rev = "079d7bda78bc0ad8f69c1594444b54786545ce57"; + sha256 = "09s906bc9485wzkgibnpfh0mii7jkldzr1a6g8k7ch0si8rshi5r"; + }; + makeFlags = [ + "WASM_CC=${stdenv.cc.targetPrefix}cc" + "WASM_NM=${stdenv.cc.targetPrefix}nm" + "WASM_AR=${stdenv.cc.targetPrefix}ar" + "INSTALL_DIR=${placeholder "out"}" + ]; + + postInstall = '' + mv $out/lib/*/* $out/lib + ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports + ''; + + meta = { + description = "WASI libc implementation for WebAssembly"; + homepage = "https://wasi.dev"; + platforms = lib.platforms.wasi; + maintainers = [ lib.maintainers.matthewbauer ]; + }; +} 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 28fa6a9ebd97..780b7d630cb7 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; - buildInputs = [ glib gtk3 gnome3.gsettings-desktop-schemas ]; + buildInputs = [ glib gtk3 gsettings-desktop-schemas ]; meta = with stdenv.lib; { description = "Desktop integration portals for sandboxed apps"; diff --git a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 94f1d187267e..b19bf000b0d4 100644 --- a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -2,14 +2,14 @@ , openssl, nss, makeWrapper }: let - version = "1.2.26"; + version = "1.2.28"; in stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"; + sha256 = "1m12caglhyx08g8lh2sl3nkldlpryzdx2d572q73y3m33s0w9vhk"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index db3f41edaffa..c8fc051f7a97 100644 --- a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -14,13 +14,13 @@ ansicolors = buildLuarocksPackage { pname = "ansicolors"; version = "1.0.2-3"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "https://github.com/kikito/ansicolors.lua"; @@ -34,13 +34,13 @@ argparse = buildLuarocksPackage { pname = "argparse"; version = "0.6.0-1"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/argparse-0.6.0-1.src.rock; sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; - }; + }; disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/argparse"; @@ -54,13 +54,13 @@ basexx = buildLuarocksPackage { pname = "basexx"; version = "0.4.0-1"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/basexx-0.4.0-1.src.rock; sha256 = "1px8yrxg1qkk3kzdqj3siry742jdv4ysp2dmicxi15mkynqpjlzz"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "https://github.com/aiq/basexx"; @@ -74,13 +74,13 @@ dkjson = buildLuarocksPackage { pname = "dkjson"; version = "2.5-2"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/dkjson-2.5-2.src.rock; sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; - }; + }; disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; @@ -94,13 +94,13 @@ fifo = buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/fifo-0.2-0.src.rock; sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; - }; - - propagatedBuildInputs = [lua ]; - buildType="builtin"; + }; + + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "https://github.com/daurnimator/fifo.lua"; @@ -114,13 +114,13 @@ inspect = buildLuarocksPackage { pname = "inspect"; version = "3.1.1-0"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/inspect-3.1.1-0.src.rock; sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "https://github.com/kikito/inspect.lua"; @@ -134,13 +134,13 @@ lgi = buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/lgi-0.9.2-1.src.rock; sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="make"; + propagatedBuildInputs = [ lua ]; + buildType = "make"; meta = { homepage = "https://github.com/pavouk/lgi"; @@ -154,13 +154,13 @@ lpeg_patterns = buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; - }; - - propagatedBuildInputs = [lua lpeg ]; - buildType="builtin"; + }; + + propagatedBuildInputs = [ lua lpeg ]; + buildType = "builtin"; meta = { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; @@ -174,13 +174,13 @@ lpty = buildLuarocksPackage { pname = "lpty"; version = "1.2.2-1"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/lpty-1.2.2-1.src.rock; sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="make"; + propagatedBuildInputs = [ lua ]; + buildType = "make"; meta = { homepage = "http://www.tset.de/lpty/"; @@ -194,13 +194,13 @@ lrexlib-gnu = buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.0-1"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock; sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "https://github.com/rrthomas/lrexlib"; @@ -214,13 +214,13 @@ lrexlib-posix = buildLuarocksPackage { pname = "lrexlib-posix"; version = "2.9.0-1"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock; sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "https://github.com/rrthomas/lrexlib"; @@ -234,13 +234,13 @@ ltermbox = buildLuarocksPackage { pname = "ltermbox"; version = "0.2-1"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/ltermbox-0.2-1.src.rock; sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "http://code.google.com/p/termbox"; @@ -254,12 +254,12 @@ lua-cmsgpack = buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; - knownRockspec = ( fetchurl { + knownRockspec = (fetchurl { url = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec; sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; - }).outPath; + }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "git://github.com/antirez/lua-cmsgpack.git", "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", "date": "2018-06-14T11:56:56+02:00", @@ -267,10 +267,10 @@ lua-cmsgpack = buildLuarocksPackage { "fetchSubmodules": true } '') ["date"]) ; - + disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "https://github.com/antirez/lua-cmsgpack"; @@ -284,13 +284,13 @@ lua_cliargs = buildLuarocksPackage { pname = "lua_cliargs"; version = "3.0-2"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/lua_cliargs-3.0-2.src.rock; sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "https://github.com/amireh/lua_cliargs"; @@ -304,13 +304,13 @@ lua-iconv = buildLuarocksPackage { pname = "lua-iconv"; version = "7-3"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/lua-iconv-7-3.src.rock; sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "http://ittner.github.com/lua-iconv/"; @@ -320,23 +320,43 @@ lua-iconv = buildLuarocksPackage { }; }; }; +lua-messagepack = buildLuarocksPackage { + pname = "lua-messagepack"; + version = "0.5.1-2"; + + src = fetchurl { + url = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock; + sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; + + meta = { + homepage = "http://fperrad.frama.io/lua-MessagePack/"; + description="a pure Lua implementation of the MessagePack serialization format"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; - knownRockspec = ( fetchurl { + knownRockspec = (fetchurl { url = https://luarocks.org/lua-term-0.7-1.rockspec; sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; - }).outPath; + }).outPath; - src = fetchurl { + src = fetchurl { url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; - }; - - - - buildType="builtin"; + }; + + + + buildType = "builtin"; meta = { homepage = "https://github.com/hoelzro/lua-term"; @@ -346,21 +366,21 @@ lua-term = buildLuarocksPackage { }; }; }; -luaevent = buildLuarocksPackage { - pname = "luaevent"; - version = "0.4.6-1"; +lua-toml = buildLuarocksPackage { + pname = "lua-toml"; + version = "2.0-1"; - src = fetchurl { - url = https://luarocks.org/luaevent-0.4.6-1.src.rock; - sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; - }; + src = fetchurl { + url = https://luarocks.org/lua-toml-2.0-1.src.rock; + sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { - homepage = "https://github.com/harningt/luaevent"; - description="libevent binding for Lua"; + homepage = "https://github.com/jonstoler/lua-toml"; + description="toml decoder/encoder for Lua"; license = { fullName = "MIT"; }; @@ -370,12 +390,12 @@ luabitop = buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; - knownRockspec = ( fetchurl { + knownRockspec = (fetchurl { url = https://luarocks.org/luabitop-1.0.2-3.rockspec; sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; - }).outPath; + }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "git://github.com/LuaDist/luabitop.git", "rev": "81bb23b0e737805442033535de8e6d204d0e5381", "date": "2013-02-18T16:36:42+01:00", @@ -383,10 +403,10 @@ luabitop = buildLuarocksPackage { "fetchSubmodules": true } '') ["date"]) ; - + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.3"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "http://bitop.luajit.org/"; @@ -396,17 +416,37 @@ luabitop = buildLuarocksPackage { }; }; }; +luaevent = buildLuarocksPackage { + pname = "luaevent"; + version = "0.4.6-1"; + + src = fetchurl { + url = https://luarocks.org/luaevent-0.4.6-1.src.rock; + sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; + + meta = { + homepage = "https://github.com/harningt/luaevent"; + description="libevent binding for Lua"; + license = { + fullName = "MIT"; + }; + }; +}; luacheck = buildLuarocksPackage { pname = "luacheck"; version = "0.23.0-1"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/luacheck-0.23.0-1.src.rock; sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; - }; + }; disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [lua argparse luafilesystem ]; - buildType="builtin"; + propagatedBuildInputs = [ lua argparse luafilesystem ]; + buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/luacheck"; @@ -420,13 +460,13 @@ luaffi = buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; - src = fetchurl { + src = fetchurl { url = http://luarocks.org/dev/luaffi-scm-1.src.rock; sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "https://github.com/facebook/luaffifb"; @@ -440,13 +480,13 @@ luuid = buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/luuid-20120509-2.src.rock; sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; - }; + }; disabled = ( luaOlder "5.2") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; @@ -460,19 +500,19 @@ penlight = buildLuarocksPackage { pname = "penlight"; version = "1.5.4-1"; - knownRockspec = ( fetchurl { + knownRockspec = (fetchurl { url = https://luarocks.org/penlight-1.5.4-1.rockspec; sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; - }).outPath; + }).outPath; - src = fetchurl { + src = fetchurl { url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; - }; - - - propagatedBuildInputs = [luafilesystem ]; - buildType="builtin"; + }; + + + propagatedBuildInputs = [ luafilesystem ]; + buildType = "builtin"; meta = { homepage = "http://stevedonovan.github.com/Penlight"; @@ -482,23 +522,43 @@ penlight = buildLuarocksPackage { }; }; }; +rapidjson = buildLuarocksPackage { + pname = "rapidjson"; + version = "0.5.1-1"; + + src = fetchurl { + url = https://luarocks.org/rapidjson-0.5.1-1.src.rock; + sha256 = "0hnqsixnbz95cvm9q5dn0lr0qjvhqw4llw6l1sjswwk0am4yybay"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + buildType = "cmake"; + + meta = { + homepage = "https://github.com/xpol/lua-rapidjson"; + description="Json module based on the very fast RapidJSON."; + license = { + fullName = "MIT"; + }; + }; +}; say = buildLuarocksPackage { pname = "say"; version = "1.3-1"; - knownRockspec = ( fetchurl { + knownRockspec = (fetchurl { url = https://luarocks.org/say-1.3-1.rockspec; sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; - }).outPath; + }).outPath; - src = fetchurl { + src = fetchurl { url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; - }; - + }; + disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; @@ -508,23 +568,57 @@ say = buildLuarocksPackage { }; }; }; -luv = buildLuarocksPackage { - pname = "luv"; - version = "1.22.0-1"; +std__debug = buildLuarocksPackage { + pname = "std._debug"; + version = "1.0.1-1"; - knownRockspec = ( fetchurl { - url = https://luarocks.org/luv-1.22.0-1.rockspec; - sha256 = "0yxjy9wj4aqbv1my8fkciy2xar5si6bcsszipgyls24rl6lnmga3"; - }).outPath; + src = fetchurl { + url = https://luarocks.org/std._debug-1.0.1-1.src.rock; + sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; + }; + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.5"); + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; - src = fetchurl { - url = https://github.com/luvit/luv/releases/download/1.22.0-1/luv-1.22.0-1.tar.gz; - sha256 = "1xvz4a0r6kd1xqxwm55g9n6imprxb79600x7dhyillrz7p5nm217"; - }; + meta = { + homepage = "http://lua-stdlib.github.io/_debug"; + description="Debug Hints Library"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +std_normalize = buildLuarocksPackage { + pname = "std.normalize"; + version = "2.0.2-1"; + + src = fetchurl { + url = https://luarocks.org/std.normalize-2.0.2-1.src.rock; + sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh"; + }; + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [ lua std__debug ]; + buildType = "builtin"; + + meta = { + homepage = "https://lua-stdlib.github.io/normalize"; + description="Normalized Lua Functions"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +luv = buildLuarocksPackage { + pname = "luv"; + version = "1.26.0-0"; + src = fetchurl { + url = https://luarocks.org/luv-1.26.0-0.src.rock; + sha256 = "005yzcxlribnc45qr1g7q4psakximb9fbz07k6yzy1d94mhcxxr7"; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="cmake"; + propagatedBuildInputs = [ lua ]; + buildType = "cmake"; meta = { homepage = "https://github.com/luvit/luv"; @@ -538,13 +632,13 @@ luasystem = buildLuarocksPackage { pname = "luasystem"; version = "0.2.1-0"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/luasystem-0.2.1-0.src.rock; sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/luasystem/"; @@ -558,13 +652,13 @@ mediator_lua = buildLuarocksPackage { pname = "mediator_lua"; version = "1.1.2-0"; - src = fetchurl { + src = fetchurl { url = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock; sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/mediator_lua/"; @@ -578,13 +672,13 @@ mpack = buildLuarocksPackage { pname = "mpack"; version = "1.0.7-0"; - src = fetchurl { + src = fetchurl { url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; - }; - - - buildType="builtin"; + }; + + + buildType = "builtin"; meta = { homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; @@ -598,13 +692,13 @@ nvim-client = buildLuarocksPackage { pname = "nvim-client"; version = "0.1.0-1"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/nvim-client-0.1.0-1.src.rock; sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma"; - }; + }; disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua mpack luv coxpcall ]; - buildType="builtin"; + propagatedBuildInputs = [ lua mpack luv coxpcall ]; + buildType = "builtin"; meta = { homepage = "https://github.com/neovim/lua-client/archive/0.1.0-1.tar.gz"; @@ -618,19 +712,19 @@ busted = buildLuarocksPackage { pname = "busted"; version = "2.0.rc13-0"; - knownRockspec = ( fetchurl { + knownRockspec = (fetchurl { url = https://luarocks.org/busted-2.0.rc13-0.rockspec; sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; - }).outPath; + }).outPath; - src = fetchurl { + src = fetchurl { url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; - }; - + }; + disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; - buildType="builtin"; + propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; + buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; @@ -644,19 +738,19 @@ luassert = buildLuarocksPackage { pname = "luassert"; version = "1.7.11-0"; - knownRockspec = ( fetchurl { + knownRockspec = (fetchurl { url = https://luarocks.org/luassert-1.7.11-0.rockspec; sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; - }).outPath; + }).outPath; - src = fetchurl { + src = fetchurl { url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; - }; - + }; + disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [lua say ]; - buildType="builtin"; + propagatedBuildInputs = [ lua say ]; + buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; @@ -670,13 +764,13 @@ coxpcall = buildLuarocksPackage { pname = "coxpcall"; version = "1.17.0-1"; - src = fetchurl { + src = fetchurl { url = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock; sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; - }; - - - buildType="builtin"; + }; + + + buildType = "builtin"; meta = { homepage = "http://keplerproject.github.io/coxpcall"; diff --git a/nixpkgs/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix index a0ea365c7a56..0cf0c70faa10 100644 --- a/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -68,4 +68,11 @@ with super; platforms = pkgs.lib.platforms.linux; }; }); + + rapidjson = super.rapidjson.overrideAttrs(oa: { + preBuild = '' + sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt + sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt + ''; + }); } diff --git a/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix index 445ff3ecb18a..64bbd91a3d56 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix @@ -2,29 +2,25 @@ , ocaml, findlib, ocamlbuild, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp, utop, + ppx_tools_versioned, which, makeWrapper, writeText }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-bap-${version}"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap"; rev = "v${version}"; - sha256 = "0329m65x8q5q8vgvsqgyz2vz7q6qkh2rh11j7x29hckk3fzxsf8g"; + sha256 = "0ryf2xb37pj2f9mc3p5prqgqrylph9qgq7q9jnbx8b03nzzpa6h6"; }; sigs = fetchurl { url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; - sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; + sha256 = "0d69jd28z4g64mglq94kj5imhmk5f6sgcsh9q2nij3b0arpcliwk"; }; - patches = [(fetchpatch { - url = "https://github.com/BinaryAnalysisPlatform/bap/commit/e4ee3a1e5b427e8d8991e7462b06123178c0a046.patch"; - sha256 = "1yq33zd2sdacclr20g05c1q050m7x7vfbl66qdgansh23dr4fnxk"; - })]; - createFindlibDestdir = true; setupHook = writeText "setupHook.sh" '' @@ -35,10 +31,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which makeWrapper ]; buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis - llvm_38 + llvm_38 ppx_tools_versioned utop ]; - propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp + propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp piqi-ocaml uuidm frontc ounit ]; installPhase = '' @@ -64,6 +60,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/BinaryAnalysisPlatform/bap/; maintainers = [ maintainers.maurer ]; license = licenses.mit; - broken = versionOlder ocaml.version "4.03"; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index ec63e58fbb65..d35a57f6b4bc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4, +{ stdenv, fetchzip, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4, lwt_react, cryptokit, ipaddr, ocamlnet, ocaml_pcre, opaline, ppx_tools, ppx_deriving, findlib @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "eliom"; - version = "6.4.0"; + version = "6.7.0"; name = "${pname}-${version}"; - src = fetchurl { + src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "1ad7ympvj0cb51d9kbp4naxkld3gv8cfp4a037a5dr55761zdhdh"; + sha256 = "0mrlpvjaihpsf2xr6p1gs0sz4cwzkknf5b1s32bhmqq5qzsh4j8k"; }; patches = [ ./camlp4.patch ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ojquery/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ojquery/default.nix deleted file mode 100644 index 6b0eefe195f1..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/ojquery/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, ocaml_lwt, react }: - -if stdenv.lib.versionAtLeast ocaml.version "4.06" -then throw "ojquery is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "0.1"; - name = "ocaml-ojquery-${version}"; - src = fetchgit { - url = https://github.com/ocsigen/ojquery.git; - rev = "refs/tags/${version}"; - sha256 = "1n01bsk4car40p94fk1ssvww0inqapwwhdylmrb7vv40drsdldp1"; - }; - - buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ]; - propagatedBuildInputs = [ js_of_ocaml ocaml_lwt react ]; - - createFindlibDestdir = true; - - meta = { - description = "jQuery Binding for Eliom"; - homepage = http://ocsigen.org/ojquery/; - license = stdenv.lib.licenses.lgpl3; - platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - }; -} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix index 0482e04b1c4a..20b78870f93b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "ppx_derivers"; - version = "1.2"; + version = "1.2.1"; minimumOCamlVersion = "4.02"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "diml"; repo = pname; rev = version; - sha256 = "0bnhihl1w31as5w2czly1v3d6pbir9inmgsjg2cj6aaj9v1dzd85"; + sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn"; }; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/re/default.nix b/nixpkgs/pkgs/development/ocaml-modules/re/default.nix index b2413b7dddd6..29fb4fd09b2a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/re/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/re/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "re"; - version = "1.8.0"; + version = "1.9.0"; minimumOCamlVersion = "4.02"; src = fetchzip { url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; - sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i"; + sha256 = "07ycb103mr4mrkxfd63cwlsn023xvcjp0ra0k7n2gwrg0mwxmfss"; }; buildInputs = [ ounit ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix b/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix index f4918b420c40..7a50d1517db8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix @@ -1,13 +1,22 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: -stdenv.mkDerivation rec { +stdenv.mkDerivation ({ version = "0.1"; - name = "ocaml${ocaml.version}-seq-${version}"; + name = "ocaml${ocaml.version}-seq-0.1"; + + meta = { + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + homepage = "https://github.com/c-cube/seq"; + inherit (ocaml.meta) platforms; + }; + +} // (if stdenv.lib.versionOlder ocaml.version "4.07" then { src = fetchFromGitHub { owner = "c-cube"; repo = "seq"; - rev = version; + rev = "0.1"; sha256 = "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv"; }; @@ -15,11 +24,19 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - meta = { - description = "Compatibility package for OCaml’s standard iterator type starting from 4.07"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - }; -} + meta.description = "Compatibility package for OCaml’s standard iterator type starting from 4.07"; + +} else { + + src = ./src-base; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/seq + cp META $out/lib/ocaml/${ocaml.version}/site-lib/seq + ''; + + meta.description = "dummy backward-compatibility package for iterators"; + +})) diff --git a/nixpkgs/pkgs/development/ocaml-modules/seq/src-base/META b/nixpkgs/pkgs/development/ocaml-modules/seq/src-base/META new file mode 100644 index 000000000000..06b95eff3f8d --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/seq/src-base/META @@ -0,0 +1,4 @@ +name="seq" +version="[distributed with OCaml 4.07 or above]" +description="dummy backward-compatibility package for iterators" +requires="" diff --git a/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix index 0a8947f3324a..94bcdb45f328 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,34 +1,20 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re -, withP4 ? true -, camlp4 ? null -}: +{ lib, buildDunePackage, fetchurl, re, uutf }: -assert stdenv.lib.versionAtLeast ocaml.version "4.02"; - -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "tyxml"; - version = "4.2.0"; - name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "4.3.0"; - src = fetchzip { - url = "https://github.com/ocsigen/tyxml/archive/${version}.tar.gz"; - sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8"; + src = fetchurl { + url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz"; + sha256 = "1hxzppfvsdls2y8qiwvz31hmffzh2hgglf01am1vzf2f31mxf6vf"; }; - buildInputs = [ ocaml findlib ocamlbuild ppx_tools_versioned markup ] - ++ stdenv.lib.optional withP4 camlp4; - propagatedBuildInputs = [ uutf re ]; - createFindlibDestdir = true; - - configureFlags = stdenv.lib.optional withP4 "--enable-syntax"; - - meta = with stdenv.lib; { + meta = with lib; { homepage = http://ocsigen.org/tyxml/; description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML output, using static typing"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ gal_bolle vbgl ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix index 0f3578806d83..011acf01839e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix @@ -1,33 +1,18 @@ { lib, fetchurl, buildDunePackage, ppx_sexp_conv, ounit -, re, sexplib0, sexplib, stringext -, legacy ? false +, re, sexplib0, stringext }: -let params = - if legacy then rec { - version = "1.9.6"; - archive = version; - sha256 = "1m845rwd70wi4iijkrigyz939m1x84ba70hvv0d9sgk6971w4kz0"; - inherit sexplib; - } else rec { - version = "2.2.0"; - archive = "v${version}"; - sha256 = "1q0xmc93l46dilxclkmai7w952bdi745rhvsx5vissaigcj9wbwi"; - sexplib = sexplib0; - } -; in - buildDunePackage rec { pname = "uri"; - inherit (params) version; + version = "2.2.0"; src = fetchurl { - url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-${params.archive}.tbz"; - inherit (params) sha256; + url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "1q0xmc93l46dilxclkmai7w952bdi745rhvsx5vissaigcj9wbwi"; }; buildInputs = [ ounit ]; - propagatedBuildInputs = [ ppx_sexp_conv re params.sexplib stringext ]; + propagatedBuildInputs = [ ppx_sexp_conv re sexplib0 stringext ]; doCheck = true; meta = { diff --git a/nixpkgs/pkgs/development/perl-modules/BerkeleyDB/default.nix b/nixpkgs/pkgs/development/perl-modules/BerkeleyDB/default.nix index 4566c04fcb6a..db94a3b07fe2 100644 --- a/nixpkgs/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -1,11 +1,11 @@ {buildPerlPackage, fetchurl, db}: buildPerlPackage rec { - name = "BerkeleyDB-0.55"; + name = "BerkeleyDB-0.61"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0kz40wqr7qwag43qnmkpri03cjnqwzb0kj0vc9aw9yz2qx0y2a3g"; + sha256 = "0l65v301cz6a9dxcw6a4ps2mnr5zq358yn81favap6i092krggiz"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/nixpkgs/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 832cec169ba3..7c733742d2b0 100644 --- a/nixpkgs/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, zlib, stdenv }: buildPerlPackage rec { - name = "Compress-Raw-Zlib-2.081"; + name = "Compress-Raw-Zlib-2.086"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "06rsm9ahp20xfyvd3jc69sd0k8vqysryxc6apzdbn96jbcsdwmp1"; + sha256 = "0va93wc968p4l2ql0k349bz189l2vbs09bpn865cvc36amqxwv9z"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/default.nix index 98d98266db17..ff84de40b30e 100644 --- a/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPerlPackage, perl, DBI, sqlite }: buildPerlPackage rec { - name = "DBD-SQLite-1.58"; + name = "DBD-SQLite-1.62"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.58.tar.gz; - sha256 = "0fqx386jgs9mmrknr7smmzapf07izgivza7x08lfm39ks2cxs83i"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.62.tar.gz; + sha256 = "0p78ri1q6xpc1i98i6mlriv8n66iz8r5r11dlsknjm4y58rfz0mx"; }; propagatedBuildInputs = [ DBI ]; diff --git a/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix index 2191c233d455..5365e0c6b95b 100644 --- a/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, buildPerlPackage, DBI, mysql }: +{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }: buildPerlPackage rec { - name = "DBD-mysql-4.046"; + name = "DBD-mysql-4.050"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; - sha256 = "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1"; + url = "mirror://cpan/authors/id/D/DV/DVEEDEN/${name}.tar.gz"; + sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g"; }; - buildInputs = [ mysql.connector-c ] ; + buildInputs = [ mysql.connector-c DevelChecklib ] ; propagatedBuildInputs = [ DBI ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/perl-modules/DB_File/default.nix b/nixpkgs/pkgs/development/perl-modules/DB_File/default.nix index b3ca12421e41..d37fb1f12daf 100644 --- a/nixpkgs/pkgs/development/perl-modules/DB_File/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/DB_File/default.nix @@ -1,11 +1,11 @@ {fetchurl, buildPerlPackage, db}: buildPerlPackage rec { - name = "DB_File-1.842"; + name = "DB_File-1.851"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0w2d99vs9qarng2f9fpg3gchfdzy6an13507jhclcl8wv183h5hg"; + sha256 = "1j276mng1nwxxdxnb3my427s5lb6zlnssizcnxricnvaa170kdv8"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/nixpkgs/pkgs/development/python-modules/Cython/default.nix index 58a59a95f0c1..277a3b047d1c 100644 --- a/nixpkgs/pkgs/development/python-modules/Cython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.5"; + version = "0.29.7"; src = fetchPypi { inherit pname version; - sha256 = "9d5290d749099a8e446422adfb0aa2142c711284800fb1eb70f595101e32cbf1"; + sha256 = "55d081162191b7c11c7bfcb7c68e913827dfd5de6ecdbab1b99dab190586c1e8"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/Mako/default.nix b/nixpkgs/pkgs/development/python-modules/Mako/default.nix index 83075f33c420..e611d660b843 100644 --- a/nixpkgs/pkgs/development/python-modules/Mako/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Mako/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.0.7"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"; + sha256 = "0728c404877cd4ca72c409c0ea372dc5f3b53fa1ad2bb434e1d216c0444ff1fd"; }; checkInputs = [ markupsafe nose mock pytest_3 ]; diff --git a/nixpkgs/pkgs/development/python-modules/absl-py/default.nix b/nixpkgs/pkgs/development/python-modules/absl-py/default.nix index 1e4f2f76b0bd..29cb06310432 100644 --- a/nixpkgs/pkgs/development/python-modules/absl-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "8718189e4bd6013bf79910b9d1cb0a76aecad8ce664f78e1144980fabdd2cd23"; + sha256 = "b943d1c567743ed0455878fcd60bc28ac9fae38d129d1ccfad58079da00b8951"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix b/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix new file mode 100644 index 000000000000..a9720f45ef6f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix @@ -0,0 +1,24 @@ +{ lib, python3Packages, }: + +python3Packages.buildPythonApplication rec { + pname = "addic7ed-cli"; + version = "1.4.5"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "16nmyw7j2igx5dxflwiwblf421g69rxb879n1553wv6hxi4x27in"; + }; + + propagatedBuildInputs = with python3Packages; [ + requests + pyquery + ]; + + meta = with lib; { + description = "A commandline access to addic7ed subtitles"; + homepage = https://github.com/BenoitZugmeyer/addic7ed-cli; + license = licenses.mit; + maintainers = with maintainers; [ aethelz ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index 9d89433f1b90..82da607b3ef0 100644 --- a/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "877b7b85adb5f0325455bba8d50a1623fa32af33680b554feca7c756a15ad9b4"; + sha256 = "9277490ba8b8e7c747a9ae3671f52fe486784b48d4a14e78ca197fb0e36f281b"; }; propagatedBuildInputs = [ agate sqlalchemy ]; diff --git a/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix b/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix index afe9c6fb29c9..aa8ed3929347 100644 --- a/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.13"; + version = "0.1.14"; src = fetchPypi { inherit pname version; - sha256 = "8b9898f0f6539bdce3bc3720d75189e21813f1a7f8350228fc7fd54bf7327d0f"; + sha256 = "f1ddd04050d9be5e93e223a4e9367433436d245f8fe70905f4124bfde2cd3cdd"; }; # hardcodes a test dependency on an old version of pytest-asyncio diff --git a/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/nixpkgs/pkgs/development/python-modules/alembic/default.nix index ff9901765fb4..429efb8d0688 100644 --- a/nixpkgs/pkgs/development/python-modules/alembic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.0.7"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - sha256 = "16505782b229007ae905ef9e0ae6e880fddafa406f086ac7d442c1aaf712f8c2"; + sha256 = "40b9a619aa5f25ea1e1508adcda88b33704ef28e02c9cfa6471e5c772ecf0829"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/nixpkgs/pkgs/development/python-modules/altair/default.nix b/nixpkgs/pkgs/development/python-modules/altair/default.nix index b870e9197f87..ccba946abbb4 100644 --- a/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "altair"; - version = "2.4.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1lqln4510qqqla6s8z4ca0271qrhq6yyznsijsdn3nssvxsynqpc"; + sha256 = "0x4zm1xia6sln8dhwd803jlcii2a62fx3rlnj5vsa8g3anfc2v24"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index 2ea96b93772e..b3bb47334236 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "1.3.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1zys65vq0jqyzdmchaydzsvlf0ysw2y58sapjq6wzc6yw6pdyigz"; + sha256 = "6e4d8256351228c00fe68697e7f5ad2a2e0fd4085084b913eda22735023bb891"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix b/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix index 37d97f42aa1f..5e45aeb09799 100644 --- a/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix +++ b/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.9.4"; + version = "1.9.5"; src = fetchPypi { inherit pname version; - sha256 = "06c8a54ffaa6bfc9006314498742ec8843601206a3b94212f82657673662ecf1"; + sha256 = "94423d1a56cdec2ef47699e02c9a48cf8827b9c4465b836c0cefb30afe85e59a"; }; doCheck = false; # bash-completion test fails with "compgen: command not found". diff --git a/nixpkgs/pkgs/development/python-modules/asana/default.nix b/nixpkgs/pkgs/development/python-modules/asana/default.nix index 19140925595b..26a667bea4d1 100644 --- a/nixpkgs/pkgs/development/python-modules/asana/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asana/default.nix @@ -1,16 +1,20 @@ -{ buildPythonPackage, pytest, requests, requests_oauthlib, six +{ buildPythonPackage, pythonAtLeast, pytest, requests, requests_oauthlib, six , fetchFromGitHub, responses, stdenv }: buildPythonPackage rec { pname = "asana"; - version = "0.7.1"; + version = "0.8.2"; + + # upstream reportedly doesn't support 3.7 yet, blocked on + # https://bugs.python.org/issue34226 + disabled = pythonAtLeast "3.7"; src = fetchFromGitHub { owner = "asana"; repo = "python-asana"; rev = "v${version}"; - sha256 = "0vmpy4j1n54gkkg0l8bhw0xf4yby5kqzxnsv07cjc2w38snj5vy1"; + sha256 = "113zwnrpim1pdw8dzid2wpp5gzr2zk26jjl4wrwhgj0xk1cw94yi"; }; checkInputs = [ pytest responses ]; diff --git a/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix b/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix index ca26da5a3737..b6ebea815ccc 100644 --- a/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix +++ b/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "astroid"; - version = "1.6.5"; + version = "1.6.6"; src = fetchPypi { inherit pname version; - sha256 = "0fir4b67sm7shcacah9n61pvq313m523jb4q80sycrh3p8nmi6zw"; + sha256 = "d25869fc7f44f1d9fb7d24fd7ea0639656f5355fc3089cd1f3d18c6ec6b124c7"; }; # From astroid/__pkginfo__.py @@ -26,7 +26,7 @@ buildPythonPackage rec { checkPhase = '' # test_builtin_help is broken - pytest -k "not test_builtin_help" astroid + pytest -k "not test_builtin_help and not test_namespace_and_file_mismatch and not test_namespace_package_pth_support and not test_nested_namespace_import" astroid ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/astropy-helpers/default.nix b/nixpkgs/pkgs/development/python-modules/astropy-helpers/default.nix index 79d6e852c681..dc6ca8c83cef 100644 --- a/nixpkgs/pkgs/development/python-modules/astropy-helpers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astropy-helpers/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "astropy-helpers"; - version = "3.1"; + version = "3.1.1"; disabled = !isPy3k; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "37caf1f21bfdf653f7bb9f5b070dc1bb59cd70c0e09f9c5742401f57400a6e52"; + sha256 = "214cc37cffd7a21e573c4543e47b5289b07b2b77511627802d9778a4c96a5caf"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/atomman/default.nix b/nixpkgs/pkgs/development/python-modules/atomman/default.nix index d2a25cf738a5..07757d5304b0 100644 --- a/nixpkgs/pkgs/development/python-modules/atomman/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atomman/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "1.2.4"; + version = "1.2.5"; pname = "atomman"; src = fetchPypi { inherit pname version; - sha256 = "c204d52cdfb2a7cc4d7d2c4f7a89c215a9fd63b92495a83adf25ae4e820cea3e"; + sha256 = "10eca8c6fc890f2ee2e30f65178c618175529e9998be449e276f7c3d1dce0e95"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix index 0106deb7eb78..d6b751034c65 100644 --- a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "33d2b5325b7e1afb4240814fe982eea3a92ebea712869bfd08b3c0393404248c"; + sha256 = "4d8eec30cc81bc5617dbf1218201d770dc35629363547f17577c61683ccfb3ee"; }; propagatedBuildInputs = [ pycodestyle ]; diff --git a/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix index 60b21322b870..057f20fce526 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.8.14"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1mf8ddxn7bdlhic5xcd8nvskp3cmyv8vk2hz52hb7faixsgvgj18"; + sha256 = "140fdncibnlpdqr6hk8lhgkv7m2v8786rips5qp92r05agfzbhs0"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/basemap/default.nix b/nixpkgs/pkgs/development/python-modules/basemap/default.nix index 256abef592c1..25b19a2b7314 100644 --- a/nixpkgs/pkgs/development/python-modules/basemap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/basemap/default.nix @@ -1,24 +1,29 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchFromGitHub , numpy , matplotlib , pillow , setuptools +, pyproj +, pyshp +, six , pkgs }: buildPythonPackage rec { pname = "basemap"; - version = "1.0.7"; + version = "1.2.0"; - src = fetchurl { - url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz"; - sha256 = "0ca522zirj5sj10vg3fshlmgi615zy5gw2assapcj91vsvhc4zp0"; + src = fetchFromGitHub { + owner = "matplotlib"; + repo = "basemap"; + rev = "v${version}rel"; + sha256 = "1p3app8n65rlppkdbp1pb7fa4250kh7hi7lzdsryi2iv88np7193"; }; - propagatedBuildInputs = [ numpy matplotlib pillow ]; - buildInputs = [ setuptools pkgs.geos pkgs.proj ]; + propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ]; + buildInputs = [ setuptools pkgs.geos ]; # Standard configurePhase from `buildPythonPackage` seems to break the setup.py script configurePhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix index 8ee8b2c9fd5a..687b7cec4cf4 100644 --- a/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,9 +9,9 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "40.8.0"; + version = "41.0.0"; format = "wheel"; - sha256 = "e8496c0079f3ac30052ffe69b679bd876c5265686127a3159cfa415669b7f9ab"; + sha256 = "e67486071cd5cdeba783bd0b64f5f30784ff855b35071c8670551fd7fc52d4a1"; }; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/python-modules/box2d/default.nix b/nixpkgs/pkgs/development/python-modules/box2d/default.nix index f1bd87126795..5870bdcdb732 100644 --- a/nixpkgs/pkgs/development/python-modules/box2d/default.nix +++ b/nixpkgs/pkgs/development/python-modules/box2d/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , swig2 -, pkgs-box2d , isPy3k }: @@ -20,7 +19,7 @@ buildPythonPackage rec { sed -i "s/'Box2D.tests' : 'tests'//" setup.py ''; - buildInputs = [ swig2 pkgs-box2d ]; + nativeBuildInputs = [ swig2 ]; # tests not included with pypi release doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/nixpkgs/pkgs/development/python-modules/breathe/default.nix index f7b09b96fb16..453a046c54f2 100644 --- a/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -1,12 +1,12 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - version = "4.11.1"; + version = "4.12.0"; pname = "breathe"; src = fetchPypi { inherit pname version; - sha256 = "1mps0cfli6iq2gqsv3d24fs1cp7sq7crd9ji6lw63b9r40998ylv"; + sha256 = "1wmxppzyvfd5gab72qi3gainibrdk4xi8nsfp5z5h49xgzi84mnq"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/caldav/default.nix b/nixpkgs/pkgs/development/python-modules/caldav/default.nix new file mode 100644 index 000000000000..027bc1784d1c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/caldav/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi +, tzlocal, requests, vobject, lxml }: + +buildPythonPackage rec { + pname = "caldav"; + version = "0.6.0"; + + propagatedBuildInputs = [ tzlocal requests vobject lxml ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1ll9knpc50yxx858hrvfnapdi2a6g1pz9cnjhwffry2x7r4ckarz"; + }; + + meta = with lib; { + description = "This project is a CalDAV (RFC4791) client library for Python."; + homepage = "https://pythonhosted.org/caldav/"; + license = licenses.asl20; + maintainers = with maintainers; [ marenz ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/nixpkgs/pkgs/development/python-modules/cffi/default.nix index 7eca740953f8..22d25fa9cffb 100644 --- a/nixpkgs/pkgs/development/python-modules/cffi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.12.1"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033"; + sha256 = "e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/python-modules/chainmap/default.nix b/nixpkgs/pkgs/development/python-modules/chainmap/default.nix index c2815d876e34..eb769ed46239 100644 --- a/nixpkgs/pkgs/development/python-modules/chainmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chainmap/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "chainmap"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0"; + sha256 = "e42aaa4b3e2f66102a11bfd563069704bfbfd84fdcb517b564effd736bf53cd9"; }; # Requires tox diff --git a/nixpkgs/pkgs/development/python-modules/chameleon/default.nix b/nixpkgs/pkgs/development/python-modules/chameleon/default.nix index 41e653354e7b..7f146537585c 100644 --- a/nixpkgs/pkgs/development/python-modules/chameleon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "3.6"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0141kfwx553q73wzfl624pppmbhh7fpzvaj5pbj21pqlk2rhfx75"; + sha256 = "850f74f756bcb99423dd2658b99f448b09f09ccc2c60c0a2d6dec52294d7f9ed"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix index f2817d0fd325..f929180406b3 100644 --- a/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "cli_helpers"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "7c2038bba0c41f41acae0f6e660ff3b00d69f55d9d968f024952cace78111e12"; + sha256 = "0p9yklddpplncr765h6qrii1dgvvlqxj25n5400dwqas9lmij4fj"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix b/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix index 548317a9835a..33d036ad8d42 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "18d3a5dfc82f752b9f4c844cceb663213e26e130f4a2894a18ad1f11d57a30bc"; + sha256 = "3ea6fd33b7521855a97819b3d645f92d51c8763d3ab5df35197cd8e96c19ba6f"; }; buildInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix index 78f0f6fe371f..686608445abc 100644 --- a/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix @@ -30,6 +30,9 @@ buildPythonPackage rec { description = "Autogenerate Colander schemas based on SQLAlchemy models"; homepage = https://github.com/stefanofontanelli/ColanderAlchemy; license = licenses.mit; + # ColanderAlchemy's tests currently fail with colander >1.6.0 + # (see https://github.com/stefanofontanelli/ColanderAlchemy/issues/107) + broken = versionOlder "1.6.0" colander.version; }; } diff --git a/nixpkgs/pkgs/development/python-modules/configparser/default.nix b/nixpkgs/pkgs/development/python-modules/configparser/default.nix index 93b5e58a7745..7fce23f89c11 100644 --- a/nixpkgs/pkgs/development/python-modules/configparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/configparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "configparser"; - version = "3.7.3"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "27594cf4fc279f321974061ac69164aaebd2749af962ac8686b20503ac0bcf2d"; + sha256 = "da60d0014fd8c55eb48c1c5354352e363e2d30bbf7057e5e171a468390184c75"; }; # No tests available diff --git a/nixpkgs/pkgs/development/python-modules/coverage/default.nix b/nixpkgs/pkgs/development/python-modules/coverage/default.nix index 1b0839fd4886..b6eb73a80386 100644 --- a/nixpkgs/pkgs/development/python-modules/coverage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coverage/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "coverage"; - version = "4.5.2"; + version = "4.5.3"; src = fetchPypi { inherit pname version; - sha256 = "ab235d9fe64833f12d1334d29b558aacedfbca2356dfb9691f2d0d38a8a7bfb4"; + sha256 = "9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609"; }; # No tests in archive diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index dfbb14eb7e65..69c9f7292942 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -20,18 +20,17 @@ }: buildPythonPackage rec { - # also bump cryptography_vectors pname = "cryptography"; - version = "2.5"; + version = "2.6.1"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "00c4d7gvsymlaw0r13zrm32dcnarmpayjyrh65yymlmr6mrbcij9"; + sha256 = "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16"; }; outputs = [ "out" "dev" ]; - buildInputs = [ openssl cryptography_vectors ] + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ asn1crypto @@ -42,11 +41,12 @@ buildPythonPackage rec { ++ stdenv.lib.optional (!isPyPy) cffi; checkInputs = [ - pytest - pretend + cryptography_vectors + hypothesis iso8601 + pretend + pytest pytz - hypothesis ]; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/cryptography_vectors/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix index f02a986ec023..5679905cd143 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix @@ -1,13 +1,13 @@ -{ buildPythonPackage, fetchPypi, lib }: +{ buildPythonPackage, fetchPypi, lib, cryptography }: buildPythonPackage rec { - # also bump cryptography pname = "cryptography_vectors"; - version = "2.5"; + # The test vectors must have the same version as the cryptography package: + version = cryptography.version; src = fetchPypi { inherit pname version; - sha256 = "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik"; + sha256 = "1bsqcv3h49dzqnyn29ijq8r7k1ra8ikl1y9qcpcns9nbvhaq3wq3"; }; # No tests included diff --git a/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix index 58126c7d1e68..1976b30cc17e 100644 --- a/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.1.1"; + version = "7.1.2"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "17d760bdf89e364fc7c964c5640c1b38cbb22ab49b53830883f21fda92c59131"; + sha256 = "7d0e30d6ce62bedd41ae4885d43fff727314b67655ec8737b8af5cc0aad7f925"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/cysignals/default.nix b/nixpkgs/pkgs/development/python-modules/cysignals/default.nix index 1cd55acdbeb8..e69fbce21587 100644 --- a/nixpkgs/pkgs/development/python-modules/cysignals/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cysignals/default.nix @@ -9,11 +9,11 @@ assert pariSupport -> pari != null; buildPythonPackage rec { pname = "cysignals"; - version = "1.9.0"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "15ix8crpad26cfl1skyg7qajqqfdrm8q5ahhmlfmqi1aw0jqj2g2"; + sha256 = "1ckxzch3wk5cg80mppky5jib5z4fzslny3001r5zg4ar1ixbc1w1"; }; # explicit check: diff --git a/nixpkgs/pkgs/development/python-modules/dask/default.nix b/nixpkgs/pkgs/development/python-modules/dask/default.nix index 93351de1125a..8a2bd2187f94 100644 --- a/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "dask"; - version = "1.1.1"; + version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "2e70135d6856805699b52774d8e0cec41beda92bdfc9f9c776962b4bfb34822c"; + sha256 = "4b0b82a4d61714d3a49953274b1a8a689a51eacf89c4c2ff18aa7f6282ce515e"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/ddt/default.nix b/nixpkgs/pkgs/development/python-modules/ddt/default.nix index f09bf96229fc..46a229a99aea 100644 --- a/nixpkgs/pkgs/development/python-modules/ddt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ddt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ddt"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "898364fc34b27981b925171a0011c174c94633cb678eb1fac05fe7a234c7912c"; + sha256 = "d13e6af8f36238e89d00f4ebccf2bda4f6d1878be560a6600689e42077e164e3"; }; checkInputs = [ nose six pyyaml mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix index 16a5088c33d9..d6315575766f 100644 --- a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "3.14.4"; + version = "3.14.5"; src = fetchPypi { inherit pname version; - sha256 = "ecac135cc4e5824b6bf8242679fc7225f44885877677701da6de7703f060f518"; + sha256 = "5e0c73fbec99d2782479f6d8c292be87ed8672eb42b451e7f7a5d52a3458c4e5"; }; propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix b/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix index 4a070a578731..6bdda6ac5ea7 100644 --- a/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "3.3.1"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "30833581d03e07d7574b2ff698d213c984777dd44dd47c45c54d31858c694c94"; + sha256 = "2c7a6471c0f5b07ac9257adec3b3c3a89193ee672fdeb0a6f29487dc9d675e0c"; }; propagatedBuildInputs = [ requests py ]; diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index cc28b6e36065..25beee94e105 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "1.26.0"; + version = "1.26.1"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "1f5hnmkj89z3lgig6wbyrvwvd4vnhkm4rf7v2ndn79mpiv1c9zxr"; + sha256 = "768d9cbd91a7df4a2e391729ec00e387d98e8092d61d076b2272839eb12666f7"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; diff --git a/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix b/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix index 475f004342c7..bc635461f528 100644 --- a/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "2.5.0"; + version = "2.5.3"; src = fetchPypi { inherit pname version; - sha256 = "02irmhj61mhz3kaw9md4rqpavzkcvkhfk5lhgvss39yras5sxbm8"; + sha256 = "0ljyfbpg34n7b8k31xc4q9c922p836km9wxh0algdxxfkam7z667"; }; propagatedBuildInputs = [ django ]; diff --git a/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix b/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix index 683c0bc0cebc..4bcd767bd63d 100644 --- a/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix @@ -1,17 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { pname = "django-picklefield"; version = "2.0"; + src = fetchPypi { + inherit pname version; + sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24"; + }; + + propagatedBuildInputs = [ django ]; + meta = { description = "A pickled object field for Django"; homepage = https://github.com/gintas/django-picklefield; license = lib.licenses.mit; }; - - src = fetchPypi { - inherit pname version; - sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24"; - }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix b/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix index 696376b3e4bd..a6edc98b0cb8 100644 --- a/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-rest-auth"; - version = "0.9.3"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "ad155a0ed1061b32e3e46c9b25686e397644fd6acfd35d5c03bc6b9d2fc6c82a"; + sha256 = "f11e12175dafeed772f50d740d22caeab27e99a3caca24ec65e66a8d6de16571"; }; propagatedBuildInputs = [ django djangorestframework six ]; diff --git a/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix b/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix index 90d73bfde132..1ce86daf9925 100644 --- a/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "django-appconf"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "0qdjdx35g66xjsc50v0c5h3kg6njs8df33mbjx6j4k1vd3m9lkba"; + sha256 = "35f13ca4d567f132b960e2cd4c832c2d03cb6543452d34e29b7ba10371ba80e3"; }; # No tests in archive diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix index 750d74d1e291..49e5c5f0b6a0 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.9.2"; + version = "3.9.3"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "05sam4z69mypxk8fv415zvs8mp09jqsagmslrbs1qvk51lk6d8pp"; + sha256 = "1w1rc8cpw89sll5wsg1aj1w3klk91a1bsdz9y4zhg5xrc0qpd118"; }; # Test settings are missing diff --git a/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix b/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix index 5ebedf67b8df..ef0a6f907412 100644 --- a/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "0rq3543m0q7kfl02l8ji4c35qbxb99h2mzjaxbaxfrlk6dcpk76j"; + sha256 = "83d5ddc1b83304dbccba1dc7b9e0ee37bec4269bb9ad5779480991525c3811d6"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/dnslib/default.nix b/nixpkgs/pkgs/development/python-modules/dnslib/default.nix index 15c771ebaf52..65f45ca86f6b 100644 --- a/nixpkgs/pkgs/development/python-modules/dnslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.9"; + version = "0.9.10"; src = fetchPypi { inherit pname version; - sha256 = "0w8spp4fnw63xx9zj77zvgk1qabd97ifrj6gap2j36gydnarr42c"; + sha256 = "666bf55274a630a2925411c4ea9ca724529299bbe70f91979ad99c72c5e5099e"; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; diff --git a/nixpkgs/pkgs/development/python-modules/docker/default.nix b/nixpkgs/pkgs/development/python-modules/docker/default.nix index 71e411a24f3a..fc6169f1b136 100644 --- a/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "3.7.0"; + version = "3.7.2"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "2840ffb9dc3ef6d00876bde476690278ab13fa1f8ba9127ef855ac33d00c3152"; + sha256 = "c456ded5420af5860441219ff8e51cdec531d65f4a9e948ccd4133e063b72f50"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/nixpkgs/pkgs/development/python-modules/emoji/default.nix index 082958fcce19..c00ca778bc6c 100644 --- a/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "emoji"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "a9e9c08be9907c0042212c86dfbea0f61f78e9897d4df41a1d6307017763ad3e"; + sha256 = "9ae01495fc3fcc04e9136ca1af8cae58726ec5dfaaa92f61f0732cbae9a12fa9"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix b/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix index 317c16d52754..94fca96b455b 100644 --- a/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix @@ -1,18 +1,20 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing, pytest }: +{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { - version = "0.8.8"; + version = "0.9"; pname = "ezdxf"; + disabled = pythonOlder "3.5"; + src = fetchFromGitHub { owner = "mozman"; repo = "ezdxf"; rev = "v${version}"; - sha256 = "0ap6f6vy71s3y0a048r5ca98i7p8nc9l0mx3mngvvpvjij7j3fcf"; + sha256 = "1ggimjd9060b696sgzgxy9j9sl45wh9qbxnf0035qclafshprlzl"; }; - buildInputs = [ pytest ]; - checkPhase = "python -m unittest discover -s tests"; + checkInputs = [ pytest ]; + checkPhase = "pytest tests integration_tests"; propagatedBuildInputs = [ pyparsing ]; diff --git a/nixpkgs/pkgs/development/python-modules/faker/default.nix b/nixpkgs/pkgs/development/python-modules/faker/default.nix index 548c7a59bc6f..1828fb49de28 100644 --- a/nixpkgs/pkgs/development/python-modules/faker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "1.0.2"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "0v1pjzn9z20ckgv3kji7c8nwcsm7670z4i43ic9skjrdbcqylwfq"; + sha256 = "3f2f4570df28df2eb8f39b00520eb610081d6552975e926c6a2cbc64fd89c4c1"; }; buildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/fastcache/default.nix b/nixpkgs/pkgs/development/python-modules/fastcache/default.nix index 5638e8412b56..f50eb8f53bb1 100644 --- a/nixpkgs/pkgs/development/python-modules/fastcache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastcache/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fastcache"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1rl489zfbm2x67n7i6r7r4nhrhwk6yz3yc7x9y2rky8p95vhaw46"; + sha256 = "0avqpswfmw5b08xx3ib6zchc5bis390fn1v74vg7nnrkf1pb3qbd"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix b/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix new file mode 100644 index 000000000000..4a921b2390d7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "fastentrypoints"; + version = "0.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "02s1j8i2dzbpbwgq2a3fiqwm3cnmhii2qzc0k42l0rdxd4a4ya7z"; + }; + + meta = with stdenv.lib; { + description = "Makes entry_points specified in setup.py load more quickly"; + homepage = https://github.com/ninjaaron/fast-entry_points; + license = licenses.bsd2; + maintainers = with maintainers; [ nixy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/filebytes/default.nix b/nixpkgs/pkgs/development/python-modules/filebytes/default.nix index fdc00d000a1e..b02ff0c74579 100644 --- a/nixpkgs/pkgs/development/python-modules/filebytes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filebytes/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "filebytes"; - version = "0.9.18"; + version = "0.9.20"; src = fetchPypi { inherit pname version; - sha256 = "1y50wagcs1p5w1j4fxyfr209595m706ifdirv8vr8nc9xqd6ngjs"; + sha256 = "6c33986ca048e49cf1a5e2f167af9f02c7f866576b3b91a8a9124d32e57f935d"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix index b8d203d515a9..ebd100037b25 100644 --- a/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder , attrs, click, cligj, click-plugins, six, munch, enum34 -, pytest, boto3 +, pytest, boto3, mock , gdal }: @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytest boto3 - ]; + ] ++ stdenv.lib.optional (pythonOlder "3.4") mock; checkPhase = '' rm -r fiona # prevent importing local fiona diff --git a/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/nixpkgs/pkgs/development/python-modules/flake8/default.nix index 966bf5877bda..675e5ea86f59 100644 --- a/nixpkgs/pkgs/development/python-modules/flake8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flake8/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "flake8"; - version = "3.7.6"; + version = "3.7.7"; src = fetchPypi { inherit pname version; - sha256 = "6d8c66a65635d46d54de59b027a1dda40abbe2275b3164b634835ac9c13fd048"; + sha256 = "859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661"; }; checkInputs = [ pytest mock pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/folium/default.nix b/nixpkgs/pkgs/development/python-modules/folium/default.nix index 1557cfdd52d5..4664e095d26c 100644 --- a/nixpkgs/pkgs/development/python-modules/folium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.8.0"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0f25fhwxnix8hddzf67barzjwwsvpww112zisrvz2lpl08j388rn"; + sha256 = "b7a1e907caac6ddaf0614555f58ba9af2ed65356ccc77f6ba6fc3df202d8f146"; }; checkInputs = [ pytest nbconvert pandas mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/funcy/default.nix b/nixpkgs/pkgs/development/python-modules/funcy/default.nix index 0b6149cbc218..fd36c7590b5e 100644 --- a/nixpkgs/pkgs/development/python-modules/funcy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/funcy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "funcy"; - version = "1.11"; + version = "1.12"; src = fetchPypi { inherit pname version; - sha256 = "b5e399eb739afcb5a3ad38302b7817f6e7fee6f5fc79b213a5d82ea8bce0d9e6"; + sha256 = "0vdbh0ykmjsvq4vb3hrx5327q9ccl1jhbjca59lsr0v0ghwb0grz"; }; # No tests diff --git a/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index fd8eb816784e..b318016ee815 100644 --- a/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k , click , mock , pytest @@ -11,22 +12,23 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "226d1d0960f86ba5d9efd426a70b291eaba96f47d071657e0254ea969025728a"; + sha256 = "03rq2rjac0zh16vsw0q914sp62l9f8fp033wn3191pqd2cchqix0"; }; checkInputs = [ - click mock pytest futures - ]; + click mock pytest + ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ google_auth requests_oauthlib ]; checkPhase = '' + rm -fr tests/__pycache__/ py.test ''; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix index 9d6461168d4e..aab9f827da0f 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "aef243b533144c11c9ff750565c43dffe5445debb143697002edb6205f64a437"; + sha256 = "13b9ah54z6g3w8p74a1anmyz84nrxy27snqv6vp95wsizp8zwsyn"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix b/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix index 33dfc6e83cfb..d17b98e2b680 100644 --- a/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.5.8"; + version = "1.5.9"; src = fetchPypi { inherit pname version; - sha256 = "d56ca712f67fff216d3be9eeeb8360ca59066d0365ba70b137b9e1801813747e"; + sha256 = "627ec53fab43d06c1b5c950e217fa9819e169daf753111a7f244e94bf8fb3384"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix b/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix index 7c115b58d32f..5a845f733f51 100644 --- a/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.5.1"; + version = "0.5.2"; pname = "grappelli_safe"; src = fetchPypi { inherit pname version; - sha256 = "27660faa628186d74258781edfa03ef812555d49b4925cfe19c05bcd3da85e40"; + sha256 = "35b7ccaf9acc54684c73aeefbeaddc63b8a16143bd981bd5b3ebef253def07df"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/gym/default.nix b/nixpkgs/pkgs/development/python-modules/gym/default.nix index b207e7ca239e..ea920663846a 100644 --- a/nixpkgs/pkgs/development/python-modules/gym/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0ggac8a8qk06wplwg5xsisn9id3lis9qslri7m9rz22khlyl7z4j"; + sha256 = "f8bee3672759aeec4271169dcbb2afc069b898c7f92882d965c59be8085f2b35"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix b/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix index cbe5afcc8edf..d20c43754fce 100644 --- a/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.19"; + version = "0.8.20"; src = fetchPypi { inherit pname version; - sha256 = "7bd74c7bd16540d7f437cf6cb61ceb4d23506f4d040c436d7570d104c1297e31"; + sha256 = "263e9f34db63eec217d50f2ca3e65049c065775dc4095b5ee817824cd2b5b51b"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/nixpkgs/pkgs/development/python-modules/holoviews/default.nix index ea8885def3e4..1de465cfec09 100644 --- a/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/nixpkgs/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.11.2"; + version = "1.11.3"; src = fetchPypi { inherit pname version; - sha256 = "0902wzzz73ikkdy0jfhg1lx97y1gk7v1nr3d3jqqdfzaa7bmhqwj"; + sha256 = "cb03053bfcb96ccef181405b6d3482a5b868f0c7fbaa68b52d25e0071dafd1bc"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/nixpkgs/pkgs/development/python-modules/homeassistant-pyozw/default.nix index 3292770a661e..5851d62842b6 100644 --- a/nixpkgs/pkgs/development/python-modules/homeassistant-pyozw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/homeassistant-pyozw/default.nix @@ -2,12 +2,12 @@ python_openzwave.overridePythonAttrs (oldAttrs: rec { pname = "homeassistant_pyozw"; - version = "0.1.2"; + version = "0.1.4"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d64389f294b1fdee57adf78cd25ba45c9095facec3d80120182bbf8ba1fcdf05"; + sha256 = "a4ec26b95dba630df8c95c617c510e4a33db93a6a39e8a97056eec7dc9a49d1e"; }; meta.homepage = https://github.com/home-assistant/python-openzwave; diff --git a/nixpkgs/pkgs/development/python-modules/hug/default.nix b/nixpkgs/pkgs/development/python-modules/hug/default.nix index 33ef7de1b422..1b9542824c07 100644 --- a/nixpkgs/pkgs/development/python-modules/hug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hug/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "hug"; - version = "2.4.1"; + version = "2.4.8"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7b633ebbed95f4c264a745cf91450007fe7004e1eaa5b02bf9b3ad28fdd62d08"; + sha256 = "2b33904660d07df3a6a998a52d1a36e2855e56dc9ffc4eddb2158e32d1ce7621"; }; propagatedBuildInputs = [ falcon requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/hupper/default.nix b/nixpkgs/pkgs/development/python-modules/hupper/default.nix index c0e4c4ec9e85..c6b0a2c64bc6 100644 --- a/nixpkgs/pkgs/development/python-modules/hupper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hupper/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.4.2"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "eb3778398658a011c96e620adcd73175f306f880a6d86b2ebb6d2a15a74b6b9b"; + sha256 = "fe8febd68cec7fbed174fcbb0b42c427f96c8a7471c1cd4999fc698dd8dc6c34"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix index d47f5ce39fec..2db6ad1c3d03 100644 --- a/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.2.2"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "d3ddec4436e043c3398392b4ba8936b4ab52fa262284e767eb6c351d9b3ab5b7"; + sha256 = "443f419ca6160773cbaf22dbb302b1e436a386f23129dbb5482b68a147c2eca9"; }; # Tests not included in PyPI tarball diff --git a/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix index f72698fd0d13..5d07024656ec 100644 --- a/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -6,10 +6,10 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { - sha256 = "191k77hd69lfmd8p4w02c2ajjdsall6zijn01gyhqi11n48wpsib"; + sha256 = "1hnn00xz9jyksnx1g0r1icv6ynbdnxq4cfnmb58ikg6ymi20al18"; inherit pname version; }; diff --git a/nixpkgs/pkgs/development/python-modules/isort/default.nix b/nixpkgs/pkgs/development/python-modules/isort/default.nix index bb9958a6fef1..532b743bab42 100644 --- a/nixpkgs/pkgs/development/python-modules/isort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/isort/default.nix @@ -5,11 +5,11 @@ let testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests; in buildPythonPackage rec { pname = "isort"; - version = "4.3.16"; # Note 4.x is the last version that supports Python2 + version = "4.3.17"; # Note 4.x is the last version that supports Python2 src = fetchPypi { inherit pname version; - sha256 = "1v6lapqhc33rxr9698lqjyb49fis27i42p3ymngrw95py3qf7y08"; + sha256 = "268067462aed7eb2a1e237fcb287852f22077de3fb07964e87e00f829eea2d1a"; }; propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ]; diff --git a/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/nixpkgs/pkgs/development/python-modules/jedi/default.nix index 4f713e212f47..01afa74b3b27 100644 --- a/nixpkgs/pkgs/development/python-modules/jedi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.13.2"; + version = "0.13.3"; src = fetchPypi { inherit pname version; - sha256 = "571702b5bd167911fe9036e5039ba67f820d6502832285cde8c881ab2b2149fd"; + sha256 = "2bb0603e3506f708e792c7f4ad8fc2a7a9d9c2d292a358fbbd58da531695595b"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix b/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix index 70bf12a8f0cf..edfeb0a59714 100644 --- a/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jenkinsapi"; - version = "0.3.8"; + version = "0.3.9"; src = fetchPypi { inherit pname version; - sha256 = "120adfc9cea83fb890744b5049c5bb7edc77699059f0da62db66354ec27c54e2"; + sha256 = "bf35b208fe05e65508f3b8bbb0f91d164b007632e27ebe5f54041174b681b696"; }; propagatedBuildInputs = [ pytz requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/jinja2/default.nix index b800303c20cb..52827f0a23ca 100644 --- a/nixpkgs/pkgs/development/python-modules/jinja2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jinja2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Jinja2"; - version = "2.10"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"; + sha256 = "065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/jmespath/default.nix b/nixpkgs/pkgs/development/python-modules/jmespath/default.nix index 85a9d19db2a4..cc0a78872b2d 100644 --- a/nixpkgs/pkgs/development/python-modules/jmespath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jmespath/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jmespath"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "6a81d4c9aa62caf061cb517b4d9ad1dd300374cd4706997aff9cd6aedd61fc64"; + sha256 = "bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c"; }; buildInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/nixpkgs/pkgs/development/python-modules/joblib/default.nix index f9f5ba23eac9..9b2a5c447327 100644 --- a/nixpkgs/pkgs/development/python-modules/joblib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/joblib/default.nix @@ -38,8 +38,10 @@ buildPythonPackage rec { checkInputs = [ sphinx numpydoc pytest ]; propagatedBuildInputs = [ python-lz4 ]; + # test_disk_used is broken + # https://github.com/joblib/joblib/issues/57 checkPhase = '' - py.test joblib + py.test joblib -k "not test_disk_used" ''; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix b/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix index 2ca26ad65e8c..226f1743a2a0 100644 --- a/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,25 +2,16 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.9.1"; + version = "1.10.0"; propagatedBuildInputs = [ six EditorConfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "0q8ld072dkccssagjxyvc9633fb6ynflvz70924phgp3zxmim960"; + sha256 = "1e389572ade865173605471e98df4002f4b6e5235121c13f1e4497a3eac69108"; }; - patches = [ - (fetchpatch { - url = "https://github.com/beautify-web/js-beautify/commit/78e35a11cbb805fc044241d6465800ee2bd57ebc.patch"; - sha256 = "1ah7nshk96yljy37i20v4fga834dix9cdbhkdc3flfm4904n4523"; - }) - ]; - - patchFlags = [ "-p2" ]; - meta = with lib; { homepage = "http://jsbeautifier.org"; description = "JavaScript unobfuscator and beautifier."; diff --git a/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix b/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix index e68bd1615fa9..891aa3f33941 100644 --- a/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.5"; + version = "1.4.6"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "01jlklfgvggkyq5yj0zhk46xv91jhha2cshq8kbxv9f7043c201i"; + sha256 = "08f83d8e0af2e64d25f94314d4bef6785b34e3b0df0effe9eebf76b98de66eeb"; }; checkInputs = [ pytest six mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/keyring/default.nix b/nixpkgs/pkgs/development/python-modules/keyring/default.nix index 041fafaf08cd..e54283735a86 100644 --- a/nixpkgs/pkgs/development/python-modules/keyring/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keyring/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "keyring"; - version = "18.0.0"; + version = "18.0.1"; src = fetchPypi { inherit pname version; - sha256 = "12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d"; + sha256 = "67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/ldappool/default.nix b/nixpkgs/pkgs/development/python-modules/ldappool/default.nix index 3ad0ae3b7232..81301f337e62 100644 --- a/nixpkgs/pkgs/development/python-modules/ldappool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldappool/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "ldappool-${version}"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { pname = "ldappool"; inherit version; - sha256 = "d9c9ec29be3f3e64164be84fe080a3087108836f307a12ec62f7d18988293df3"; + sha256 = "23edef09cba4b1ae764f1ddada828d8e39d72cf32a457e599f5a70064310ea00"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/libagent/default.nix b/nixpkgs/pkgs/development/python-modules/libagent/default.nix index 939e4f18898e..e55887a49f56 100644 --- a/nixpkgs/pkgs/development/python-modules/libagent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libagent/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "libagent"; - version = "0.13.0"; + version = "0.13.1"; src = fetchPypi{ inherit pname version; - sha256 = "ecd6854ba8f04d04e39cb00ae3a179d6a1d5dc8e0b60ac5208c0a62e10e3106e"; + sha256 = "b9afa0851f668612702fcd648cee47af4dc7cfe4f86d4c4a84b1a6b4a4960b41"; }; propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse diff --git a/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/nixpkgs/pkgs/development/python-modules/lxml/default.nix index 117a9699e01d..816b3a676828 100644 --- a/nixpkgs/pkgs/development/python-modules/lxml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.3.1"; + version = "4.3.3"; src = fetchPypi { inherit pname version; - sha256 = "da5e7e941d6e71c9c9a717c93725cda0708c2474f532e3680ac5e39ec57d224d"; + sha256 = "4a03dd682f8e35a10234904e0b9508d705ff98cf962c5851ed052e9340df3d90"; }; nativeBuildInputs = [ libxml2.dev libxslt.dev ]; diff --git a/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix b/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix index 7a7d7f0287b6..b7c491876855 100644 --- a/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "MarkupSafe"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3"; + sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 0d8382f9b6ff..6412e04f93d3 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.16.1"; + version = "0.16.2"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0dv9imc41xg0k9xv0fb8ygfip7iznsnf8g33z74zz2bf1dbhricr"; + sha256 = "755e6e930c1ffe3430f62091085f0a51e0817b240986d931014f03b3556fff34"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/nixpkgs/pkgs/development/python-modules/mechanize/default.nix b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix index c6e7089cdd9b..f23c3c9e20b7 100644 --- a/nixpkgs/pkgs/development/python-modules/mechanize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1fl6zb36cqsdiay1mn3nmjv5jw4jys5av7hb1y9995qlycg0hm49"; + sha256 = "b680ca1b4fabe5ef52024d120f40b8e2ed7d175ed4d67225d2c477dac7c7a58b"; }; propagatedBuildInputs = [ html5lib ]; diff --git a/nixpkgs/pkgs/development/python-modules/minio/default.nix b/nixpkgs/pkgs/development/python-modules/minio/default.nix index c8595f0383e7..7eea7596f433 100644 --- a/nixpkgs/pkgs/development/python-modules/minio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "minio"; - version = "4.0.13"; + version = "4.0.14"; src = fetchPypi { inherit pname version; - sha256 = "1sbmv1lskm5cs3jmn8f2688pimgibly16g8ycc6fgnsjanyby35l"; + sha256 = "72c8ab7b1c25f875273e66762982816af8ada2ced88b6cd991e979f479c34875"; }; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/moretools/default.nix b/nixpkgs/pkgs/development/python-modules/moretools/default.nix index bef182558042..bdfb9e2efcae 100644 --- a/nixpkgs/pkgs/development/python-modules/moretools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/moretools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "moretools"; - version = "0.1.8"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "03ni7k0kcgrm3y605c29gqlyp779fx1xc3r8xb742lzd6ni30kdg"; + sha256 = "f531cc79b7cd0c4aab590d5d4d0291f7cf6f083398be1dd523224b3385b732f4"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/nixpkgs/pkgs/development/python-modules/mypy/default.nix index c028eaaaa142..093d0d39ddd3 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.670"; + version = "0.700"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d"; + sha256 = "1zxfi5s9hxrz0hbaj4n513az17l44pxl80r62ipjc0bsmbcic2xi"; }; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix index 56c1ab227c8d..efddecd42469 100644 --- a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.15"; + version = "8.0.16"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1w4j2sf07aid3453529z8kg1ziycbayxi3g2r4wqn0nb3y1caqz6"; + sha256 = "0yl3fkyws24lc2qrbvn42bqy72aqy8q5v8f0j5zy3mkh9a7wlxdp"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/nixpkgs/pkgs/development/python-modules/ncclient/default.nix b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix index 24016ef8b104..eaf75d467cb1 100644 --- a/nixpkgs/pkgs/development/python-modules/ncclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.3"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "3ab58ee0d71069cb5b0e2f29a4e605d1d8417bd10af45b73ee3e817fe389fadc"; + sha256 = "47d5af7398f16d609eebd02be2ecbd997b364032b5dc6d4927c810ea24f39080"; }; checkInputs = [ nose rednose ]; diff --git a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix index a274da71ce40..d8131ffc3bdf 100644 --- a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.5.0"; + version = "1.5.0.1"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1nf0cjja94zsfbp8dw83b36c4cmz9v4b0h51yh8g3q2z9w8d2n62"; + sha256 = "db24f7ca724e791574774b2a1e323ce0dfb544957fc6fbdb5d4c368f382b2de9"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index f697e34e9995..0d2519d4e107 100644 --- a/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.5.0"; + version = "0.5.1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "085cd4f7c19a47ed9d951c853223190b9fb0dbddeaeedf8f86dfa9c53d6492ca"; + sha256 = "dca56e8a1f0fc6dcd1c997383187efc31788294ac6bcbbaebac2b9a962a44cbb"; }; # disable some failing tests diff --git a/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/nixpkgs/pkgs/development/python-modules/nipype/default.nix index 494dbdaa9835..42fb2de9dca6 100644 --- a/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nipype/default.nix @@ -44,11 +44,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.1.8"; + version = "1.1.9"; src = fetchPypi { inherit pname version; - sha256 = "d5eec6de7d8e7020106c42b37d17f99de92824440cc79dfa6080f7c2e6d9fecc"; + sha256 = "f80096ec6cfd7cffc05764bba1749e424877140ef1373193f076bdd843f19016"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix index 9bb4a3e41f32..4a943e32d4c5 100644 --- a/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "nixpkgs-pytools"; - version = "1.0.0"; + version = "1.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6aaf1e990be639a0d01afb454756606f3111dd8c596b6e848d4a0cec019168d0"; + sha256 = "0796c6e95daeb3d7e61c9c53126d95ba6a48f84b995b12b60f45619caf28a574"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/nixpkgs/pkgs/development/python-modules/notebook/default.nix index c458cb81e4f6..556fcfb31f5f 100644 --- a/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.7.4"; + version = "5.7.8"; src = fetchPypi { inherit pname version; - sha256 = "d908673a4010787625c8952e91a22adf737db031f2aa0793ad92f6558918a74a"; + sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8"; }; LC_ALL = "en_US.utf8"; diff --git a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index b586a36aa88a..57b48f991891 100644 --- a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.2"; + version = "0.6.3"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "04qmk1diplpvcdmk0clbsy0mdg04pkmgjjysz31g82v477if9m54"; + sha256 = "0nzk6r724dyai33fi7xmc6jn57pkcwqm553vlv0r11blvc92d7pp"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix index 804c90d7d9dc..4c2af8a00814 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.10.0"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "1r864sc7anw43s8bg5yd17bxcw1a4lj5h7mz7cbwnzpb9xmqpccj"; + sha256 = "f6b529b8a8112dfe456d4f7697c7aee0aca62be5a873879306afe4b26fca963c"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix index f35562d7c422..85dc80681aad 100644 --- a/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.8.0"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "39908f01cda98186c0fedc350b68342d6016ee325615f4c8475c1e64a55d9e4f"; + sha256 = "5195b5d66808787894590926b038381eb47495c9df4fd0d907c84d86cb35132f"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix b/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix index 615c1f68f294..adcb640df139 100644 --- a/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "ofxtools"; - version = "0.5.2"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "520345d3b440447696b8f84a4e752573666ff8d1fe0300316cd07995ae05176f"; + sha256 = "83e1ca0a61463fca99d096a694466726a49979a5d2b8a36a65514c7a8617d3ea"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix b/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix index 211e7a366275..ea12f1cc35a3 100644 --- a/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.6.0"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "70da6b45a5925285b6a3d93570b45f4402eb2d335740163a58eef533b139565c"; + sha256 = "1d2af392cef8c8227bd2ac3ebe3a28b25aba74fd4fa473ce106065f0b73bfe2e"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/paperspace/default.nix b/nixpkgs/pkgs/development/python-modules/paperspace/default.nix index 74a223d7f808..6f73004deeb9 100644 --- a/nixpkgs/pkgs/development/python-modules/paperspace/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paperspace/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "paperspace"; - version = "0.0.15"; + version = "0.0.19"; src = fetchPypi { inherit pname version; - sha256 = "af96dae7a1d84df8781aded392764953c9cbeb43d5cc314e405d3470f7c8006c"; + sha256 = "2216fb31919595ba442077e8028cc05b0598421a74604daeae4d2baa5e8409d9"; }; propagatedBuildInputs = [ boto3 requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/partd/default.nix b/nixpkgs/pkgs/development/python-modules/partd/default.nix index ef706c65c6ca..c7691df6b118 100644 --- a/nixpkgs/pkgs/development/python-modules/partd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/partd/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "partd"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1fd6d9c12f14ea180e659a9e4a686ff2816dd930e8fb0b84c0d8116a29cfe66b"; + sha256 = "33722a228ebcd1fa6f44b1631bdd4cff056376f89eb826d7d880b35b637bcfba"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/path.py/default.nix b/nixpkgs/pkgs/development/python-modules/path.py/default.nix index a94d495310fd..318642a393a3 100644 --- a/nixpkgs/pkgs/development/python-modules/path.py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/path.py/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "path.py"; - version = "11.5.0"; + version = "11.5.2"; src = fetchPypi { inherit pname version; - sha256 = "b6687a532a735a2d79a13e92bdb31cb0971abe936ea0fa78bcb47faf4372b3cb"; + sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa"; }; checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; diff --git a/nixpkgs/pkgs/development/python-modules/pbr/default.nix b/nixpkgs/pkgs/development/python-modules/pbr/default.nix index 6beba7717014..c3d5ba170e3f 100644 --- a/nixpkgs/pkgs/development/python-modules/pbr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.1.2"; + version = "5.1.3"; src = fetchPypi { inherit pname version; - sha256 = "d717573351cfe09f49df61906cd272abaa759b3e91744396b804965ff7bff38b"; + sha256 = "8c361cc353d988e4f5b998555c88098b9d5964c2e11acf7b0d21925a66bb5824"; }; # circular dependencies with fixtures diff --git a/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix index d8fa26abf742..6d0cafd5f803 100644 --- a/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.4.1"; + version = "1.4.2"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "c417149cb5ca52021203943e0eeb95db53580afebe728086e69671add4daeb08"; + sha256 = "694f8014f4c3722e5913f1c378c7056b1330db070ff7cb8196a80d24b80fa61e"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/nixpkgs/pkgs/development/python-modules/pecan/default.nix index 70d71ea51792..9f3c009f8c12 100644 --- a/nixpkgs/pkgs/development/python-modules/pecan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pecan/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "pecan"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "24f06cf88a488b75f433e62b33c1c97e4575d0cd91eec9eec841a81cecfd6de3"; + sha256 = "b5461add4e3f35a7ee377b3d7f72ff13e93f40f3823b3208ab978b29bde936ff"; }; propagatedBuildInputs = [ singledispatch logutils ]; diff --git a/nixpkgs/pkgs/development/python-modules/peewee/default.nix b/nixpkgs/pkgs/development/python-modules/peewee/default.nix index 08c908e0aa59..acb46af46b33 100644 --- a/nixpkgs/pkgs/development/python-modules/peewee/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.9.3"; + version = "3.9.5"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "1frwwqkk0y1bkcm7bdzbyv2119vv640ncgs4d55zhbs70fxm2ylj"; + sha256 = "0c2hkkpp9rajnw5px17wd72x95k7wc2a0iy55pjhi5ly2cqd9ylv"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index 0aa89eb76203..9f87d8a16cb0 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.6.3"; + version = "1.6.6"; src = fetchPypi { inherit pname version; - sha256 = "1xb68q4rdi0is22cwvrfk1xwg6yngdxcvmjpdlkgmbdxf3y1sy33"; + sha256 = "ca887bedc9c6e0eab72fcb4c20eda8fff975d06b75993a85ee1dfc763ba38e86"; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index d8e04f56146e..eccbd9c0d159 100644 --- a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -1,20 +1,22 @@ { stdenv , buildPythonPackage , fetchPypi -, pytz -, six +, isPy3k +, passlib }: buildPythonPackage rec { pname = "pg8000"; version = "1.13.1"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "2208c7aaffe8d61f5c4ccbefeb74ba033003899e64aee37c0eb98aadae8b9c6b"; }; - propagatedBuildInputs = [ pytz six ]; + propagatedBuildInputs = [ passlib ]; meta = with stdenv.lib; { homepage = https://github.com/tlocke/pg8000; diff --git a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index af9232b174cd..9fe07fe329be 100644 --- a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.8"; + version = "8.10.9"; src = fetchPypi { inherit pname version; - sha256 = "1ka7fnlvmvmw984k89mlkdlwbnnyap186a1yfnykx833bp364yg2"; + sha256 = "d9cf2e8e4ad40552487ab47182bc9759fca1edaa7d513e95a9f20c6742416234"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/pika/default.nix b/nixpkgs/pkgs/development/python-modules/pika/default.nix index 40f2afcafb60..073c292c84d2 100644 --- a/nixpkgs/pkgs/development/python-modules/pika/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pika/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pika"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "119lpjzw8wd7c6ikn35c0pvr3zzfy20rklpxdkcmp12wnf9i597v"; + sha256 = "5ba83d3daffccb92788d24facdab62a3db6aa03b8a6d709b03dc792d35c0dfe8"; }; # Tests require twisted which is only availalble for python-2.x diff --git a/nixpkgs/pkgs/development/python-modules/plone-testing/default.nix b/nixpkgs/pkgs/development/python-modules/plone-testing/default.nix index 636028c957a9..ff4020a920b9 100644 --- a/nixpkgs/pkgs/development/python-modules/plone-testing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plone-testing/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plone.testing"; - version = "7.0.0"; + version = "7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "db71bde0d4d3c273dbba8c7a2ab259a42f038eca74184da36c5aab61e90e8dd7"; + sha256 = "98a6e9ce8df1fdd33876e2d8c3ca3d8291612c20bd7e0811dac83b6ce10e984b"; }; propagatedBuildInputs = [ six setuptools zope_testing ]; diff --git a/nixpkgs/pkgs/development/python-modules/poetry/jsonschema.nix b/nixpkgs/pkgs/development/python-modules/poetry/jsonschema.nix index 9f7cf34b9416..d0adb43daf84 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry/jsonschema.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry/jsonschema.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "3.0.0a3"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0pkhsq91rhk6384p0jxjkhc9yml2ya2l0mysyq78sb4981h45n6z"; + sha256 = "0c0a81564f181de3212efa2d17de1910f8732fa1b71c42266d983cd74304e20d"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/prompt_toolkit/1.nix b/nixpkgs/pkgs/development/python-modules/prompt_toolkit/1.nix index e9d44c83f1db..133a1096863f 100644 --- a/nixpkgs/pkgs/development/python-modules/prompt_toolkit/1.nix +++ b/nixpkgs/pkgs/development/python-modules/prompt_toolkit/1.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "1.0.15"; + version = "1.0.16"; src = fetchPypi { inherit pname version; - sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917"; + sha256 = "c1cedd626e08b8ee830ee65897de754113ff3f3035880030c08b01674d85c5b4"; }; checkPhase = '' rm prompt_toolkit/win32_types.py diff --git a/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/nixpkgs/pkgs/development/python-modules/pudb/default.nix index 028af67b9af8..bcba04fdfd27 100644 --- a/nixpkgs/pkgs/development/python-modules/pudb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2018.1"; + version = "2019.1"; src = fetchPypi { inherit pname version; - sha256 = "0vl7rbqyxa2vfa02dg7f5idf1j7awpfcj0dg46ks59xp8539g2wd"; + sha256 = "19imrr17jnkd6fd2w1zzh63z0hcipg5b9v2x4svqm5c08p3cyc5c"; }; propagatedBuildInputs = [ pygments urwid ]; diff --git a/nixpkgs/pkgs/development/python-modules/purepng/default.nix b/nixpkgs/pkgs/development/python-modules/purepng/default.nix index 49e4d93a5342..ece893874939 100644 --- a/nixpkgs/pkgs/development/python-modules/purepng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/purepng/default.nix @@ -1,21 +1,48 @@ { stdenv , buildPythonPackage -, fetchPypi +, python +, fetchFromGitHub +, fetchpatch +, cython ? null +, numpy ? null }: buildPythonPackage rec { pname = "purepng"; version = "0.2.0"; - src = fetchPypi { - inherit pname version; - sha256 = "1kcl7a6d7d59360fbz2jwfk6ha6pmqgn396962p4s62j893d2r0d"; + src = fetchFromGitHub { + owner = "Scondo"; + repo = "purepng"; + rev = "449aa00e97a8d7b8a200eb9048056d4da600a345"; + sha256 = "105p7sxn2f21icfnqpah69mnd74r31szj330swbpz53k7gr6nlsv"; }; + patches = [ + (fetchpatch { + name = "fix-py37-stopiteration-in-generators.patch"; + url = "https://github.com/Scondo/purepng/pull/28/commits/62d71dfc2be9ffdc4b3e5f642af0281a8ce8f946.patch"; + sha256 = "1ag0pji3p012hmj8kadcd0vydv9702188c0isizsi964qcl4va6m"; + }) + ]; + patchFlags = "-p1 -d code"; + + # cython is optional - if not supplied, the "pure python" implementation will be used + nativeBuildInputs = [ cython ]; + + # numpy is optional - if not supplied, tests simply have less coverage + checkInputs = [ numpy ]; + # checkPhase begins by deleting source dir to force test execution against installed version + checkPhase = '' + rm -r code/png + ${python.interpreter} code/test_png.py + ''; + meta = with stdenv.lib; { description = "Pure Python library for PNG image encoding/decoding"; homepage = https://github.com/scondo/purepng; license = licenses.mit; + maintainers = with maintainers; [ ris ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix index 20b391311355..693477d20c08 100644 --- a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.32.0"; + version = "2.32.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jfmm5684sfb035ihvla75gxz4cls5d2vnf0s02y6dw7s12zbb8a"; + sha256 = "1283cbwd2kacgdij96xk26721f6amyzdhy2py11kdj5cprdlm5c4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index 4b128db82eac..7142b40ce0b0 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales }: buildPythonPackage rec { - version = "3.5.7"; + version = "3.5.8"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "8969435f8e7ca10f60c22096b02b15ad3af143de7d3bb4d73507b812bcdd8e37"; + sha256 = "8cd2270d65d3316dd4dc6bb83242df2e0990d27605209bc16e8041bcc0956961"; }; postPatch = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { export LC_ALL=en_US.UTF-8 ${python.interpreter} -m pyfakefs.tests.all_tests ${python.interpreter} -m pyfakefs.tests.all_tests_without_extra_packages - ${python.interpreter} -m pytest pyfakefs/tests/pytest/pytest_plugin_test.py + ${python.interpreter} -m pytest pyfakefs/pytest_tests/pytest_plugin_test.py ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix index 354535d47ac5..026e5626c023 100644 --- a/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d"; + sha256 = "d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"; }; checkInputs = [ unittest2 ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix index 254edfb86937..e0f0f25c9add 100644 --- a/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "1.5.4"; + version = "1.5.5"; pname = "pyftpdlib"; src = fetchPypi { inherit pname version; - sha256 = "e5fca613978743d41c3bfc68e25a811d646a3b8a9eee9eb07021daca89646a0f"; + sha256 = "1adf1c03d1508749e7c2f26dc9850ec0ef834318d725b7ae5ac91698f5c86752"; }; checkInputs = [ mock psutil ]; diff --git a/nixpkgs/pkgs/development/python-modules/pygame/default.nix b/nixpkgs/pkgs/development/python-modules/pygame/default.nix index 199107022dfe..893b251f7b5e 100644 --- a/nixpkgs/pkgs/development/python-modules/pygame/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygame/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pygame"; - version = "1.9.4"; + version = "1.9.5"; src = fetchPypi { inherit pname version; - sha256 = "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6"; + sha256 = "d15e7238015095a12c19379565a66285e989fdcb3807ec360b27338cd8bdaf05"; }; nativeBuildInputs = [ @@ -25,18 +25,19 @@ buildPythonPackage rec { preConfigure = '' sed \ - -e "s/^origincdirs = .*/origincdirs = []/" \ - -e "s/^origlibdirs = .*/origlibdirs = []/" \ + -e "s/origincdirs = .*/origincdirs = []/" \ + -e "s/origlibdirs = .*/origlibdirs = []/" \ + -e "/'\/lib\/i386-linux-gnu', '\/lib\/x86_64-linux-gnu']/d" \ -e "/\/include\/smpeg/d" \ - -i config_unix.py + -i buildconfig/config_unix.py ${lib.concatMapStrings (dep: '' sed \ - -e "/^origincdirs =/aorigincdirs += ['${lib.getDev dep}/include']" \ - -e "/^origlibdirs =/aoriglibdirs += ['${lib.getLib dep}/lib']" \ - -i config_unix.py + -e "/origincdirs =/a\ origincdirs += ['${lib.getDev dep}/include']" \ + -e "/origlibdirs =/a\ origlibdirs += ['${lib.getLib dep}/lib']" \ + -i buildconfig/config_unix.py '') buildInputs } - LOCALBASE=/ ${python.interpreter} config.py + LOCALBASE=/ ${python.interpreter} buildconfig/config.py ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix b/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix index f452d0599362..18540aca50eb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonApplication, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi , mock, pytest , six }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "PyHamcrest"; version = "1.9.0"; diff --git a/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 86730bc43306..6cfb6367307c 100644 --- a/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.2.2"; + version = "2.2.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "689de29ae747642ab230c6d37be2b969bf75663176658851f456619aacf27492"; + sha256 = "13109caab4972cb6d7395e94ad7189e93e9454f09ededaa6b6784cc5456d41f1"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix index c3f360768d02..8403ec9add7d 100644 --- a/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2019.2.4"; + version = "2019.2.28"; src = fetchPypi { inherit pname version; - sha256 = "0932024a8703236dce861bcadd9568455baa8c70c0f7a1fc52d8ca4b52342091"; + sha256 = "fe4c9b8b16d618fa531a09073d69db6ab02c0c379e672862a41163e39ac91e85"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix b/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix index 42902bc7045a..67318bac9bf8 100644 --- a/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "3.1"; + version = "4.0"; src = fetchPypi { inherit pname version; - sha256 = "00awypv2nbn44cc38q7w747gx1xhj33cygzzl56jn5jd3hdlldn7"; + sha256 = "1yjs208c34p2xsc0r8vbi264ii5hixh546718n06b7v670glqjir"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index 51c6f28564fb..5831665376e2 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.2"; + version = "1.10.4"; src = fetchPypi { inherit pname version; - sha256 = "e70a9bac805284ebe7123fdd412e22a4c1d214603b3a074ac8f1185a0dd7c63e"; + sha256 = "d80ccb8cfa550139b50801591d4ca8a5575334adb493c402fce2312f55d07d66"; }; checkInputs = [ docutils virtualenv webtest zope_component ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index 194e76c4a912..1887020fd0f3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.4"; + version = "0.5.5"; src = fetchPypi { inherit pname version; - sha256 = "0w6z4j8l9898bj214v2mh7vx2g43j1b70ijjvc7q3316fscal469"; + sha256 = "ad679a91d453fe8426c4076d0da3a67265e5ccfe641879d75c9bc7660d075dfa"; }; # requires root priviledges diff --git a/nixpkgs/pkgs/development/python-modules/pyside/tools.nix b/nixpkgs/pkgs/development/python-modules/pyside/tools.nix index e23e63525183..6c2b357c5668 100644 --- a/nixpkgs/pkgs/development/python-modules/pyside/tools.nix +++ b/nixpkgs/pkgs/development/python-modules/pyside/tools.nix @@ -1,29 +1,28 @@ -{ lib, fetchurl, cmake, pyside, qt4, pysideShiboken, buildPythonPackage }: +{ lib, buildPythonPackage, fetchFromGitHub, cmake, qt4, pyside, pysideShiboken }: -# This derivation provides a Python module and should therefore be called via `python-packages.nix`. buildPythonPackage rec { pname = "pyside-tools"; version = "0.2.15"; format = "other"; - src = fetchurl { - url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz"; - sha256 = "0x4z3aq7jgar74gxzwznl3agla9i1dcskw5gh11jnnwwn63ffzwa"; + src = fetchFromGitHub { + owner = "PySide"; + repo = "Tools"; + rev = version; + sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; buildInputs = [ qt4 ]; propagatedBuildInputs = [ pyside pysideShiboken ]; - meta = { - description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; - license = lib.licenses.gpl2; - homepage = http://www.pyside.org; + meta = with lib; { + description = "Development tools (pyside-uic/rcc/lupdate) for PySide, the LGPL-licensed Python bindings for the Qt framework"; + license = licenses.gpl2; + homepage = https://wiki.qt.io/PySide; maintainers = [ ]; - platforms = lib.platforms.all; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix b/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix index 0f915d9a2523..b6068a65fbd3 100644 --- a/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix @@ -3,13 +3,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.0.15.8"; + version = "1.0.16"; pname = "pysmbc"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "07dzxfdqaj6zjg2rxxdww363bh8m02mcvgk47jw005cik9wc2rq5"; + sha256 = "62199b5cca02c05d5f3b9edbc9a864fb8a2cbe47a465c0b9461642eb3b6f5aca"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysmi/default.nix b/nixpkgs/pkgs/development/python-modules/pysmi/default.nix index 723d95b89a57..62c631ac98cc 100644 --- a/nixpkgs/pkgs/development/python-modules/pysmi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysmi/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.3.3"; + version = "0.3.4"; pname = "pysmi"; src = fetchPypi { inherit pname version; - sha256 = "0bzhmi4691rf306n4y82js52532h3fp1sy6phvh6hnms6nww4daf"; + sha256 = "bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c"; }; propagatedBuildInputs = [ ply ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyspark/default.nix b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix index 0eca6c5ddf05..3687f1a33efa 100644 --- a/nixpkgs/pkgs/development/python-modules/pyspark/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1p7z5f1a20l7xkjkh88q9cvjw2x8jbrlydkycn5lh4qvx72vgmy9"; + sha256 = "923cc4075d586074f68b722f5ed029b0d25396828441b5ed421a0e40fe14e749"; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/nixpkgs/pkgs/development/python-modules/pystemd/default.nix b/nixpkgs/pkgs/development/python-modules/pystemd/default.nix index fc269641ecfd..47d6ea7e26b8 100644 --- a/nixpkgs/pkgs/development/python-modules/pystemd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pystemd/default.nix @@ -1,23 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, mock, pytest, six, systemd }: +{ stdenv, python, systemd }: -buildPythonPackage rec { +python.pkgs.buildPythonPackage rec { pname = "pystemd"; - version = "0.5.0"; - src = fetchPypi { + version = "0.6.0"; + src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "000001hxv25vwcsvc0avg42v89c7qcjdpw6dr8419prmcb9186i5"; + sha256 = "054a3ni71paqa1xa786840z3kjixcgyqdbscyq8nfxp3hwn0gz5i"; }; + disabled = !python.pkgs.isPy3k; + buildInputs = [ systemd ]; - propagatedBuildInputs = [ six ]; - checkInputs = [ pytest mock ]; + checkInputs = with python.pkgs; [ pytest mock ]; checkPhase = "pytest tests"; meta = with stdenv.lib; { description = "A thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way."; homepage = https://github.com/facebookincubator/pystemd/; - license = licenses.bsd0; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix b/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix index 4b88a6512105..46d4135d6afb 100644 --- a/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytaglib"; - version = "1.4.4"; + version = "1.4.5"; src = fetchPypi { inherit pname version; - sha256 = "c3458e64cea61a7d4189f26c601e7bfd82053f3c02c2247cb8c430847927ef18"; + sha256 = "8aec64bc146a9f72778a0d2d1f3448f58be6ebea68f64b0ff88ea8e0f4dc5d8f"; }; buildInputs = [ taglib cython ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix index cb5c95aa1aa2..2f82f4d7dbd4 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }: buildPythonPackage rec { version = "0.4.0"; @@ -9,8 +9,19 @@ buildPythonPackage rec { sha256 = "bda0ef48e6a44c091399b12ab4a7e580d2dd8294c222b301f88d7d57f47ba142"; }; + patches = [ + # Fix tests for pytest>=4.2.0. Remove with the next release + (fetchpatch { + url = "https://github.com/RKrahl/pytest-dependency/commit/089395bf77e629ee789666361ee12395d840252c.patch"; + sha256 = "1nkha2gndrr3mx11kx2ipxhphqd6wr25hvkrfwzyrispqfhgl0wm"; + excludes = [ "doc/src/changelog.rst" ]; + }) + ]; + propagatedBuildInputs = [ pytest ]; + checkInputs = [ pytest ]; + checkPhase = '' pytest ''; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix index 4fd0570a50dc..f07ba9b43f7f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.10.2"; + version = "1.10.3"; src = fetchPypi { inherit pname version; - sha256 = "cbec53e7cb0f2b57275220cb4f2822093ac89e486095555105ffe1a4e2f11df4"; + sha256 = "330bfa1a71c9b6e84e2976f01d70d8a174f755e7f9dc5b22f4b7335992e1e98b"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix index 53e1fce493d1..c03590f8de88 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0ndwjsad901km7zw8xxj3igjff651hg1pjcmv5vqx458xhnmbfqw"; + sha256 = "0jv7jhq6ddhsmnz67vc76r4kwac9k5a142968zppyw9av6qalbl4"; }; # package has no tests diff --git a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix index 48dbc9b710a7..47e269c2ff50 100644 --- a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.21.0"; + version = "1.22.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47"; + sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix b/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix index 8dfea69a2334..0141141b43c4 100644 --- a/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.1.10"; + version = "0.1.11"; pname = "python-json-logger"; src = fetchPypi { inherit pname version; - sha256 = "cf2caaf34bd2eff394915b6242de4d0245de79971712439380ece6f149748cde"; + sha256 = "b7a31162f2a01965a5efb94453ce69230ed208468b0bbc7fdfc56e6d8df2e281"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix index fd84c587bdc0..d3ab69ac9570 100644 --- a/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-snappy"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "8a7f803f06083d4106d55387d2daa32c12b5e376c3616b0e2da8b8a87a27d74a"; + sha256 = "d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2"; }; buildInputs = [ snappy ]; diff --git a/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix b/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix index 981629d85c24..ae3f0ba933a7 100644 --- a/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python_openzwave"; - version = "0.4.18"; + version = "0.4.19"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f7b6b4e34e2a64d0a0bd0556f5560ca6914ca72428c3fe5ac8c7f08b31335f3e"; + sha256 = "6b40c7711383eeb3535cf5504f1cf47cc1ac7018eb820f299642a5a2795aef84"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix b/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix new file mode 100644 index 000000000000..b3a9cfe82ee4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix @@ -0,0 +1,37 @@ +{ stdenv, python, fetchFromGitHub, cmake, swig, ninja, + opencascade, smesh, freetype, libGL, libGLU, libX11 }: + +stdenv.mkDerivation rec { + pname = "pythonocc-core"; + version = "0.18.1"; + + src = fetchFromGitHub { + owner = "tpaviot"; + repo = "pythonocc-core"; + rev = version; + sha256 = "1jk4y7f75z9lyawffpfkr50qw5452xzi1imcdlw9pdvf4i0y86k3"; + }; + + nativeBuildInputs = [ cmake swig ninja ]; + buildInputs = [ + python opencascade smesh + freetype libGL libGLU libX11 + ]; + + cmakeFlags = [ + "-Wno-dev" + "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" + + "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh" + "-DSMESH_LIB_PATH=${smesh}/lib" + "-DPYTHONOCC_WRAP_SMESH=TRUE" + ]; + + meta = with stdenv.lib; { + description = "Python wrapper for the OpenCASCADE 3D modeling kernel"; + homepage = "https://github.com/tpaviot/pythonocc-core"; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index 7c45659220cb..f14200b3542b 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix @@ -81,11 +81,11 @@ in buildPythonPackage rec { cmake utillinux which - ]; + ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; buildInputs = [ numpy.blas - ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn ] + ] ++ lib.optionals cudaSupport [ cudnn ] ++ lib.optionals stdenv.isLinux [ numactl ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix b/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix index 5bd6722939b6..422e28960822 100644 --- a/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "045bjs8na3q0fy8zzq4pghyz05d9aid1lcv11992f62z2jrf6m2q"; + sha256 = "c1722a496b08eb20ae3f2fedcc1ebcd207567b62e6453c7198a0b8f78ae96049"; }; propagatedBuildInputs = [ param ]; diff --git a/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix b/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix index b085a3db3b9f..bbd02d8daafa 100644 --- a/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "PyWavelets"; - version = "1.0.1"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "3c5cece36d4e17d395be6e9ac6b80ce7b774a1f71c251756c6163e63b6d878dc"; + sha256 = "a12c7a6258c0015d2c75d88b87393ee015494551f049009e8b63eafed2d78efc"; }; checkInputs = [ nose pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/rednose/default.nix b/nixpkgs/pkgs/development/python-modules/rednose/default.nix index 8257ca87dd99..fa142cf87236 100644 --- a/nixpkgs/pkgs/development/python-modules/rednose/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rednose/default.nix @@ -13,9 +13,9 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0" ''; - # Do not test on Python 2 darwin because the tests suite gets stuck - # https://github.com/JBKahn/rednose/issues/23 - doCheck = !(stdenv.isDarwin && isPy27); + # Do not test on Python 2 because the tests suite gets stuck + # https://github.com/NixOS/nixpkgs/issues/60786 + doCheck = !(isPy27); checkInputs = [ six ]; propagatedBuildInputs = [ nose colorama termstyle ]; diff --git a/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/nixpkgs/pkgs/development/python-modules/reportlab/default.nix index edb9b062f38d..08800552607c 100644 --- a/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.13"; + version = "3.5.20"; src = fetchPypi { inherit pname version; - sha256 = "6116e750f98018febc08dfee6df20446cf954adbcfa378d2c703d56c8864aff3"; + sha256 = "06l7jfax1izvbddmmjw9xpyb7iy4n99v3chyv75d9djaklnqs93v"; }; checkInputs = [ glibcLocales ]; @@ -26,6 +26,7 @@ in buildPythonPackage rec { # Remove all the test files that require access to the internet to pass. rm tests/test_lib_utils.py rm tests/test_platypus_general.py + rm tests/test_platypus_images.py # Remove the tests that require Vera fonts installed rm tests/test_graphics_render.py diff --git a/nixpkgs/pkgs/development/python-modules/responses/default.nix b/nixpkgs/pkgs/development/python-modules/responses/default.nix index e69e7d8b84da..d154499c03bf 100644 --- a/nixpkgs/pkgs/development/python-modules/responses/default.nix +++ b/nixpkgs/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.10.5"; + version = "0.10.6"; src = fetchPypi { inherit pname version; - sha256 = "c85882d2dc608ce6b5713a4e1534120f4a0dc6ec79d1366570d2b0c909a50c87"; + sha256 = "502d9c0c8008439cfcdef7e251f507fcfdd503b56e8c0c87c3c3e3393953f790"; }; propagatedBuildInputs = [ cookies mock requests six ]; diff --git a/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix index 4ffb182626c3..bc36e5cba80a 100644 --- a/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "rfc3986"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1qf4dyxvjs7mxrxc0gr7gzyn4iflb2wgq01r5pzrxac8rnvy8fmw"; + sha256 = "1jprl2zm3pw2rfbda9rhg3v5bm8q36b8c9i4k8znimlf1mv8bcic"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/ropper/default.nix b/nixpkgs/pkgs/development/python-modules/ropper/default.nix index 527063d02f90..08c8547edbd9 100644 --- a/nixpkgs/pkgs/development/python-modules/ropper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ropper/default.nix @@ -8,11 +8,11 @@ buildPythonApplication rec { pname = "ropper"; - version = "1.11.10"; + version = "1.11.13"; src = fetchPypi { inherit pname version; - sha256 = "b8d1439d8a6ef7b93718472b0288ee88a5953723046772f035fe989b1c1e5d6e"; + sha256 = "245c6a1c8b294209bed039cd6a389f1e298d3fe6783d48ad9c6b2df3a41f51ee"; }; # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise # workaround: sudo chmod 777 /dev/shm diff --git a/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix index 7b14d337f342..eadebc05c778 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.15.88"; + version = "0.15.92"; src = fetchPypi { inherit pname version; - sha256 = "ac56193c47a31c9efa151064a9e921865cdad0f7a991d229e7197e12fe8e0cd7"; + sha256 = "c6d05e38a141922eca7902135e7a40b605763d6da8ec6624517370631ce9fb6d"; }; # Tests cannot load the module to test diff --git a/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix b/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix index 5ec207c55950..454066c1c163 100644 --- a/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.20.2"; + version = "0.20.3"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "1ri9kx0yrn85h6ivkaja35afbyhimxn8lsairgns2wi5xv3wfnxw"; + sha256 = "c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41"; }; buildInputs = [ pillow gfortran glibcLocales ]; diff --git a/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix b/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix index 7342a729e292..2f7acce976de 100644 --- a/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { + broken = cornice.version != "0.17"; description = "The SyncServer server software, as used by Firefox Sync"; homepage = https://github.com/mozilla-services/server-syncstorage; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix index 7548f96a88e4..d4573a2bc431 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "40.8.0"; + version = "41.0.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d"; + sha256 = "79d30254b6fe7a8e672e43cd85f13a9f3f2a50080bc81d851143e2219ef0dcb1"; }; nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ]; diff --git a/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/nixpkgs/pkgs/development/python-modules/sopel/default.nix index 5b67fcb09641..f4e699adcc88 100644 --- a/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sopel"; - version = "6.6.3"; + version = "6.6.6"; src = fetchPypi { inherit pname version; - sha256 = "aa9a52da9cf33c1d5f6b9b8513d31a339d8cbef9a288487b251538949a4faae1"; + sha256 = "dfb6d6c349cbdd463736e4be781cc005efeb1be91dbdc60cc76fda7cad142def"; }; buildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 275e924e4113..a39593bb9e78 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -31,7 +31,8 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.py \ --replace "regex==" "regex>=" \ - --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \ + --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.32.0" ''; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-testing/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-testing/default.nix index 4b110f3ec187..8f9539705556 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinx-testing"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "2a421b42b2dae8ecad2b4c9d3953f9970e5a9c07bb2c66626338157435e5708c"; + sha256 = "ef661775b5722d7b00f67fc229104317d35637a4fb4434bf2c005afdf1da4d09"; }; checkInputs = [ mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index a67787f69336..f528edb75ab3 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "44a9445b237ade895ae1fccbe6f41422489b1ffb2a026c1b78b0c1c1c229f9bf"; + sha256 = "7bcbaabef7aa9c176b81d960b20d0f67817ccea5e098968c366d2db4ad76d476"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ]; diff --git a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 53c6ae8cdba0..d7a7d45785ee 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.3.2"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "1010623c4c31413fdfdd8b3fe194ab95dfabde1081f3c707d1b2eb56b044a7da"; + sha256 = "894584fdb8d0e25e9f9ac0da20058e23c27d5ca55904cc0326e1a84101beef32"; }; # No tests in archive diff --git a/nixpkgs/pkgs/development/python-modules/sseclient/default.nix b/nixpkgs/pkgs/development/python-modules/sseclient/default.nix index 484f4c7b17c8..a911cd239485 100644 --- a/nixpkgs/pkgs/development/python-modules/sseclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sseclient/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "sseclient"; - version = "0.0.22"; + version = "0.0.23"; src = fetchPypi { inherit pname version; - sha256 = "bf1eab60b09edbaa51e42f65a18b715367d55cfdf57c1f162886bac97bb5c6fb"; + sha256 = "82a1d281b2bcb98847882069bde57a6772156f9539ddefbb78fea4f915197ec3"; }; propagatedBuildInputs = [ requests six ]; diff --git a/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/nixpkgs/pkgs/development/python-modules/tempora/default.nix index 6ffe5a73eb4a..861054ed948f 100644 --- a/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "1.14"; + version = "1.14.1"; src = fetchPypi { inherit pname version; - sha256 = "4951da790bd369f718dbe2287adbdc289dc2575a09278e77fad6131bcfe93097"; + sha256 = "cb60b1d2b1664104e307f8e5269d7f4acdb077c82e35cd57246ae14a3427d2d6"; }; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index 8163243eb0a4..a8f902fdb38f 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -8,9 +8,9 @@ , xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? false -, avx2Support ? false -, fmaSupport ? false +, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] +, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] }: assert cudaSupport -> nvidia_x11 != null diff --git a/nixpkgs/pkgs/development/python-modules/terminado/default.nix b/nixpkgs/pkgs/development/python-modules/terminado/default.nix index 7ebd2f1c967a..bebe8c3d1f8e 100644 --- a/nixpkgs/pkgs/development/python-modules/terminado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.8.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "0yh69k6579g848rmjyllb5h75pkvgcy27r1l3yzgkf33wnnzkasm"; + sha256 = "de08e141f83c3a0798b050ecb097ab6259c3f0331b2f7b7750c9075ced2c20c2"; }; propagatedBuildInputs = [ ptyprocess tornado ]; diff --git a/nixpkgs/pkgs/development/python-modules/textacy/default.nix b/nixpkgs/pkgs/development/python-modules/textacy/default.nix index 4272df1ce398..05121f2b9b28 100644 --- a/nixpkgs/pkgs/development/python-modules/textacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/textacy/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "textacy"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "6019f32719c0661f41fa93c2fdd9714504d443119bf4f6426ee690bdda90835b"; + sha256 = "50402545ac92b1a931c2365e341cb35c4ebe5575525f1dcc5265901ff3895a5f"; }; disabled = isPy27; # 2.7 requires backports.csv diff --git a/nixpkgs/pkgs/development/python-modules/thespian/default.nix b/nixpkgs/pkgs/development/python-modules/thespian/default.nix index af3d24899c77..cd4a30f656ae 100644 --- a/nixpkgs/pkgs/development/python-modules/thespian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.7"; + version = "3.9.9"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fc968325894f812098f4fde4341c1734050bb1b742d8decf62ae9704c761f577"; + sha256 = "c89e1973465feb88b694f3884d24723932a6b0e4df8d909f61e44ff371af7380"; }; # Do not run the test suite: it takes a long time and uses diff --git a/nixpkgs/pkgs/development/python-modules/trustme/default.nix b/nixpkgs/pkgs/development/python-modules/trustme/default.nix index d870b622b8a9..27831a0359c3 100644 --- a/nixpkgs/pkgs/development/python-modules/trustme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trustme/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "89b8d689013afeaa34b63e77f6d60eebad63edc4b247e744c7d6d891ed13a564"; + sha256 = "8d12837c6242afe1660dee08d44d96f40c9a5074cc58caf39f8c8fdf4b526529"; }; checkInputs = [ pytest pyopenssl service-identity ]; diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 9c20226fea05..f8fbf8e49f4a 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.26.1"; + version = "6.26.2"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1ly22ah487jkq0my1l3c6hbx24fgganjhxrlrcw5jfc80qmgd3hd"; + sha256 = "0z0ahbckh5calwgkmd493znixclhjjrly8jfymhwlw6g0g79kavw"; }; buildInputs = [ nose mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix index ed177fc63f85..d562eac5cc7d 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.collections"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "c27f11612572f614cadf181cc65bcd0275d8b08f182bcb4ea1b74cd662625f21"; + sha256 = "ede4caff74928156f7ff38dac9b0811893de41966c39cd5b2fdea53418349ca8"; }; propagatedBuildInputs = [ twitter-common-lang ]; diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix index 393bc0ac4e8b..1253b8077e75 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.confluence"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "8285cab3d31e4065a13575c1920101db4df0f36a59babcc225775e4fae91c0a1"; + sha256 = "323dde2c519f85020569d7a343432f3aac16bce6ebe5e34774dbde557296697c"; }; propagatedBuildInputs = [ twitter-common-log ]; diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix index 5d8a3e76fcac..df2f614c5a04 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.dirutil"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "748b471bb2dd78f14e39d796cb01407aa8b61dda95808543404d5da50385efaf"; + sha256 = "49aeecad2434ac23c16abbfc1fccffd3790c056a9eb01468ec26c83e65a10119"; }; propagatedBuildInputs = [ twitter-common-lang ]; diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix index 53135a94d628..59f6d74ad67a 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "twitter.common.lang"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "9cd2d05a7f45c50c76c99024b3cad180bec42b0c65dfdc1f8ddc731bdd3b3af8"; + sha256 = "6e967ca2b5bb96ea749d21052f45b18e37deb5cc160eb12c64a8f1cb9dba7a22"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix index 0fa7b63f5256..1c3d1808f5dd 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "twitter.common.log"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "81af4b0f51f3fb589f39b410d7031da6792e0ae650a45e9207a25a52a343a555"; + sha256 = "7160a864eed30044705e05b816077dd193aec0c66f50ef1c077b7f8490e0d06a"; }; propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ]; diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix index 62705f3b6b11..12e55a46ab8e 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "twitter.common.options"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "9eeaf078462afdfa5ba237727c908a8b3b8b28d172838dbe58d3addf722da6c8"; + sha256 = "a495bcdffc410039bc4166f1a30c2caa3c92769d7a161a4a39d3651836dd27e1"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix b/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix index aed68f3ad59d..144f9299c6eb 100644 --- a/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "7ff18ae3721fa75571f9329c08f7c0120416a6ae36194bd8674f65b3b78d0702"; + sha256 = "6c02a0654a5e11f8fad532ed634109ed49cdc929f7b972848773e4e0ce52f30c"; }; LC_ALL="en_US.UTF-8"; diff --git a/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix b/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix index c7edfd95ae08..6996b9bcda3a 100644 --- a/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.2.5"; + version = "3.2.6"; src = fetchPypi { inherit pname version; - sha256 = "1z4489grxc06pxmfy63b6x6h54p05fhbigvrrgr1kvdciy2nvz04"; + sha256 = "3a40f4f4b8b02a8687bd98c598980bed38a4770e3de253847eafed4b7167d07f"; }; checkInputs = [ nose pytest hypothesis six ]; diff --git a/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix b/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix index c6cfdacf6eeb..c61b38f5d38e 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.4.4"; + version = "0.4.7"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "004q7lywhhdvsmds88cfpjvkj89nf8n9d4gyrbvvj3x0gw7iiljq"; + sha256 = "4a00d1db828c44d2ba35801aeff7d1ea890b7dfa337895395e3b06284c14857b"; }; propagatedBuildInputs = [ numpy awkward ]; diff --git a/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/nixpkgs/pkgs/development/python-modules/uproot/default.nix index fdb465202beb..59fc3517bfbf 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.4.6"; + version = "3.4.19"; src = fetchPypi { inherit pname version; - sha256 = "1fafe476c26252e4dbd399456323778e76d23dc2f43cf6581a707d1647978610"; + sha256 = "1df24d1f193b044cc4d6ef98e183a853655b568b7b15173d88b0d2a79e1226da"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/vega/default.nix b/nixpkgs/pkgs/development/python-modules/vega/default.nix index 25acc4f88bce..adbcf539494a 100644 --- a/nixpkgs/pkgs/development/python-modules/vega/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vega/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vega"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "097jlh1xarnqmcnym5jkfa6rg2f0i6b17v9pck2242axgyi692rm"; + sha256 = "0lshwsvi242m0ybrqjvbag73x1mrb31w2jq3lnklqyzry153xfdb"; }; buildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix index 9e917e35ab07..b1ce764c4ac4 100644 --- a/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.5.1"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "217bd3f0880c9f85672c0bcc9ad9e0354ab7dfa89c2f117e63aa878b4279f5bf"; + sha256 = "c88ae171a11b087ea2513f260cdac9232461d8e9369bcd1dc143fc399d220557"; }; buildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index d26b7b4f50aa..bad23341df72 100644 --- a/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "16.4.1"; + version = "16.4.3"; src = fetchPypi { inherit pname version; - sha256 = "5a3ecdfbde67a4a3b3111301c4d64a5b71cf862c8c42958d30cf3253df1f29dd"; + sha256 = "984d7e607b0a5d1329425dd8845bd971b957424b5ba664729fab51ab8c11bc39"; }; # Doubt this is needed - FRidh 2017-07-07 diff --git a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index d0397d61605f..9b5e3f9ca5f9 100644 --- a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "Werkzeug"; - version = "0.15.1"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "ca5c2dcd367d6c0df87185b9082929d255358f5391923269335782b213d52655"; + sha256 = "0a73e8bb2ff2feecfc5d56e6f458f5b99290ef34f565ffb2665801ff7de6af7a"; }; propagatedBuildInputs = [ itsdangerous ]; diff --git a/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix b/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix new file mode 100644 index 000000000000..19b7c42558ec --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix @@ -0,0 +1,37 @@ +{ 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/xarray/default.nix b/nixpkgs/pkgs/development/python-modules/xarray/default.nix index cf5243296613..d547d4a15d1b 100644 --- a/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -5,27 +5,30 @@ , numpy , pandas , python +, isPy3k }: buildPythonPackage rec { pname = "xarray"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1wspvvp8hh9ar7pl6w1qhmakajsjsg4cm11pmi4a422jqmid0vw5"; + sha256 = "ac09a819e791be208ae33fa7ecee19d0fe7b5479906f927d358a61957ce27e10"; }; checkInputs = [ pytest ]; propagatedBuildInputs = [numpy pandas]; checkPhase = '' - py.test $out/${python.sitePackages} + pytest $out/${python.sitePackages} ''; # There always seem to be broken tests... doCheck = false; + disabled = !isPy3k; + meta = { description = "N-D labeled arrays and datasets in Python"; homepage = https://github.com/pydata/xarray; diff --git a/nixpkgs/pkgs/development/python-modules/xdis/default.nix b/nixpkgs/pkgs/development/python-modules/xdis/default.nix index df0ad509e291..c5837e5da539 100644 --- a/nixpkgs/pkgs/development/python-modules/xdis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xdis/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "xdis"; - version = "3.8.9"; + version = "3.8.10"; src = fetchPypi { inherit pname version; - sha256 = "1q2dg3hnsmmpjcc7lzjf5nd041mpbwa2bq3dgr4p6wv65vncny9v"; + sha256 = "b00f37296edf2a4fe7b67b5d861c342426d442666d241674fdfc333936bd59bf"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix index 15be28b62fb7..5faf56b7eba7 100644 --- a/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xlsx2csv"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "1f44k1q9jhn2iwabpj663l5wmm7zh6bp5402p659pxf11m8y4c2x"; + sha256 = "ff4121d42d318f31f71b248f37acfc21455a7d897a3c117b578744c89bc34f6c"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/zeep/default.nix b/nixpkgs/pkgs/development/python-modules/zeep/default.nix index 0513183d484c..be0be44af555 100644 --- a/nixpkgs/pkgs/development/python-modules/zeep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeep/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "zeep"; - version = "3.3.0"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "144dk7gw93l4amrwmp5vzxxkcjsgkx6fjqzvsawx2iap23j605j9"; + sha256 = "f58328e36264a2fda2484dd20bb1695f4102a9cc918178d60c4d7cf8339c65d0"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zetup/default.nix b/nixpkgs/pkgs/development/python-modules/zetup/default.nix index abbc4a974f0b..89e9e9691401 100644 --- a/nixpkgs/pkgs/development/python-modules/zetup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zetup/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "zetup"; - version = "0.2.45"; + version = "0.2.48"; src = fetchPypi { inherit pname version; - sha256 = "f1cde33d0ef3bedaf697e432201fa86da698dadd3445c0efd2a114753853c675"; + sha256 = "41af61e8e103656ee633f89ff67d6a94848b9b9a836d351bb813b87a139a7c46"; }; # Python 3.7 compatibility diff --git a/nixpkgs/pkgs/development/python-modules/zict/default.nix b/nixpkgs/pkgs/development/python-modules/zict/default.nix index bfc5caea4d07..81e5d0fbc815 100644 --- a/nixpkgs/pkgs/development/python-modules/zict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zict/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zict"; - version = "0.1.3"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - sha256 = "63377f063086fc92e5c16e4d02162c571f6470b9e796cf3411ef9e815c96b799"; + sha256 = "a7838b2f21bc06b7e3db5c64ffa6642255a5f7c01841660b3388a9840e101f99"; }; buildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix index a269e7195644..d1b8e87aaebe 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix @@ -59,6 +59,4 @@ in find -L ${basicEnv}/${ruby.gemPath}/gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; done ''} - - ${postBuild} '' diff --git a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 53506ffe8da8..41fcc336c135 100644 --- a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips, taglib, libopus +, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , libselinux ? null, libsepol ? null }@args: @@ -79,6 +79,11 @@ in buildInputs = [ which icu zlib ]; }; + cld3 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ protobuf ]; + }; + curb = attrs: { buildInputs = [ curl ]; }; @@ -174,9 +179,17 @@ in gtk2 = attrs: { nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ]; - buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; + buildInputs = [ + fribidi + gobject-introspection + gtk2 + harfbuzz + pcre + xorg.libpthreadstubs + xorg.libXdmcp + ]; # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly - CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; + # CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; }; gobject-introspection = attrs: { @@ -201,6 +214,10 @@ in buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; + idn-ruby = attrs: { + buildInputs = [ libidn ]; + }; + # disable bundle install as it can't install anything in addition to what is # specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R # to compensate for read-only files in site_template in nix store. @@ -290,7 +307,15 @@ in pango = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ]; + buildInputs = [ + fribidi + gobject-introspection + gtk2 + harfbuzz + pcre + xorg.libpthreadstubs + xorg.libXdmcp + ]; }; patron = attrs: { @@ -340,6 +365,10 @@ in buildInputs = [ imagemagick which ]; }; + rpam2 = attrs: { + buildInputs = [ linux-pam ]; + }; + ruby-libvirt = attrs: { buildInputs = [ libvirt pkgconfig ]; buildFlags = [ @@ -377,7 +406,7 @@ in rugged = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake openssl libssh2 zlib ]; + buildInputs = [ which cmake openssl libssh2 zlib ]; dontUseCmakeConfigure = true; }; @@ -415,6 +444,7 @@ in sup = attrs: { dontBuild = false; # prevent sup from trying to dynamically install `xapian-ruby`. + nativeBuildInputs = [ rake ]; postPatch = '' cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb @@ -484,7 +514,7 @@ in xapian-ruby = attrs: { # use the system xapian dontBuild = false; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ rake pkgconfig ]; buildInputs = [ xapian_1_2_22 zlib ]; postPatch = '' cp ${./xapian-Rakefile} Rakefile diff --git a/nixpkgs/pkgs/development/ruby-modules/gem-config/xapian-Rakefile b/nixpkgs/pkgs/development/ruby-modules/gem-config/xapian-Rakefile index 9f0b8e72f08c..54412ff810b0 100644 --- a/nixpkgs/pkgs/development/ruby-modules/gem-config/xapian-Rakefile +++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/xapian-Rakefile @@ -4,35 +4,30 @@ require 'rbconfig' c = RbConfig::CONFIG -def system!(cmd) - puts cmd - system(cmd) or raise -end - source_dir = 'xapian_source' bindings = Dir["#{source_dir}/xapian-bindings-*"].first bindings = File.basename(bindings, ".tar.xz") task :default do - system! "tar -xJf #{source_dir}/#{bindings}.tar.xz" + sh "tar -xJf #{source_dir}/#{bindings}.tar.xz" prefix = Dir.pwd ENV['LDFLAGS'] = "-L#{prefix}/lib" - system! "mkdir -p lib" + sh "mkdir -p lib" Dir.chdir bindings do ENV['RUBY'] ||= "#{c['bindir']}/#{c['RUBY_INSTALL_NAME']}" - system! "./configure --prefix=#{prefix} --exec-prefix=#{prefix} --with-ruby" - system! "make clean all" + sh "./configure --prefix=#{prefix} --exec-prefix=#{prefix} --with-ruby" + sh "make clean all" end - system! "cp -r #{bindings}/ruby/.libs/_xapian.* lib" - system! "cp #{bindings}/ruby/xapian.rb lib" + sh "cp -r #{bindings}/ruby/.libs/_xapian.* lib" + sh "cp #{bindings}/ruby/xapian.rb lib" - system! "rm lib/*.la" - system! "rm lib/*.lai" + sh "rm lib/*.la" + sh "rm lib/*.lai" - system! "rm -R #{bindings}" - system! "rm -R #{source_dir}" + sh "rm -R #{bindings}" + sh "rm -R #{source_dir}" end diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock index a936dd25d925..121c01f72af5 100644 --- a/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -2,32 +2,32 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.0) - eventmachine (1.2.7) + backport (1.0.0) htmlentities (4.3.4) - jaro_winkler (1.5.1) + jaro_winkler (1.5.2) kramdown (1.17.0) - mini_portile2 (2.3.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - parallel (1.12.1) - parser (2.5.3.0) + mini_portile2 (2.4.0) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + parallel (1.17.0) + parser (2.6.3.0) ast (~> 2.4.0) - powerpack (0.1.2) rainbow (3.0.0) reverse_markdown (1.1.0) nokogiri - rubocop (0.60.0) + rubocop (0.68.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) + unicode-display_width (>= 1.4.0, < 1.6) ruby-progressbar (1.10.0) - solargraph (0.29.1) - eventmachine (~> 1.2, >= 1.2.5) + solargraph (0.32.1) + backport (~> 1.0) + bundler (>= 1.17.2) htmlentities (~> 4.3, >= 4.3.4) + jaro_winkler (~> 1.5) kramdown (~> 1.16) parser (~> 2.3) reverse_markdown (~> 1.0, >= 1.0.5) @@ -37,8 +37,8 @@ GEM yard (~> 0.9) thor (0.20.3) tilt (2.0.9) - unicode-display_width (1.4.0) - yard (0.9.16) + unicode-display_width (1.5.0) + yard (0.9.19) PLATFORMS ruby @@ -47,4 +47,4 @@ DEPENDENCIES solargraph! BUNDLED WITH - 1.17.1 + 1.17.2 diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix b/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix index bfb5496444af..75bb266246ac 100644 --- a/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -1,5 +1,7 @@ { ast = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; @@ -7,15 +9,19 @@ }; version = "2.4.0"; }; - eventmachine = { + backport = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + sha256 = "00kwxnj4jwjkf5ji473qsz0nq4kjsx6p6hzlm8iwbbylv22hf2xy"; type = "gem"; }; - version = "1.2.7"; + version = "1.0.0"; }; htmlentities = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; @@ -24,14 +30,18 @@ version = "4.3.4"; }; jaro_winkler = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rr797nqz081bfk30m2apj5h24bg5d1jr1c8p3xwx4hbwsrbclah"; + sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.2"; }; kramdown = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; @@ -40,48 +50,50 @@ version = "1.17.0"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.3"; }; parallel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; type = "gem"; }; - version = "1.12.1"; + version = "1.17.0"; }; parser = { dependencies = ["ast"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f"; - type = "gem"; - }; - version = "2.5.3.0"; - }; - powerpack = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv"; + sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn"; type = "gem"; }; - version = "0.1.2"; + version = "2.6.3.0"; }; rainbow = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; @@ -91,6 +103,8 @@ }; reverse_markdown = { dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg"; @@ -99,15 +113,19 @@ version = "1.1.0"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ivk049z3mp12nc6v1wn35bsq1g7nz1i2r4xwzqf0v25hm2v7n1i"; + sha256 = "171bczfafdmyz1lj6mgz2wdzz8i42w10zw2wj5j13y2f6hp687ca"; type = "gem"; }; - version = "0.60.0"; + version = "0.68.0"; }; ruby-progressbar = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; @@ -116,15 +134,19 @@ version = "1.10.0"; }; solargraph = { - dependencies = ["eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + dependencies = ["backport" "htmlentities" "jaro_winkler" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12sy1rdz2fk3aba43701qp1250xm8w26rlizypd6h5rnmmqm5q54"; + sha256 = "1bsv0x9hhxwki7v8x99wzxcl1spgwrsxqd6alpb2y0wf9lsakabl"; type = "gem"; }; - version = "0.29.1"; + version = "0.32.1"; }; thor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; @@ -133,6 +155,8 @@ version = "0.20.3"; }; tilt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; @@ -141,19 +165,23 @@ version = "2.0.9"; }; unicode-display_width = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57"; + sha256 = "1ssnc6rja9ii97z7m35y4zd0rd7cpv3bija20l7cpd7y4jyyx44q"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; yard = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67"; + sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v"; type = "gem"; }; - version = "0.9.16"; + version = "0.9.19"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix index c30c3555100a..a8b8a965256f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix @@ -3,12 +3,12 @@ with python3Packages; buildPythonApplication rec { pname = "autoflake"; - version = "1.2"; + version = "1.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "c103e63466f11db3617167a2c68ff6a0cda35b940222920631c6eeec6b67e807"; + sha256 = "0wzrvrn6279fijg8jkqbs6313f7b5ll5d22pk5s0fc1fp2wyanbb"; }; propagatedBuildInputs = [ pyflakes ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index be81673f2128..eee347f52669 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.19"; + version = "8.20"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "107x4ij99igq54f0mdqvv8adl2rh694b8ylf3jz090raqa0d2nyk"; + sha256 = "1vsszdmdpyjdwlc9qqw4m8s6rw3pkdrczrmlmydwqmzvzr559nyp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 5e3b001b6a08..8ab655bc4bd3 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.97.0"; + version = "0.98.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1y6mdm7ph9k3vv8n8hzxr3rqa6bfkh4yn9bcxb7qq67v08dlvx6r"; + sha256 = "13ry3bmgm3xy24kasx843dwd1nsv7nyd174696iaz2c64z46bbfm"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index ab00573965e8..5294bb46f18d 100644 --- a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.13.0"; + version = "6.14.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "1g8ds38zwprjswm71y7l10l15rbh2s6ha9xpp20wjy823q9agbpq"; + sha256 = "0k40l93fxakms9vm641d4vlb68gfhkblrm24sb7slzvhq2v832dj"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/nixpkgs/pkgs/development/tools/bazelisk/default.nix index 86748b716e6e..3b4869636399 100644 --- a/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "philwo"; repo = pname; rev = "v${version}"; - sha256 = "1rkpw9izpav3ysb9fpbdf0m1wqrs3vl87s9zjjmfsjm5dfhxss72"; + sha256 = "1hi4jmkqy1fjn91q72qlfvm63plz5jqb4hw4c1qv9ddqjgwrmxr3"; }; modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix index d4e5c5a38dcd..832e8e351645 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildPhase = '' ant - ./bin/buck build -c buck.release_version=${version} buck + PYTHONDONTWRITEBYTECODE=true ./bin/buck build -c buck.release_version=${version} buck ''; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/drake/Gemfile.lock b/nixpkgs/pkgs/development/tools/build-managers/drake/Gemfile.lock index cf8900a30eed..52060a0e6254 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/drake/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/build-managers/drake/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES drake BUNDLED WITH - 1.13.7 + 1.17.2 diff --git a/nixpkgs/pkgs/development/tools/build-managers/drake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/drake/default.nix index 15a88b1fc312..a7bb93d52ed1 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/drake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/drake/default.nix @@ -1,18 +1,15 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv { - name = "drake-0.9.2.0.3.1"; +bundlerApp { + pname = "drake"; + gemdir = ./.; + exes = [ "drake" ]; - inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - meta = with lib; { description = "A branch of Rake supporting automatic parallelizing of tasks"; homepage = http://quix.github.io/rake/; + maintainers = with maintainers; [ romildo manveru ]; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ romildo ]; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix b/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix index fd5a6f06a2a8..061ed5d973ab 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix @@ -1,5 +1,7 @@ { comp_tree = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0dj9lkfxcczn67l1j12dcxswrfxxd1zgxa344zk6vqs2gwwhy9m9"; @@ -8,6 +10,9 @@ version = "1.1.3"; }; drake = { + dependencies = ["comp_tree"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "09gkmdshwdmdnkdxi03dv4rk1dip0wdv6dx14wscrmi0jyk86yag"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix index 3c5a485e36fc..196a5d2a7fc9 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "qbs-${version}"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "0spkkq7nmh27rbx61p23fzkxffx3qdhjqw95pqgsbc76xczd45sv"; + sha256 = "12zzbhddsgfxyzglknvim0bb7rrnifawnx18g35g1105ybfak607"; }; nativeBuildInputs = [ qmake ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile.lock b/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile.lock index 6f6bcc41f9b3..992a0bc8929f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - rake (12.3.1) + rake (12.3.2) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES rake BUNDLED WITH - 1.17.1 + 1.17.2 diff --git a/nixpkgs/pkgs/development/tools/build-managers/rake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rake/default.nix index f23edfd5f63f..8de0130d31bd 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rake/default.nix @@ -1,15 +1,15 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv { - name = "rake-${(import ./gemset.nix).rake.version}"; - - inherit ruby; +bundlerApp { + pname = "rake"; gemdir = ./.; + exes = [ "rake" ]; meta = with lib; { description = "A software task management and build automation tool"; homepage = https://github.com/ruby/rake; license = with licenses; mit; + maintainers = with maintainers; [ manveru ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix b/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix index c1a3a511b22d..05a59cff850f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix @@ -1,10 +1,12 @@ { rake = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg"; + sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; type = "gem"; }; - version = "12.3.1"; + version = "12.3.2"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index ad4cbeda0f85..60b6fd1953ed 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, +{ stdenv, fetchFromGitHub, fetchHex, erlang, tree, hexRegistrySnapshot }: let - version = "3.9.1"; + version = "3.10.0"; bootstrapper = ./rebar3-nix-bootstrap; @@ -65,17 +65,19 @@ let parse_trans = fetchHex { pkg = "parse_trans"; version = "3.3.0"; - sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"; + sha256 = "0q5r871bzx1a8fa06yyxdi3xkkp7v5yqazzah03d6yl3vsmn7vqp"; }; in -stdenv.mkDerivation { - name = "rebar3-${version}"; +stdenv.mkDerivation rec { + pname = "rebar3"; inherit version erlang; - src = fetchurl { - url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "1n6287av29ws3bvjxxmw8s2j8avwich4ccisnnrnypfbm1khlcxp"; + src = fetchFromGitHub { + owner = "rebar"; + repo = pname; + rev = version; + sha256 = "1p34kfkrdmsixg95ad76rifjwfh484vp688lxsjaxg0kf2xjr2d2"; }; inherit bootstrapper; @@ -121,7 +123,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/rebar/rebar3; - description = "rebar 3 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; + description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; longDescription = '' rebar is a self-contained Erlang script, so it's easy to distribute or 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 74e30aa0e6dd..e0cfe59b0516 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 = "a9f2e2592d069313329971930d1740943d19ef91"; - version = "2019-01-30"; + rev = "a47a965e00ecd66793832e2a12a1972d25e6f734"; + version = "2019-04-05"; in stdenv.mkDerivation { name = "sbt-extras-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1kkpsd3fb8lm631bwjj41x4i9a5m88y2f3flzs918y12bjkli8ji"; + sha256 = "1hrz7kg0k2iqq18bg6ll2bdj487p0987880dz0c0g35ah70ps2hj"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix index 05e11ad63a7a..50269a74395c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook }: +{ stdenv, fetchFromGitLab, fetchpatch, python, ensureNewerSourcesForZipFilesHook }: stdenv.mkDerivation rec { name = "waf-${version}"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "006a4wb9i569pahs8ji86hrv58g2hm8xikgchnll3bdqgxllhnrs"; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/grahamc/waf/commit/fc1c98f1fb575fb26b867a61cbca79aa894db2ea.patch"; + sha256 = "0kzfrr6nh1ay8nyk0i69nhkkrq7hskn7yw1qyjxrda1y3wxj6jp8"; + }) + ]; + buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; configurePhase = '' diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index 48b0631c64aa..47db8c9fea63 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ , go-md2man }: let - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "buildah"; - sha256 = "19rp5kgdgyjfvg23m8dqlv6g1cs2c57nnw64ifjv24hqhy1xc0qk"; + sha256 = "154zjkccinf6nvbz5a8rdlkgy7fi6yz11wi100jn9cmsjydspax8"; }; goPackagePath = "github.com/containers/buildah"; @@ -46,7 +46,7 @@ in buildGoPackage rec { meta = { description = "A tool which facilitates building OCI images"; homepage = https://github.com/containers/buildah; - maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; + maintainers = with stdenv.lib.maintainers; [ Profpatsch vdemeester ]; license = stdenv.lib.licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/tools/compass/Gemfile b/nixpkgs/pkgs/development/tools/compass/Gemfile index e85f28cbaff1..66a29975e7dd 100644 --- a/nixpkgs/pkgs/development/tools/compass/Gemfile +++ b/nixpkgs/pkgs/development/tools/compass/Gemfile @@ -1,3 +1,3 @@ -source "https://rubygems.org" - -gem 'compass' +source "https://rubygems.org" do + gem 'compass' +end diff --git a/nixpkgs/pkgs/development/tools/compass/Gemfile.lock b/nixpkgs/pkgs/development/tools/compass/Gemfile.lock index 9aebd2b15cea..43790d9e7a1e 100644 --- a/nixpkgs/pkgs/development/tools/compass/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/compass/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - chunky_png (1.3.4) + chunky_png (1.3.11) compass (1.0.3) chunky_png (~> 1.2) compass-core (~> 1.0.2) @@ -14,15 +14,18 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - ffi (1.9.8) - multi_json (1.11.0) - rb-fsevent (0.9.4) - rb-inotify (0.9.5) - ffi (>= 0.5.0) - sass (3.4.13) + ffi (1.10.0) + multi_json (1.13.1) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + sass (3.4.25) PLATFORMS ruby DEPENDENCIES - compass + compass! + +BUNDLED WITH + 1.17.2 diff --git a/nixpkgs/pkgs/development/tools/compass/default.nix b/nixpkgs/pkgs/development/tools/compass/default.nix index 3e3e239fbfb3..c47bddd4d9c3 100644 --- a/nixpkgs/pkgs/development/tools/compass/default.nix +++ b/nixpkgs/pkgs/development/tools/compass/default.nix @@ -1,16 +1,15 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv { - name = "compass-1.0.3"; - - inherit ruby; +bundlerApp { + pname = "compass"; gemdir = ./.; + exes = [ "compass" ]; meta = with lib; { description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain"; homepage = https://github.com/Compass/compass; license = with licenses; mit; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline manveru ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/compass/gemset.nix b/nixpkgs/pkgs/development/tools/compass/gemset.nix index aaf74f3f33c4..1beb3d3fec00 100644 --- a/nixpkgs/pkgs/development/tools/compass/gemset.nix +++ b/nixpkgs/pkgs/development/tools/compass/gemset.nix @@ -1,83 +1,96 @@ { - "chunky_png" = { - version = "1.3.4"; + chunky_png = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; + sha256 = "124najs9prqzrzk49h53kap992rmqxj0wni61z2hhsn7mwmgdp9d"; type = "gem"; - sha256 = "0n5xhkj3vffihl3h9s8yjzazqaqcm4p1nyxa1w2dk3fkpzvb0wfw"; }; + version = "1.3.11"; }; - "compass" = { - version = "1.0.3"; + compass = { + dependencies = ["chunky_png" "compass-core" "compass-import-once" "rb-fsevent" "rb-inotify" "sass"]; + groups = ["default"]; + platforms = []; source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "0lfi83w8z75czr0pf0rmj9hda22082h3cmvczl8r1ma9agf88y2c"; + type = "gem"; }; - dependencies = [ - "chunky_png" - "compass-core" - "compass-import-once" - "rb-fsevent" - "rb-inotify" - "sass" - ]; - }; - "compass-core" = { version = "1.0.3"; + }; + compass-core = { + dependencies = ["multi_json" "sass"]; + groups = ["default"]; + platforms = []; source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "0yaspqwdmzwdcqviclbs3blq7an16pysrfzylz8q1gxmmd6bpj3a"; + type = "gem"; }; - dependencies = [ - "multi_json" - "sass" - ]; + version = "1.0.3"; }; - "compass-import-once" = { - version = "1.0.5"; + compass-import-once = { + dependencies = ["sass"]; + groups = ["default"]; + platforms = []; source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq"; + type = "gem"; }; - dependencies = [ - "sass" - ]; + version = "1.0.5"; }; - "ffi" = { - version = "1.9.8"; + ffi = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; - sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879"; }; + version = "1.10.0"; }; - "multi_json" = { - version = "1.11.0"; + multi_json = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; - sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl"; }; + version = "1.13.1"; }; - "rb-fsevent" = { - version = "0.9.4"; + rb-fsevent = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; type = "gem"; - sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7"; }; + version = "0.10.3"; }; - "rb-inotify" = { - version = "0.9.5"; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; - sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9"; }; - dependencies = [ - "ffi" - ]; + version = "0.10.0"; }; - "sass" = { - version = "3.4.13"; + sass = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kfpcwh8dgw4lc81qglkvjl73689jy3g7196zkxm4fpskg1p5lkw"; type = "gem"; - sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig"; }; + version = "3.4.25"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index c75baf454b34..a8f4336cf71e 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.9.2"; + version = "11.10.1"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "10zmaywq1vzch4a6zdvnm9kgil9ankc9napix9s9fw45wc0lw01p"; + sha256 = "120gpyim54mc8z84gzpbms5hkg2xg4sgzdvkrn1fis9myvd55bav"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0845ylhb3i3jmi5q6aaix4hw9zdb83v5fhvif0xvvi2m7irg06lf"; + sha256 = "0qfqsi1fm94sxv7g975fw0av871f677rp48yv8q5669ipm16n9qk"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "00k4myca2djd6h3i83vjndahm5q1rnlkq0p69dhl5jbldwy614ph"; + sha256 = "1nxv783rdzdwm0qq3li893p7q3n8gg7abla2961f3n735gjlnibx"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/nixpkgs/pkgs/development/tools/coursier/default.nix b/nixpkgs/pkgs/development/tools/coursier/default.nix index bd9dbbb71742..07763e3fa68c 100644 --- a/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.1.0-M10"; + version = "1.1.0-M14-1"; src = fetchurl { - url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; - sha256 = "14iq0717vdm0mj0196idc724vmxp1y0f3gfn41sbqahfhvcx05y8"; + url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; + sha256 = "0km9bxhch2bh7v6yi5jzyvq95fwdmccwqmbiznzhz4iqij8y066w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock b/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock index 10c1235ae258..a9a2d073de4e 100644 --- a/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock @@ -1,21 +1,27 @@ GEM remote: https://rubygems.org/ specs: + backports (3.14.0) builder (3.2.3) - cucumber (2.4.0) + cucumber (3.1.2) builder (>= 2.1.2) - cucumber-core (~> 1.5.0) + cucumber-core (~> 3.2.0) + cucumber-expressions (~> 6.0.1) cucumber-wire (~> 0.0.1) - diff-lcs (>= 1.1.3) - gherkin (~> 4.0) + diff-lcs (~> 1.3) + gherkin (~> 5.1.0) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) - cucumber-core (1.5.0) - gherkin (~> 4.0) + cucumber-core (3.2.1) + backports (>= 3.8.0) + cucumber-tag_expressions (~> 1.1.0) + gherkin (~> 5.0) + cucumber-expressions (6.0.1) + cucumber-tag_expressions (1.1.1) cucumber-wire (0.0.1) diff-lcs (1.3) - gherkin (4.1.3) - multi_json (1.12.1) + gherkin (5.1.0) + multi_json (1.13.1) multi_test (0.1.2) PLATFORMS @@ -25,4 +31,4 @@ DEPENDENCIES cucumber BUNDLED WITH - 1.14.4 + 1.17.2 diff --git a/nixpkgs/pkgs/development/tools/cucumber/default.nix b/nixpkgs/pkgs/development/tools/cucumber/default.nix index d4ca66c70d7a..4a3ed7395500 100644 --- a/nixpkgs/pkgs/development/tools/cucumber/default.nix +++ b/nixpkgs/pkgs/development/tools/cucumber/default.nix @@ -1,19 +1,15 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv rec { - name = "cucumber-${version}"; - - version = (import gemset).cucumber.version; - inherit ruby; - # expects Gemfile, Gemfile.lock and gemset.nix in the same directory - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; +bundlerApp { + pname = "cucumber"; + gemdir = ./.; + exes = [ "cucumber" ]; meta = with lib; { description = "A tool for executable specifications"; homepage = https://cucumber.io/; license = with licenses; mit; + maintainers = with maintainers; [ manveru ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/cucumber/gemset.nix b/nixpkgs/pkgs/development/tools/cucumber/gemset.nix index 07a80592ddaf..99d519a83b68 100644 --- a/nixpkgs/pkgs/development/tools/cucumber/gemset.nix +++ b/nixpkgs/pkgs/development/tools/cucumber/gemset.nix @@ -1,5 +1,17 @@ { + backports = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; + type = "gem"; + }; + version = "3.14.0"; + }; builder = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; @@ -8,22 +20,50 @@ version = "3.2.3"; }; cucumber = { + dependencies = ["builder" "cucumber-core" "cucumber-expressions" "cucumber-wire" "diff-lcs" "gherkin" "multi_json" "multi_test"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k4j31a93r0zhvyq2mm2k8irppbvkzbsg44r3mf023959v18fzih"; + sha256 = "1s2brssrpal8hyhcgg974x3xyhpmvpwps5ypd9p8w2lg01l1pp3j"; type = "gem"; }; - version = "2.4.0"; + version = "3.1.2"; }; cucumber-core = { + dependencies = ["backports" "cucumber-tag_expressions" "gherkin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iavlh8hqj9lwljbpkw06259gdicbr1bdb6pbj5yy3n8szgr8k3c"; + type = "gem"; + }; + version = "3.2.1"; + }; + cucumber-expressions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zwmv6hznyz9vk81f5dhwcr9jhxx2vmbk8yyazayvllvhy0fkpdw"; + type = "gem"; + }; + version = "6.0.1"; + }; + cucumber-tag_expressions = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qj2fsqvp94nggnikbnrfvnmzr1pl6ifmdsxj69kdw1kkab30jjr"; + sha256 = "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc"; type = "gem"; }; - version = "1.5.0"; + version = "1.1.1"; }; cucumber-wire = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "09ymvqb0sbw2if1nxg8rcj33sf0va88ancq5nmp8g01dfwzwma2f"; @@ -32,6 +72,8 @@ version = "0.0.1"; }; diff-lcs = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; @@ -40,22 +82,28 @@ version = "1.3"; }; gherkin = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d18r8mf2qyd9jbq9xxvca8adyysdzvwdy8v9c2s5hrd6p02kg79"; + sha256 = "1cgcdchwwdm10rsk44frjwqd4ihprhxjbm799nscqy2q1raqfj5s"; type = "gem"; }; - version = "4.1.3"; + version = "5.1.0"; }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.1"; }; multi_test = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1sx356q81plr67hg16jfwz9hcqvnk03bd9n75pmdw8pfxjfy1yxd"; diff --git a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix index eab4c855e1c7..5eb7651f199b 100644 --- a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix @@ -47,6 +47,8 @@ in stdenv.mkDerivation rec { makeWrapper $out/share/squirrel-sql/squirrel-sql.sh $out/bin/squirrel-sql \ --set CLASSPATH "$cp" \ --set JAVA_HOME "${jre}" + # Make sure above `CLASSPATH` gets picked up + substituteInPlace $out/share/squirrel-sql/squirrel-sql.sh --replace "-cp \"\$CP\"" "-cp \"\$CLASSPATH:\$CP\"" mkdir -p $out/share/icons/hicolor/32x32/apps ln -s $out/share/squirrel-sql/icons/acorn.png \ diff --git a/nixpkgs/pkgs/development/tools/dep/default.nix b/nixpkgs/pkgs/development/tools/dep/default.nix index 283193a485cd..a486d786c374 100644 --- a/nixpkgs/pkgs/development/tools/dep/default.nix +++ b/nixpkgs/pkgs/development/tools/dep/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "dep-${version}"; - version = "0.5.0"; + version = "0.5.1"; rev = "v${version}"; goPackagePath = "github.com/golang/dep"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "golang"; repo = "dep"; - sha256 = "1p35995w2f8rp4cxhcwnhdv26ajx6gxx9pm2ijb5sjy2pwhw5c6j"; + sha256 = "1a5vq5v3ikg6iysbywxr5hcjnbv76nzhk50rd3iq3v2fnyq38dv2"; }; buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); diff --git a/nixpkgs/pkgs/development/tools/doctl/default.nix b/nixpkgs/pkgs/development/tools/doctl/default.nix index 6acc977247c7..7762dc2f372a 100644 --- a/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -4,8 +4,8 @@ buildGoPackage rec { name = "doctl-${version}"; version = "${major}.${minor}.${patch}"; major = "1"; - minor = "12"; - patch = "2"; + minor = "16"; + patch = "0"; goPackagePath = "github.com/digitalocean/doctl"; excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)''; @@ -21,7 +21,7 @@ buildGoPackage rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "01li9ywzvmzmhqgk9a5li2wkqmdn7jl8pqz2rn7dnay4fr2259fv"; + sha256 = "041fqanlk8px4nhxaxxs27gbqh8571szxfrcp0zmihdbr4nc70dv"; }; meta = { diff --git a/nixpkgs/pkgs/development/tools/ejson/Gemfile.lock b/nixpkgs/pkgs/development/tools/ejson/Gemfile.lock index bc72352c7ab1..52c82545bf36 100644 --- a/nixpkgs/pkgs/development/tools/ejson/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/ejson/Gemfile.lock @@ -3,23 +3,23 @@ GEM specs: arr-pm (0.0.10) cabin (> 0) - backports (3.8.0) + backports (3.14.0) cabin (0.9.0) - childprocess (0.7.1) + childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) clamp (1.0.1) - dotenv (2.2.1) - ffi (1.9.18) - fpm (1.9.2) + dotenv (2.7.2) + ffi (1.10.0) + fpm (1.11.0) arr-pm (~> 0.0.10) backports (>= 2.6.2) cabin (>= 0.6.0) - childprocess + childprocess (= 0.9.0) clamp (~> 1.0.0) ffi json (>= 1.7.7, < 2.0) pleaserun (~> 0.0.29) - ruby-xz + ruby-xz (~> 0.2.3) stud hpricot (0.8.6) insist (1.0.0) @@ -51,4 +51,4 @@ DEPENDENCIES ronn BUNDLED WITH - 1.16.0 + 1.17.2 diff --git a/nixpkgs/pkgs/development/tools/ejson/default.nix b/nixpkgs/pkgs/development/tools/ejson/default.nix index 80129f318e39..19ee4c6391bf 100644 --- a/nixpkgs/pkgs/development/tools/ejson/default.nix +++ b/nixpkgs/pkgs/development/tools/ejson/default.nix @@ -8,7 +8,7 @@ let }; in buildGoPackage rec { name = "ejson-${version}"; - version = "1.2.0"; + version = "1.2.1"; rev = "v${version}"; nativeBuildInputs = [ gems ]; @@ -22,7 +22,7 @@ in buildGoPackage rec { owner = "Shopify"; repo = "ejson"; inherit rev; - sha256 = "07ig24fryb9n0mfyqb0sgpj7di9y7wbvh2ppwfs2jqfpvpncd7yh"; + sha256 = "09356kp059hbzmqpzlz4b3agg93yqqygh5l5ddbxcsaqx4qiwdr7"; }; # set HOME, otherwise bundler will insert stuff in the manpages diff --git a/nixpkgs/pkgs/development/tools/ejson/gemset.nix b/nixpkgs/pkgs/development/tools/ejson/gemset.nix index b6fb1473d222..70c61be984c6 100644 --- a/nixpkgs/pkgs/development/tools/ejson/gemset.nix +++ b/nixpkgs/pkgs/development/tools/ejson/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcz0z6jms5jydr1r95kf1bpk3ms618hgr26c62h34icy9i1dpm"; + sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; type = "gem"; }; - version = "3.8.0"; + version = "3.14.0"; }; cabin = { groups = ["default"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04cypmwyy4aj5p9b5dmpwiz5p1gzdpz6jaxb42fpckdbmkpvn6j1"; + sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; type = "gem"; }; - version = "0.7.1"; + version = "0.9.0"; }; clamp = { groups = ["default"]; @@ -56,20 +56,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv"; + sha256 = "13cis6bf06hmz744xrsl163p6gb78xcm8g8q4pcabsy5ywyv6kag"; type = "gem"; }; - version = "2.2.1"; + version = "2.7.2"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.18"; + version = "1.10.0"; }; fpm = { dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09vzjsiwa2dlhph6fc519x5l0bfn2qfhayfld48cdl2561x5c7fb"; + sha256 = "0khzsiqzswxpql6w2ws9dawb27zgv4nmgrjszydmm0xpv6h21jrm"; type = "gem"; }; - version = "1.9.2"; + version = "1.11.0"; }; hpricot = { groups = ["default"]; diff --git a/nixpkgs/pkgs/development/tools/electron/5.x.nix b/nixpkgs/pkgs/development/tools/electron/5.x.nix new file mode 100644 index 000000000000..ba97587c5af7 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/electron/5.x.nix @@ -0,0 +1,77 @@ +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }: + +let + version = "5.0.0"; + 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 = "01320qv0x18rmjn6ibbs49pd04d58rz5dac509lxxay8nfb14gdp"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; + sha256 = "0mkc8r5xggkzdypyq4hxigmjl6d1jn0139l8nwj1vr224ggnskhn"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; + sha256 = "1w767yxm3b6sj52z0wnzr4vfn0m8n2jdjhj3ksmq6qrv401vvib3"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; + sha256 = "1nvpfkrizkmr6xxb2ls19p9mhgpms65ws09bx3l8sqq6275916jk"; + }; + }.${stdenv.hostPlatform.system} or throwSystem; + + buildInputs = [ unzip makeWrapper ]; + + 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 + ''; + }; + + darwin = { + inherit name version meta; + + src = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; + sha256 = "07s2cq4ffpx86pjxrh1hcvk3r85saxqi3kkbbfkg9r1bbq8zbapm"; + }; + + 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/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix index e0d2d56e7fa5..b6f7d0b072b2 100644 --- a/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/nixpkgs/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk }: let - version = "4.1.4"; + version = "4.1.5"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "0z1pr85mdw8c7vdsvznhixzmqmy3s6rrjaybym76c93hdvkr2ir9"; + sha256 = "0rqaydlg7wkccks7crwpylad0bsz8knm82mpb7hnj68p9njxpsbz"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "05lyq67paad4h4ng39h8bwkv84bmy6axbxh60fmvl6l1x55dsan6"; + sha256 = "0xwvn41pvpsrx54waix8kmg3w1f1f9nmfn08hf9bkgnlgh251shy"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "1ddc9b6h29qdqxnkc4vd6y5iah9i3f5i7v5zjb5b61rssz78wdbq"; + sha256 = "172yq2m4i0pf72xr6w3xgkxfakkx2wrc54aah5j3nr6809bcnzji"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0qha5klws8l2i0grmwjiz34srr66h93lpx1j0lsgz3pxjxhc33xs"; + sha256 = "0gcgvgplg9c2sm53sa4nll4x486c4m190ma9a98xfx9mp9vy55vq"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -59,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "0zbgrwphd1xfkzqai8n7mi9vpzqflq4wwwnl4pdryrkyi3k4yxa6"; + sha256 = "1z43ga620rw84x1yxvnxf11pd782s5vgj5dgnn4k0nfgxlihy058"; }; buildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix index d4fa99c48258..5f8aaf07d730 100644 --- a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix +++ b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix @@ -37,7 +37,7 @@ }: let - version = "1.0.5"; + version = "1.0.6"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "1l5hpxkc7f3mp9v8wyagpbc8vvfn0m0jq8rsk1h7vwyyjmijv6mb"; + sha256 = "1fw9lzf9cy3fnnvn9q3g0schxcj7kaj6kjijhrmcmsfcnzbjlmrv"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/galen/default.nix b/nixpkgs/pkgs/development/tools/galen/default.nix index 2bb67d6f761b..fac1a3958d37 100644 --- a/nixpkgs/pkgs/development/tools/galen/default.nix +++ b/nixpkgs/pkgs/development/tools/galen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "galen"; - version = "2.3.7"; + version = "2.4.4"; name = "${pname}-${version}"; inherit jre8; src = fetchurl { url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; - sha256 = "045y1s4n8jd52jnk9kwd0k4x3yscvcfsf2rxzn0xngvn9nkw2g65"; + sha256 = "13dq8cf0yy24vym6z7p8hb0mybgpcl4j5crsaq8a6pjfxz6d17mq"; }; buildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix index 85e7c07b8cce..f93bd9d28c81 100644 --- a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix +++ b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "gocode-gomod-unstable-${version}"; - version = "2019-02-12"; - rev = "8cc90faaf4765d16de060350da41eadccc1a15d1"; + version = "2019-03-27"; + rev = "81059208699789f992bb4a4a3fedd734e335468d"; goPackagePath = "github.com/stamblerre/gocode"; diff --git a/nixpkgs/pkgs/development/tools/godot/default.nix b/nixpkgs/pkgs/development/tools/godot/default.nix index fe684bbf7b6f..7fd6fe623748 100644 --- a/nixpkgs/pkgs/development/tools/godot/default.nix +++ b/nixpkgs/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { name = "godot-${version}"; - version = "3.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "1z37znqzbn0x8s04pb9dxzni9jzl8m59nfrr14vypww42f9l5i7i"; + sha256 = "0lplkwgshh0x7r1daai9gflzwjnp3yfx4724h1myvidaz234v2wh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/gotests/default.nix b/nixpkgs/pkgs/development/tools/gotests/default.nix index 6c8270f85986..8eb65281b3fe 100644 --- a/nixpkgs/pkgs/development/tools/gotests/default.nix +++ b/nixpkgs/pkgs/development/tools/gotests/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gotests-${version}"; - version = "1.5.2"; + version = "1.5.3"; rev = "v${version}"; goPackagePath = "github.com/cweill/gotests"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "cweill"; repo = "gotests"; - sha256 = "0ff2jvpc1xb5jr6dv9izlpfavxaivzirqmdmicpznrqjz0d56pri"; + sha256 = "1c0hly31ax0wk01zdx0l0yl40xybaizjfb3gjxia2z0mgx330dq9"; }; meta = { diff --git a/nixpkgs/pkgs/development/tools/gotests/deps.nix b/nixpkgs/pkgs/development/tools/gotests/deps.nix index 6a333b58bec6..df411303d944 100644 --- a/nixpkgs/pkgs/development/tools/gotests/deps.nix +++ b/nixpkgs/pkgs/development/tools/gotests/deps.nix @@ -1,11 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "golang.org/x/tools"; fetch = { type = "git"; - url = "https://github.com/golang/tools"; - rev = "96b5a5404f303f074e6117d832a9873c439508f0"; - sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42"; + url = "https://go.googlesource.com/tools"; + rev = "23463209683dad3f2b9cc7f7c2663e1847c59017"; + sha256 = "1shzfl4zixhj78v4f6y04bcmfl705yr5q8hp72ndbbma0mh09g8f"; }; } ] diff --git a/nixpkgs/pkgs/development/tools/haskell/leksah/default.nix b/nixpkgs/pkgs/development/tools/haskell/leksah/default.nix deleted file mode 100644 index ec2fb334a3b3..000000000000 --- a/nixpkgs/pkgs/development/tools/haskell/leksah/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, ghcWithPackages, gtk3, makeWrapper }: - -let -leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]); -in stdenv.mkDerivation { - name = "leksah-${leksahEnv.version}"; - - buildInputs = [ gtk3 ]; - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin - makeWrapper ${leksahEnv}/bin/leksah $out/bin/leksah \ - --prefix PATH : "${leksahEnv}/bin" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = { - broken = true; # 2018-09-13, no successful hydra build since 2017-08-19 - }; -} diff --git a/nixpkgs/pkgs/development/tools/ktlint/default.nix b/nixpkgs/pkgs/development/tools/ktlint/default.nix index bfad2a3d46a8..c46250142c9e 100644 --- a/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ktlint-${version}"; - version = "0.31.0"; + version = "0.32.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0bqpflvnh423w54162r0d6l503lql1bwqykxw18s2fx1n1gb3n9a"; + sha256 = "0ha4n2gsfvcycwammywqr7xg5ydlgpflmlm380v767178p5r5llm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/nixpkgs/pkgs/development/tools/misc/cli11/default.nix new file mode 100644 index 000000000000..904119bd6ae3 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/cli11/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, gtest, python, boost }: + +stdenv.mkDerivation rec { + pname = "cli11"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "CLIUtils"; + repo = "CLI11"; + rev = "v${version}"; + sha256 = "0wddck970pczk7c201i2g6s85mkv4f2f4zxy6mndh3pfz41wcs2d"; + }; + + nativeBuildInputs = [ cmake ]; + + checkInputs = [ boost python ]; + + doCheck = true; + + preConfigure = '' + rm -rfv extern/googletest + ln -sfv ${gtest.src} extern/googletest + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "CLI11 is a command line parser for C++11"; + homepage = https://github.com/CLIUtils/CLI11; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nand0p ]; + license = licenses.unfreeRedistributable; + }; + +} diff --git a/nixpkgs/pkgs/development/tools/misc/gede/default.nix b/nixpkgs/pkgs/development/tools/misc/gede/default.nix index d0d3c2326adb..3099bc38dc20 100644 --- a/nixpkgs/pkgs/development/tools/misc/gede/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gede-${version}"; - version = "2.12.3"; + version = "2.13.1"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "041wvby19dlcbb7x3yn2mbcfkrn0pkyjpgm40ngsks63kqzmkpdp"; + sha256 = "00qgp45hgcnmv8qj0vicqmiwa82rzyadcqy48xfxjd4xgf0qy5bk"; }; nativeBuildInputs = [ qmake makeWrapper python ]; diff --git a/nixpkgs/pkgs/development/tools/misc/openocd/default.nix b/nixpkgs/pkgs/development/tools/misc/openocd/default.nix index cea86f090d6a..7141fdcee7e7 100644 --- a/nixpkgs/pkgs/development/tools/misc/openocd/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/openocd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libftdi, libusb1, pkgconfig, hidapi }: +{ stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }: stdenv.mkDerivation rec { name = "openocd-${version}"; @@ -10,28 +10,28 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libftdi libusb1 hidapi ]; + buildInputs = [ libftdi1 libusb1 hidapi ]; configureFlags = [ "--enable-jtag_vpi" "--enable-usb_blaster_libftdi" - "--enable-amtjtagaccel" - "--enable-gw16012" + (lib.enableFeature (! stdenv.isDarwin) "amtjtagaccel") + (lib.enableFeature (! stdenv.isDarwin) "gw16012") "--enable-presto_libftdi" "--enable-openjtag_ftdi" - "--enable-oocd_trace" + (lib.enableFeature (! stdenv.isDarwin) "oocd_trace") "--enable-buspirate" - "--enable-sysfsgpio" + (lib.enableFeature stdenv.isLinux "sysfsgpio") "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-implicit-fallthrough" "-Wno-format-truncation" "-Wno-format-overflow" ]; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" rules="$out/share/openocd/contrib/60-openocd.rules" if [ ! -f "$rules" ]; then @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ln -s "$rules" "$out/etc/udev/rules.d/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"; longDescription = '' OpenOCD provides on-chip programming and debugging support with a layered @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { homepage = http://openocd.sourceforge.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/stlink/default.nix b/nixpkgs/pkgs/development/tools/misc/stlink/default.nix index de13f6709b2b..90f901e51125 100644 --- a/nixpkgs/pkgs/development/tools/misc/stlink/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/stlink/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "In-circuit debug and programming for ST-Link devices"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor maintainers.rongcuid ]; }; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix index 632fe9fff325..cf82b391ff96 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dune-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0z4jnj0a5vxjqlwksplhag9b3s3iqdcpcpjjzfazv5jdl5cf58f9"; + sha256 = "0l27d13wh3i1450kgxnhr6r977sgby1dqwsfc8cqd9mqic1mr9f2"; }; buildInputs = [ ocaml findlib ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index 139ffef186b5..ff59fa7cf8a3 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -1,11 +1,19 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, fetchFromGitHub, ocaml, findlib, dune, js_of_ocaml-compiler , camlp4, ocsigen_deriving }: stdenv.mkDerivation rec { + version = "3.2.1"; name = "js_of_ocaml-camlp4-${version}"; - inherit (js_of_ocaml-compiler) version src installPhase meta; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "js_of_ocaml"; + rev = version; + sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; + }; + + inherit (js_of_ocaml-compiler) installPhase meta; buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 94be7132b796..c5a345f505b7 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -8,13 +8,13 @@ else stdenv.mkDerivation rec { name = "js_of_ocaml-compiler-${version}"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; + sha256 = "0bg8x2s3f24c8ia2g293ikd5yg0yjw3hkdgdql59c8k2amqin8f8"; }; buildInputs = [ ocaml findlib dune cmdliner cppo ]; diff --git a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix new file mode 100644 index 000000000000..6f8b4f824b3f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchurl +, mono5 +, makeWrapper +}: + +stdenv.mkDerivation rec { + + name = "omnisharp-roslyn-${version}"; + version = "1.32.8"; + + src = fetchurl { + url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; + sha256 = "0k2a4awmzb7ppll2skyzaa94n3hxqm35ffibl0sygldk3symzwgp"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + preUnpack = '' + mkdir src + cd src + sourceRoot=. + ''; + + installPhase = '' + mkdir -p $out/bin + cd .. + cp -r src $out/ + ls -al $out/src + makeWrapper ${mono5}/bin/mono $out/bin/omnisharp \ + --add-flags "$out/src/OmniSharp.exe" + ''; + + meta = with stdenv.lib; { + description = "OmniSharp based on roslyn workspaces"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ tesq0 ]; + }; + +} diff --git a/nixpkgs/pkgs/development/tools/pax-rs/default.nix b/nixpkgs/pkgs/development/tools/pax-rs/default.nix index 3a4f35c0412b..a3dc7bd16ce0 100644 --- a/nixpkgs/pkgs/development/tools/pax-rs/default.nix +++ b/nixpkgs/pkgs/development/tools/pax-rs/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { homepage = https://github.com/nathan/pax; license = licenses.mit; maintainers = [ maintainers.klntsky ]; - platforms = platforms.all; + platforms = platforms.linux; }; src = @@ -26,7 +26,7 @@ buildRustPackage rec { }; cargo-lock = fetchurl { - url = "https://gist.github.com/8084/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; + url = "https://gist.github.com/klntsky/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; sha256 = "0ff1b64b99cbca1cc2ceabcd2e4f7bc3411e3a2a9fbb9db2204d9240fe38ddeb"; }; in diff --git a/nixpkgs/pkgs/development/tools/pipenv/default.nix b/nixpkgs/pkgs/development/tools/pipenv/default.nix index 8083151ef81f..f51ce6fcfaba 100644 --- a/nixpkgs/pkgs/development/tools/pipenv/default.nix +++ b/nixpkgs/pkgs/development/tools/pipenv/default.nix @@ -15,15 +15,15 @@ buildPythonApplication rec { flake8 invoke parver - pew pip requests + virtualenv ]; doCheck = false; makeWrapperArgs = [ - "--set PYTHONPATH \"$PYTHONPATH\"" + "--set PYTHONPATH \".:$PYTHONPATH\"" "--set PIP_IGNORE_INSTALLED 1" ]; diff --git a/nixpkgs/pkgs/development/tools/redis-dump/Gemfile.lock b/nixpkgs/pkgs/development/tools/redis-dump/Gemfile.lock index 283a3815f223..364bdb778f51 100644 --- a/nixpkgs/pkgs/development/tools/redis-dump/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/redis-dump/Gemfile.lock @@ -2,14 +2,14 @@ GEM remote: https://rubygems.org/ specs: drydock (0.6.9) - redis (3.3.0) - redis-dump (0.3.5) + redis (4.1.0) + redis-dump (0.4.0) drydock (>= 0.6.9) - redis (>= 2.0) + redis (>= 4.0) uri-redis (>= 0.4.0) yajl-ruby (>= 0.1) uri-redis (0.4.2) - yajl-ruby (1.2.1) + yajl-ruby (1.4.1) PLATFORMS ruby @@ -18,4 +18,4 @@ DEPENDENCIES redis-dump BUNDLED WITH - 1.11.2 + 1.17.2 diff --git a/nixpkgs/pkgs/development/tools/redis-dump/default.nix b/nixpkgs/pkgs/development/tools/redis-dump/default.nix index 9bf6a2408c2d..c83117860100 100644 --- a/nixpkgs/pkgs/development/tools/redis-dump/default.nix +++ b/nixpkgs/pkgs/development/tools/redis-dump/default.nix @@ -1,18 +1,15 @@ -{ lib, bundlerEnv, ruby, perl, autoconf }: +{ lib, bundlerApp }: -bundlerEnv { - name = "redis-dump-0.3.5"; - - inherit ruby; +bundlerApp { + pname = "redis-dump"; gemdir = ./.; - - buildInputs = [ perl autoconf ]; + exes = [ "redis-dump" ]; meta = with lib; { description = "Backup and restore your Redis data to and from JSON"; homepage = http://delanotes.com/redis-dump/; license = licenses.mit; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline manveru ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix b/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix index 4054f4bb0a7a..2bfaa1fb9529 100644 --- a/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix +++ b/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix @@ -1,5 +1,7 @@ { drydock = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0grf3361mh93lczljmnwafl7gbcp9kk1bjpfwx4ykpd43fzdbfyj"; @@ -8,22 +10,29 @@ version = "0.6.9"; }; redis = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v68ggm0pwcyml3ngfyngwgvypwmsrmji1kyx48qqcg045zjs5p6"; + sha256 = "0rk6mmy3y2jd34llrf591ribl1p54ghkw7m96wrbamy8fwva5zqv"; type = "gem"; }; - version = "3.3.0"; + version = "4.1.0"; }; redis-dump = { + dependencies = ["drydock" "redis" "uri-redis" "yajl-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y6s3nvcw84jqqvp9pjg9qmqyc0b8jkrp0dknhjjr0lg2q3fq87h"; + sha256 = "1gvip73kgm8xvyjmjkz4b986wni9blsmrnpvp5jrsxjz3g0sqzwg"; type = "gem"; }; - version = "0.3.5"; + version = "0.4.0"; }; uri-redis = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "13n8ak41rikkbmml054pir4i1xbgjpmf3dbqihc2kcrgmz3dg81a"; @@ -32,10 +41,13 @@ version = "0.4.2"; }; yajl-ruby = { + groups = ["default"]; + platforms = []; source = { - sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + remotes = ["https://rubygems.org"]; + sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; type = "gem"; }; - version = "1.2.1"; + version = "1.4.1"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index a1f5e5769ae8..d0cd28379d6c 100644 --- a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -2,17 +2,17 @@ runtimeShell }: rustPlatform.buildRustPackage rec { - name = "rust-bindgen-${version}"; - version = "0.42.2"; + pname = "rust-bindgen"; + version = "0.49.0"; src = fetchFromGitHub { - owner = "rust-lang-nursery"; - repo = "rust-bindgen"; + owner = "rust-lang"; + repo = pname; rev = "v${version}"; - sha256 = "10h0h7x8yf4dsyw2p2nas2jg5p3i29np0y3rfzrdq898d70gvq4j"; + sha256 = "0i1lh8z0jpf8gcfqxig8kl6wzjrkwb3jkad5ghb6ppkdkpr94jq4"; }; - cargoSha256 = "01jvi86xgz0r7ia9agnfpms6b6x68lzwj6f085m0w659i94acgpi"; + cargoSha256 = "0v3slbah0s1w75s38x1akvshcxsi1s810yybd9faday7biwmdbmj"; libclang = llvmPackages.libclang.lib; #for substituteAll @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { As with most compiler related software, this will only work inside a nix-shell with the required libraries as buildInputs. ''; - homepage = https://github.com/rust-lang-nursery/rust-bindgen; + homepage = https://github.com/rust-lang/rust-bindgen; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.ralith ]; }; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 88fd212dad2e..3e2128ff0850 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.11"; + version = "0.4.12"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "051hy2320mqdxvafhafwnk1n8q2sq2d7jyhx5bbxvqmjjm55lg8h"; + sha256 = "0m57v7mh7wdl0rdbad7vkvcgy93p9gcb971wap8i5nzjvzmp4wlb"; }; - cargoSha256 = "0d1j01nrq5j0yrgd85lnvg1mzalcd8xadkza3yvwnqzf554idrcy"; + cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz"; 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-sweep/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix new file mode 100644 index 000000000000..52198665e9f3 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-sweep"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "holmgr"; + repo = pname; + rev = "v${version}"; + sha256 = "1zp0x0jy5bjqbxawlwvpj6vb3y602mnh19p48rw70kdx6vripbvj"; + }; + + cargoSha256 = "06hx8mlqarjnqrprwdp80cmanmacg3xz62r1bbn27pn60xv719hn"; + + meta = with stdenv.lib; { + description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; + homepage = https://github.com/holmgr/cargo-sweep; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ xrelkd ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 20105f362cf0..bce1e273cc41 100644 --- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.8.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "07cizbhr02x3rh07xhs10hzzs3lmmpf61g08sa62b98cgadvs9fq"; + sha256 = "08zlnk1k1nddjciccfdcplxqngsnz6ml3zxm57mijabzybry8zz1"; }; - cargoSha256 = "00j5nm491zil6kpjns31qyd6z7iqd77b5qp4h7149s70qjwfq2cb"; + cargoSha256 = "1nig4891p7ii4z4f4j4d4pxx39f501g7yrsygqbpkr1nrgjip547"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/development/tools/rust/rls/default.nix b/nixpkgs/pkgs/development/tools/rust/rls/default.nix index accdc7678c60..f52ab0d767a3 100644 --- a/nixpkgs/pkgs/development/tools/rust/rls/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rls/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, rustPlatform -, openssh, openssl, pkgconfig, cmake, zlib, curl }: +, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv }: rustPlatform.buildRustPackage rec { name = "rls-${version}"; # with rust 1.x you can only build rls version 1.x.y - version = "1.31.7"; + version = "1.34.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rls"; - rev = version; - sha256 = "0n33pf7sm31y55rllb8wv3mn75srspr4yj2y6cpcdyf15n47c8cf"; + rev = "0d6f53e1a4adbaf7d83cdc0cb54720203fcb522e"; + sha256 = "1aabs0kr87sp68n9893im5wz21dicip9ixir9a9l56nis4qxpm7i"; }; - cargoSha256 = "0jcsggq4ay8f4vb8n6gh8z995icvvbjkzapxf6jq6qkg6jp3vv17"; + cargoSha256 = "16r9rmjhb0dbdgx9qf740nsckjazz4z663vaajw5z9i4qh0jsy18"; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; @@ -22,12 +22,16 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--no-default-features" ]; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ openssh openssl curl zlib ]; + buildInputs = [ openssh openssl curl zlib libiconv ]; doCheck = true; # the default checkPhase has no way to pass --no-default-features checkPhase = '' runHook preCheck + + # client tests are flaky + rm tests/client.rs + echo "Running cargo test" cargo test --no-default-features runHook postCheck diff --git a/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch index 60f29fccdc34..74da8d6102e7 100644 --- a/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch +++ b/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -1,32 +1,25 @@ -From c21cc756b69a5f33c8a7758b746a816f40f55932 Mon Sep 17 00:00:00 2001 -From: Leon Isenberg <ljli@users.noreply.github.com> -Date: Sat, 28 Oct 2017 17:58:17 +0200 -Subject: [PATCH] nix customization: patchelf installed binaries - ---- - src/rustup-dist/src/component/package.rs | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs -index 70c54dcd..f0318986 100644 ---- a/src/rustup-dist/src/component/package.rs -+++ b/src/rustup-dist/src/component/package.rs -@@ -100,7 +100,10 @@ impl Package for DirectoryPackage { - let src_path = root.join(&path); - +diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs +index e0fdea28..38d9d0e4 100644 +--- a/src/dist/component/package.rs ++++ b/src/dist/component/package.rs +@@ -104,10 +104,11 @@ impl Package for DirectoryPackage { match &*part.0 { -- "file" => builder.copy_file(path.clone(), &src_path)?, -+ "file" => { -+ builder.copy_file(path.clone(), &src_path)?; + "file" => { + if self.copy { +- builder.copy_file(path.clone(), &src_path)? ++ builder.copy_file(path.clone(), &src_path)?; + } else { +- builder.move_file(path.clone(), &src_path)? ++ builder.move_file(path.clone(), &src_path)?; + } + nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path) -+ } - "dir" => builder.copy_dir(path.clone(), &src_path)?, - _ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()), - } -@@ -118,6 +121,22 @@ impl Package for DirectoryPackage { + } + "dir" => { + if self.copy { +@@ -132,6 +133,22 @@ impl Package for DirectoryPackage { } } - + +fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { + let is_bin = if let Some(p) = src_path.parent() { + p.ends_with("bin") @@ -46,6 +39,3 @@ index 70c54dcd..f0318986 100644 // On Unix we need to set up the file permissions correctly so // binaries are executable and directories readable. This shouldn't be // necessary: the source files *should* have the right permissions, --- -2.17.1 - diff --git a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix index 1177423869c1..d6c5718d3ec6 100644 --- a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix @@ -1,25 +1,25 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform -, pkgconfig, curl, Security }: +, pkgconfig, curl, Security, CoreServices }: rustPlatform.buildRustPackage rec { - name = "rustup-${version}"; - version = "1.17.0"; + pname = "rustup"; + version = "1.18.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "1mf92z89wqqaj3cg2cqf6basvcz47krldmy8ianfkzp323fimqmn"; + sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f"; }; - cargoSha256 = "0y7kbihdrpd35dw24qqqzmccvjdy6arka10p5rnv38d420f1bpzd"; + cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--features no-self-update" ]; @@ -49,9 +49,16 @@ rustPlatform.buildRustPackage rec { # tries to create .rustup export HOME=$(mktemp -d) mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} - $out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup" - $out/bin/rustup completions fish > "$out/share/fish/vendor_completions.d/rustup.fish" - $out/bin/rustup completions zsh > "$out/share/zsh/site-functions/_rustup" + + # generate completion scripts for rustup + $out/bin/rustup completions bash rustup > "$out/share/bash-completion/completions/rustup" + $out/bin/rustup completions fish rustup > "$out/share/fish/vendor_completions.d/rustup.fish" + $out/bin/rustup completions zsh rustup > "$out/share/zsh/site-functions/_rustup" + + # generate completion scripts for cargo + # Note: fish completion script is not supported. + $out/bin/rustup completions bash cargo > "$out/share/bash-completion/completions/cargo" + $out/bin/rustup completions zsh cargo > "$out/share/zsh/site-functions/_cargo" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/sass/Gemfile.lock b/nixpkgs/pkgs/development/tools/sass/Gemfile.lock index ecd1404e3398..1b99dd3a1361 100644 --- a/nixpkgs/pkgs/development/tools/sass/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/sass/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - ffi (1.9.23) + ffi (1.10.0) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - sass (3.5.6) + rb-inotify (0.10.0) + ffi (~> 1.0) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -18,4 +18,4 @@ DEPENDENCIES sass BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/nixpkgs/pkgs/development/tools/sass/default.nix b/nixpkgs/pkgs/development/tools/sass/default.nix index 96354acaec48..c204ba8cd406 100644 --- a/nixpkgs/pkgs/development/tools/sass/default.nix +++ b/nixpkgs/pkgs/development/tools/sass/default.nix @@ -9,7 +9,7 @@ bundlerApp { description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS"; homepage = https://sass-lang.com; license = licenses.mit; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ romildo manveru ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/sass/gemset.nix b/nixpkgs/pkgs/development/tools/sass/gemset.nix index bd25281f14fc..f4fdc899abf8 100644 --- a/nixpkgs/pkgs/development/tools/sass/gemset.nix +++ b/nixpkgs/pkgs/development/tools/sass/gemset.nix @@ -1,13 +1,17 @@ { ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.23"; + version = "1.10.0"; }; rb-fsevent = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; @@ -17,24 +21,30 @@ }; rb-inotify = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; }; - version = "0.9.10"; + version = "0.10.0"; }; sass = { dependencies = ["sass-listen"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; + sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; type = "gem"; }; - version = "3.5.6"; + version = "3.7.4"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; diff --git a/nixpkgs/pkgs/development/tools/skaffold/default.nix b/nixpkgs/pkgs/development/tools/skaffold/default.nix index 3d08a6b787d8..417f0a749c98 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.26.0"; - # rev is the 0.25.0 commit, mainly for skaffold version command output - rev = "d88680e9ede62da65500702670ef72fc9272a06f"; + version = "0.28.0"; + # rev is the 0.28.0 commit, mainly for skaffold version command output + rev = "2b6143bb6d185de9b9fbf2eaa981c8e7acff7339"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "151x7hs1876ij5kc1xlm1m7pyff6i22ddhfvjsgwb8sjl4h1ays5"; + sha256 = "1j7wf2a5xmrk944nc0b9634qa9al3cln3lrij8383avylbx68prw"; }; meta = { diff --git a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix new file mode 100644 index 000000000000..5827844c1b58 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, openssl +}: + +rustPlatform.buildRustPackage rec { + name = "wasm-pack-${version}"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "rustwasm"; + repo = "wasm-pack"; + rev = "v${version}"; + sha256 = "1z66m16n4r16zqmnv84a5jndr5x6mdqdq4b1wq929sablwqd2rl4"; + }; + + cargoSha256 = "0hp68w5mvk725gzbmlgl8j6wa1dv2fydil7jvq0f09mzxxaqrwcs"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ]; + + # Tests fetch external resources and build artifacts. + # Disabled to work with sandboxing + doCheck = false; + + meta = with stdenv.lib; { + description = "A utility that builds rust-generated WebAssembly package"; + homepage = https://github.com/rustwasm/wasm-pack; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = [ maintainers.dhkl ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/web/nodejs/v11.nix b/nixpkgs/pkgs/development/web/nodejs/v11.nix index 4026a1b02bb6..881c348a98a5 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v11.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v11.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "11.14.0"; - sha256 = "1rvdyvlvh8ddm9y2razshly5kb87kw0js287i0a5dzb5ay41vxlx"; + version = "11.15.0"; + sha256 = "68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76"; } diff --git a/nixpkgs/pkgs/development/web/now-cli/default.nix b/nixpkgs/pkgs/development/web/now-cli/default.nix index a0e8b814d8ed..943fb457f008 100644 --- a/nixpkgs/pkgs/development/web/now-cli/default.nix +++ b/nixpkgs/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "15.0.4"; + version = "15.0.10"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "7d8fedccce402b3572834cb13a63b343ac2df9e6ad120937289ee88ce6e48d4c"; + sha256 = "00w9bniz87jjvizl364hpfssvbl1y1fdzp0732j348x528px2krh"; }; sourceRoot = "."; |