diff options
Diffstat (limited to 'pkgs/development')
190 files changed, 4232 insertions, 2959 deletions
diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix index 6f127d86285b7..991e9717b801b 100644 --- a/pkgs/development/beam-modules/hex-registry-snapshot.nix +++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix @@ -2,15 +2,14 @@ stdenv.mkDerivation rec { name = "hex-registry"; - rev = "9f736e7"; - version = "0.0.0+build.${rev}"; + rev = "11d7a24e9f53f52490ce255a6248e71128e73aa1"; + version = "20180712.${rev}"; - # src = /home/gleber/code/erl/hex-pm-registry-snapshots; src = fetchFromGitHub { - owner = "erlang-nix"; - repo = "hex-pm-registry-snapshots"; inherit rev; - sha256 = "1xiw5yifyk3bbmr0cr82y1nc4c6zk11f6azdv07glb7yrgccrv79"; + owner = "erlang-nix"; + repo = "hex-pm-registry-snapshots"; + sha256 = "0dbpcrdh6jqmvnm1ysmy7ixyc95vnbqmikyx5kk77qwgyd43fqgi"; }; installPhase = '' diff --git a/pkgs/development/compilers/chicken/eggDerivation.nix b/pkgs/development/compilers/chicken/eggDerivation.nix index 58247e5aeb533..bcb7a763fb6bd 100644 --- a/pkgs/development/compilers/chicken/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/eggDerivation.nix @@ -8,7 +8,6 @@ let libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/"; overrides = import ./overrides.nix; - lib = stdenv.lib; baseName = (builtins.parseDrvName name).name; override = if builtins.hasAttr baseName overrides then diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 75259ed398344..15071fd2ba5e1 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -54,9 +54,6 @@ with builtins; let version = "4.8.5"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = [ ] diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 27164176b532d..006cbdf40dc25 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -54,9 +54,6 @@ with builtins; let version = "4.9.4"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index eeeabe301d135..f360ed135d735 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -53,9 +53,6 @@ with builtins; let version = "5.5.0"; sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index e5c77568a0ede..02a0035016218 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -52,9 +52,6 @@ with builtins; let version = "6.4.0"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index d671743ee629e..84323cca823a2 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -41,9 +41,6 @@ with builtins; let version = "7.3.0"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index e8c03c382308b..85c03bc440ff6 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -41,9 +41,6 @@ with builtins; let version = "8.1.0"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 4e69d7e0408c6..b00f180bbc7c8 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -42,9 +42,6 @@ with builtins; let version = "7-20170409"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index fb294d1fdbaff..522ad32e69f4f 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -76,12 +76,12 @@ let in stdenv.mkDerivation (rec { - version = "8.6.0.20180627"; + version = "8.6.0.20180714"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.6.1-alpha1/ghc-${version}-src.tar.xz"; - sha256 = "0vmki10ypdhca3nykxz3lgarr14mfanfkif43m1s2p1q0b1z576n"; + url = "https://downloads.haskell.org/~ghc/8.6.1-alpha2/ghc-${version}-src.tar.xz"; + sha256 = "1jrkqrqdv2z9i9s1xaxhci34c9rjvlgr40y34bxsfj0hj1r28409"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghcjs-ng/README.md b/pkgs/development/compilers/ghcjs-ng/README.md index 3e1598c83b05a..99ad980c965eb 100644 --- a/pkgs/development/compilers/ghcjs-ng/README.md +++ b/pkgs/development/compilers/ghcjs-ng/README.md @@ -12,9 +12,10 @@ Updating --- ``` -$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.2 \ +$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.4 \ | jq '{ url, rev, fetchSubmodules, sha256 }' \ - > 8.2/git.json -$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.2/stage0.nix + > 8.4/git.json +$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.4/stage0.nix +$ cabal2nix --compiler ghcjs git://github.com/ghcjs/ghcjs-base > ghcjs-base.nix ``` diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 9aa3efe614eb3..ddabb7ca6bfc6 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -18,6 +18,7 @@ , lib , nodePackages , ghcjsDepOverrides ? (_:_:{}) +, haskell }: let @@ -48,7 +49,11 @@ let # Relics of the old GHCJS build system stage1Packages = []; - mkStage2 = _: {}; + mkStage2 = { callPackage }: { + # https://github.com/ghcjs/ghcjs-base/issues/110 + # https://github.com/ghcjs/ghcjs-base/pull/111 + ghcjs-base = haskell.lib.dontCheck (haskell.lib.doJailbreak (callPackage ./ghcjs-base.nix {})); + }; haskellCompilerName = "ghcjs-${bootGhcjs.version}"; }; diff --git a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix new file mode 100644 index 0000000000000..d03843aa336a5 --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix @@ -0,0 +1,29 @@ +{ mkDerivation, aeson, array, attoparsec, base, binary, bytestring +, containers, deepseq, directory, dlist, fetchgit, ghc-prim +, ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck +, quickcheck-unicode, random, scientific, stdenv, test-framework +, test-framework-hunit, test-framework-quickcheck2, text, time +, transformers, unordered-containers, vector +}: +mkDerivation { + pname = "ghcjs-base"; + version = "0.2.0.0"; + src = fetchgit { + url = "git://github.com/ghcjs/ghcjs-base"; + sha256 = "0qr05m0djll3x38dhl85pl798arsndmwfhil8yklhb70lxrbvfrs"; + rev = "01014ade3f8f5ae677df192d7c2a208bd795b96c"; + }; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring containers deepseq dlist + ghc-prim ghcjs-prim hashable integer-gmp primitive scientific text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit + primitive QuickCheck quickcheck-unicode random test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://github.com/ghcjs/ghcjs-base"; + description = "base library for GHCJS"; + license = stdenv.lib.licenses.mit; +} diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 0fe9c8d3765f7..7aedf191abee0 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, +{stdenv, fetchFromGitHub, fetchpatch, bash, which, m4, python, bison, flex, llvmPackages, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: @@ -32,6 +32,13 @@ stdenv.mkDerivation rec { llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; + patches = [ + (fetchpatch { + url = https://github.com/ispc/ispc/commit/d504641f5af9d5992e7c8f0ed42c1063a39ede5b.patch; + sha256 = "192q3gyvam79469bmlwf0jpfi2y4f8hl2vgcvjngsqhvscwira0s"; + }) + ]; + postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile"; # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix deleted file mode 100644 index 5caef5b3b66f3..0000000000000 --- a/pkgs/development/compilers/lessc/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchgit, nodejs }: - -stdenv.mkDerivation rec { - name = "lessc-${version}"; - version = "1.7.5"; # Upgrade to > 2.x breaks twitter-bootstrap - - src = fetchgit { - url = https://github.com/less/less.js.git; - rev = "refs/tags/v${version}"; - sha256 = "1af1xbh1pjpfsx0jp69syji6w9750nigk652yk46jrja3z1scb4s"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/bin $out/lib - cp -r $src/bin/* $out/bin/ - cp -r $src/lib/* $out/lib/ - substituteInPlace $out/bin/lessc --replace "/usr/bin/env node" ${nodejs}/bin/node - ''; - - meta = with stdenv.lib; { - description = "LESS to CSS compiler"; - homepage = http://lesscss.org/; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 8809859b59055..31750e2d0da82 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -80,6 +80,10 @@ in stdenv.mkDerivation (rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" @@ -95,11 +99,6 @@ in stdenv.mkDerivation (rec { ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index d7842bdea992b..8821441840647 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -9,7 +9,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "0cnznvfyl3hgbg8gj58pmwf0pvd2sv5k3ccbivy6q6ggv7c6szg0"} + unpackFile ${fetch "cfe" "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 88bccca364764..be18a315f12a4 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "compiler-rt-${version}"; inherit version; - src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h"; + src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 40d602e222ed4..66f0facc952cb 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -6,7 +6,7 @@ }: let - release_version = "6.0.0"; + release_version = "6.0.1"; version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -14,7 +14,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "1ll9v6r29xfdiywbn9iss49ad39ah3fk91wiv0sr6k6k9i544fq5"; + clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd"; # Add man output without introducing extra dependencies. overrideManOutput = drv: diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 27d8cd18b6660..c1f0b9f61294b 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1n8d0iadkk9fdpplvxkdgrgh2szc6msrx1mpdjpmilz9pn3im4vh"; + src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index 05fab16c25cd5..425b00c689efa 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "06v4dnqh6q0r3p5h2jznlgb69lg79126lzb2s0lcw1k38b2xkili"; + src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 4997f0a7c94e6..818ad47a335af 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "02qfkjkjq0snmf8dw9c255xkh8dg06ndny1x470300pk7j1lm33b"; + src = fetch "lld" "04afcfq2h7ysyqxxhyhb7ig4p0vdw7mi63kh8mffl74j0rc781p7"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index eb565a93ef603..9571e7ab5a63f 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0m6l2ks4banfmdh7xy7l77ri85kmzavgfy81gkc4gl6wg8flrxa6"; + src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 9cae65ef10302..6fc448574f43d 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -19,7 +19,7 @@ }: let - src = fetch "llvm" "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z"; + src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -76,6 +76,12 @@ in stdenv.mkDerivation (rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + + "-DLLVM_ENABLE_DUMP=ON" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" @@ -92,11 +98,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" - ] ++ stdenv.lib.optional enableWasm + ++ stdenv.lib.optional enableWasm "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" ; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 091e378af2a18..16093758e8264 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "openmp-${version}"; - src = fetch "openmp" "1z1qghx6drdvnlp406q1cp3mgikxxmwymcwzaxbv18vxbw6ha3kw"; + src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch index 39a9bbbd207ab..6266eb1958d19 100644 --- a/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch +++ b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch @@ -1,6 +1,6 @@ -From 8c74f8274369f527f2ada3772f4a0b406cb481ec Mon Sep 17 00:00:00 2001 -From: "Jory A. Pratt" <anarchy@gentoo.org> -Date: Sat, 9 Sep 2017 08:31:15 -0500 +From 7b4b3333a2718628b1d510ec1d8438ad67308299 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Fri, 29 Jun 2018 09:48:59 -0500 Subject: [PATCH] Ported to 6.0, taken from gentoo-musl project. ------ @@ -11,18 +11,20 @@ Signed-off-by: Jory A. Pratt <anarchy@gentoo.org> Taken from gentoo-musl project, with a few additional minor fixes. --- - lib/asan/asan_linux.cc | 4 +-- - lib/interception/interception_linux.cc | 2 +- - lib/interception/interception_linux.h | 3 +- - lib/msan/msan_linux.cc | 2 +- - .../sanitizer_common_interceptors_ioctl.inc | 4 +-- - lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- - lib/sanitizer_common/sanitizer_linux_libcdep.cc | 10 +++--- - lib/sanitizer_common/sanitizer_platform.h | 6 ++++ - .../sanitizer_platform_interceptors.h | 4 +-- - .../sanitizer_platform_limits_posix.cc | 40 +++++++++++++--------- - lib/tsan/rtl/tsan_platform_linux.cc | 2 +- - 11 files changed, 46 insertions(+), 33 deletions(-) + lib/asan/asan_linux.cc | 4 +- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 3 +- + lib/msan/msan_linux.cc | 2 +- + lib/sanitizer_common/sanitizer_allocator.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +- + .../sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux.cc | 8 +++- + .../sanitizer_linux_libcdep.cc | 10 ++--- + lib/sanitizer_common/sanitizer_platform.h | 6 +++ + .../sanitizer_platform_interceptors.h | 4 +- + .../sanitizer_platform_limits_posix.cc | 37 +++++++++++-------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 13 files changed, 51 insertions(+), 35 deletions(-) diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc index 625f32d40..73cf77aca 100644 @@ -86,6 +88,19 @@ index 4e6321fcb..4d50feb82 100644 #include "msan.h" #include "msan_thread.h" +diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc +index fc4f7a75a..76cf4f769 100644 +--- a/lib/sanitizer_common/sanitizer_allocator.cc ++++ b/lib/sanitizer_common/sanitizer_allocator.cc +@@ -23,7 +23,7 @@ namespace __sanitizer { + + // ThreadSanitizer for Go uses libc malloc/free. + #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC) +-# if SANITIZER_LINUX && !SANITIZER_ANDROID ++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + extern "C" void *__libc_malloc(uptr size); + # if !SANITIZER_GO + extern "C" void *__libc_memalign(uptr alignment, uptr size); diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc index 24e7548a5..20259b1d6 100644 --- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc @@ -121,6 +136,37 @@ index 469c8eb7e..24f87867d 100644 PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, void *old_rlim) { if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc +index 6c83e8db4..542c4fe64 100644 +--- a/lib/sanitizer_common/sanitizer_linux.cc ++++ b/lib/sanitizer_common/sanitizer_linux.cc +@@ -522,13 +522,13 @@ const char *GetEnv(const char *name) { + #endif + } + +-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD ++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_NONGNU + extern "C" { + SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end; + } + #endif + +-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD ++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD + static void ReadNullSepFileToArray(const char *path, char ***arr, + int arr_size) { + char *buff; +@@ -569,6 +569,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) { + #elif SANITIZER_NETBSD + *argv = __ps_strings->ps_argvstr; + *argv = __ps_strings->ps_envstr; ++#elif SANITIZER_NONGNU ++ static const int kMaxArgv = 2000, kMaxEnvp = 2000; ++ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv); ++ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp); + #else + #if !SANITIZER_GO + if (&__libc_stack_end) { diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc index 56fdfc870..a932d5db1 100644 --- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc @@ -210,7 +256,7 @@ index b99ac4480..628d226a1 100644 #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index f12e8206a..8880197b0 100644 +index feb7bad6f..4e89ab2a6 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -14,6 +14,9 @@ @@ -243,26 +289,16 @@ index f12e8206a..8880197b0 100644 #if HAVE_RPC_XDR_H # include <rpc/xdr.h> #elif HAVE_TIRPC_RPC_XDR_H -@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; - # include <sys/procfs.h> - #endif - #include <sys/user.h> --#include <sys/ustat.h> -+// #include <sys/ustat.h> -+#include <sys/statfs.h> - #include <linux/cyclades.h> - #include <linux/if_eql.h> - #include <linux/if_plip.h> -@@ -252,7 +258,7 @@ namespace __sanitizer { +@@ -251,7 +256,7 @@ namespace __sanitizer { unsigned struct_itimerspec_sz = sizeof(struct itimerspec); #endif // SANITIZER_LINUX || SANITIZER_FREEBSD -#if SANITIZER_LINUX && !SANITIZER_ANDROID +#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - unsigned struct_ustat_sz = sizeof(struct ustat); - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); -@@ -311,7 +317,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which + // has been removed from glibc 2.28. + #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ +@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); #endif @@ -271,7 +307,7 @@ index f12e8206a..8880197b0 100644 int glob_nomatch = GLOB_NOMATCH; int glob_altdirfunc = GLOB_ALTDIRFUNC; #endif -@@ -405,7 +411,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); +@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); unsigned struct_termios_sz = sizeof(struct termios); unsigned struct_winsize_sz = sizeof(struct winsize); @@ -280,7 +316,7 @@ index f12e8206a..8880197b0 100644 unsigned struct_arpreq_sz = sizeof(struct arpreq); unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); -@@ -455,7 +461,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); +@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); unsigned struct_vt_mode_sz = sizeof(struct vt_mode); #endif // SANITIZER_LINUX || SANITIZER_FREEBSD @@ -289,7 +325,7 @@ index f12e8206a..8880197b0 100644 unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); #if EV_VERSION > (0x010000) -@@ -823,7 +829,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); +@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; #endif // SANITIZER_LINUX || SANITIZER_FREEBSD @@ -298,7 +334,7 @@ index f12e8206a..8880197b0 100644 unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; unsigned IOCTL_CYGETMON = CYGETMON; -@@ -978,7 +984,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); +@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); #endif // SANITIZER_LINUX || SANITIZER_FREEBSD @@ -307,7 +343,7 @@ index f12e8206a..8880197b0 100644 CHECK_TYPE_SIZE(glob_t); CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); -@@ -1012,6 +1018,7 @@ CHECK_TYPE_SIZE(iovec); +@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec); CHECK_SIZE_AND_OFFSET(iovec, iov_base); CHECK_SIZE_AND_OFFSET(iovec, iov_len); @@ -315,7 +351,7 @@ index f12e8206a..8880197b0 100644 CHECK_TYPE_SIZE(msghdr); CHECK_SIZE_AND_OFFSET(msghdr, msg_name); CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); -@@ -1025,6 +1032,7 @@ CHECK_TYPE_SIZE(cmsghdr); +@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr); CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); @@ -323,7 +359,7 @@ index f12e8206a..8880197b0 100644 COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); CHECK_SIZE_AND_OFFSET(dirent, d_ino); -@@ -1127,7 +1135,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); +@@ -1138,7 +1145,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); CHECK_TYPE_SIZE(ether_addr); @@ -332,7 +368,7 @@ index f12e8206a..8880197b0 100644 CHECK_TYPE_SIZE(ipc_perm); # if SANITIZER_FREEBSD CHECK_SIZE_AND_OFFSET(ipc_perm, key); -@@ -1188,7 +1196,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); +@@ -1199,7 +1206,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); #endif @@ -341,7 +377,7 @@ index f12e8206a..8880197b0 100644 COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); #endif -@@ -1238,7 +1246,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); +@@ -1249,7 +1256,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); #endif @@ -350,7 +386,7 @@ index f12e8206a..8880197b0 100644 COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); CHECK_SIZE_AND_OFFSET(FILE, _flags); CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); -@@ -1257,7 +1265,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); +@@ -1268,7 +1275,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); CHECK_SIZE_AND_OFFSET(FILE, _fileno); #endif @@ -373,5 +409,5 @@ index e14d5f575..389a3bc88 100644 struct __res_state *statp = (struct __res_state*)state; for (int i = 0; i < MAXNS && cnt < nfd; i++) { -- -2.16.2 +2.18.0 diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix index 16d7e2580b38e..e084a2dcf94bc 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix @@ -2,7 +2,6 @@ let useX11 = stdenv.isi686 || stdenv.isx86_64; - useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 2c76d59512b67..7ed493fe92e96 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -142,7 +142,7 @@ let # FIXME: this is unnecessary once the multiple-outputs branch is merged. preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" + prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}" patchELF $jre propagatedBuildInputs+=" $jre" diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 57771e383279b..5b31bc18b8c2a 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -206,7 +206,7 @@ let # FIXME: this is unnecessary once the multiple-outputs branch is merged. preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" + prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}" patchELF $jre propagatedBuildInputs+=" $jre" diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index b93a13abc9cac..e6e868fdf41b9 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -28,7 +28,7 @@ assert swingSupport -> xorg != null; let - version = "10.0.1"; + version = "10.0.2"; downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; @@ -51,19 +51,19 @@ let result = stdenv.mkDerivation rec { requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jdk10-downloads-4416644.html"; - sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf"; + sha256 = "0arpzac64apji1s8d0gzizkvrjz0fbhz7l34af1j0365ac6w4cv6"; } else if packageType == "JRE" then requireFile { name = "jre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jre10-downloads-4417026.html"; - sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq"; + sha256 = "0pc4a0a3fl6874vfaflf6jvpm9da647vp41pj0hihkspjyjhjabx"; } else if packageType == "ServerJRE" then requireFile { name = "serverjre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/sjre10-downloads-4417025.html"; - sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw"; + sha256 = "0hbcb4c6ncy0sbz02gyygyqcwkz0xpv4fwrx4sripia6vph9592c"; } else abort "unknown package Type ${packageType}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index bdd367ef35238..55faf277b1595 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "171"; + patchVersion = "181"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p"; - sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn"; - sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0"; - sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7"; + sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; + sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; + sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; + sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 901eea0f8f157..55faf277b1595 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "172"; + patchVersion = "181"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa"; - sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818"; - sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln"; - sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s"; + sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; + sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; + sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; + sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index ec93ba79d44ab..f74299334535a 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }: +{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, gputils ? null +, excludePorts ? [] }: + +with stdenv.lib; + +let + # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 + excludedPorts = excludePorts ++ (optionals (gputils == null) [ "pic14" "pic16" ]); +in stdenv.mkDerivation rec { - version = "3.7.0"; name = "sdcc-${version}"; + version = "3.7.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5"; }; - # TODO: remove this comment when gputils != null is tested - buildInputs = [ bison flex boost texinfo gputils ]; + buildInputs = [ autoconf bison boost flex gputils texinfo ]; - configureFlags = '' - ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""} - ''; + configureFlags = map (f: "--disable-${f}-port") excludedPorts; - meta = with stdenv.lib; { + meta = { description = "Small Device C Compiler"; longDescription = '' SDCC is a retargettable, optimizing ANSI - C compiler suite that targets @@ -27,8 +32,8 @@ stdenv.mkDerivation rec { PIC18 targets. It can be retargeted for other microprocessors. ''; homepage = http://sdcc.sourceforge.net/; - license = licenses.gpl2; + license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable; + maintainers = with maintainers; [ bjornfor yorickvp ]; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c7e7cd4f4c3ff..c8d4000f23494 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -244,19 +244,21 @@ self: super: { # base bound digit = doJailbreak super.digit; - # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat - hnix = (overrideCabal super.hnix (old: { + # dontCheck: Can be removed once https://github.com/haskell-nix/hnix/commit/471712f is in (5.2 probably) + # This is due to GenList having been removed from generic-random in 1.2.0.0 + # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably) + # This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though + hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: { patches = old.patches or [] ++ [ # should land in hnix-5.2 (pkgs.fetchpatch { url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch"; sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh"; name = "disable-hpack-test-by-default.patch"; - }) + }) ]; testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ]; - broken = true; # can't cope with deriving-compat 0.5.x. - })); + }))); # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -1100,4 +1102,10 @@ self: super: { unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; # dontCheck: printf double rounding behavior prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter; + + # Fix with Cabal 2.2, https://github.com/guillaume-nargeot/hpc-coveralls/pull/73 + hpc-coveralls = appendPatch super.hpc-coveralls (pkgs.fetchpatch { + url = "https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch"; + sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j"; + }); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 881771a3a4c2b..39c5a177b9282 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -4,8 +4,8 @@ with haskellLib; self: super: { - # Use the latest LLVM. - inherit (pkgs) llvmPackages; + # This compiler version needs llvm 5.x. + llvmPackages = pkgs.llvmPackages_5; # Disable GHC 8.4.x core libraries. array = null; @@ -55,11 +55,8 @@ self: super: { # package's version constraints. xmonad-extras = doJailbreak super.xmonad-extras; - # This package desperately needs a maintainer. - xmobar = super.xmobar.overrideScope (self: super: { - hinotify = self.hinotify_0_3_9; # https://github.com/jaor/xmobar/issues/356 - dbus = self.dbus_0_10_15; # https://github.com/jaor/xmobar/issues/346 - }); + # https://github.com/jaor/xmobar/issues/356 + xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; }); hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index bc540cbe36d65..42712df3295b8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -4,8 +4,8 @@ with haskellLib; self: super: { - # Use the latest LLVM. - inherit (pkgs) llvmPackages; + # This compiler version needs llvm 5.x. + llvmPackages = pkgs.llvmPackages_5; # Disable GHC 8.6.x core libraries. array = null; @@ -44,4 +44,17 @@ self: super: { # Use to be a core-library, but no longer is since GHC 8.4.x. hoopl = self.hoopl_3_10_2_2; + # lts-12.x versions do not compile. + primitive = self.primitive_0_6_4_0; + tagged = self.tagged_0_8_6; + + # Over-specified constraints. + async = doJailbreak super.async; # base >=4.3 && <4.12, stm >=2.2 && <2.5 + ChasingBottoms = doJailbreak super.ChasingBottoms; # base >=4.2 && <4.12, containers >=0.3 && <0.6 + hashable = doJailbreak super.hashable; # base >=4.4 && <4.1 + hashable-time = doJailbreak super.hashable-time; # base >=4.7 && <4.12 + integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12 + tar = doJailbreak super.tar; # containers >=0.2 && <0.6 + test-framework = doJailbreak super.test-framework; # containers >=0.1 && <0.6 + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 93a39beb8a9dc..99f4cd87ce56d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -4,8 +4,8 @@ with haskellLib; self: super: { - # Use the latest LLVM. - inherit (pkgs) llvmPackages; + # This compiler version needs llvm 5.x. + llvmPackages = pkgs.llvmPackages_5; # Disable GHC 8.7.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index f1a60f5ea878f..c79406a947278 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -23,6 +23,11 @@ self: super: }; in stage1 // stage2 // { + # GHCJS does not ship with the same core packages as GHC. + # https://github.com/ghcjs/ghcjs/issues/676 + stm = self.stm_2_4_5_0; + ghc-compact = self.ghc-compact_0_1_0_0; + network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); @@ -121,7 +126,6 @@ self: super: }); ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: { - setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.buildHaskellPackages.Cabal_1_24_2_0 ]; libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ]; isLibrary = true; }); @@ -197,4 +201,11 @@ self: super: base-orphans = dontCheck super.base-orphans; distributive = dontCheck super.distributive; + + # https://github.com/glguy/th-abstraction/issues/53 + th-abstraction = dontCheck super.th-abstraction; + # https://github.com/dreixel/syb/issues/21 + syb = dontCheck super.syb; + # https://github.com/ghcjs/ghcjs/issues/677 + hspec-core = dontCheck super.hspec-core; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1daaf3409b5a5..f50b02a7a9562 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: default-package-overrides: # Newer versions require contravariant-1.5.*, which many builds refuse at the moment. - base-compat-batteries ==0.10.1 - # LTS Haskell 12.0 + # LTS Haskell 12.1 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -217,7 +217,7 @@ default-package-overrides: - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - - autoexporter ==1.1.9 + - autoexporter ==1.1.10 - auto-update ==0.1.4 - avro ==0.3.2.0 - avwx ==0.3.0.2 @@ -232,7 +232,7 @@ default-package-overrides: - base64-string ==0.2 - base-compat ==0.10.4 - base-compat-batteries ==0.10.1 - - basement ==0.0.7 + - basement ==0.0.8 - base-orphans ==0.7 - base-prelude ==1.3 - base-unicode-symbols ==0.2.2.4 @@ -302,7 +302,7 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.37.1 + - brick ==0.37.2 - brittany ==0.11.0.0 - broadcast-chan ==0.1.1 - bsb-http-chunked ==0.0.0.2 @@ -424,7 +424,7 @@ default-package-overrides: - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 - - composition-prelude ==1.5.0.6 + - composition-prelude ==1.5.0.8 - compressed ==3.11 - concise ==0.1.0.1 - concurrency ==1.6.0.0 @@ -495,7 +495,7 @@ default-package-overrides: - crypto-random ==0.0.9 - crypto-random-api ==0.2.0 - crypt-sha512 ==0 - - csg ==0.1.0.3 + - csg ==0.1.0.4 - csp ==1.4.0 - css-syntax ==0.0.7 - css-text ==0.1.3.0 @@ -557,13 +557,13 @@ default-package-overrides: - Decimal ==0.5.1 - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - - dejafu ==1.11.0.1 + - dejafu ==1.11.0.3 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - deque ==0.2.1 - - deriving-compat ==0.5 - - derulo ==1.0.2 + - deriving-compat ==0.5.1 + - derulo ==1.0.3 - detour-via-sci ==1.0.0 - df1 ==0.1.1 - dhall ==1.15.1 @@ -653,7 +653,7 @@ default-package-overrides: - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - email-validate ==2.3.2.6 - - enclosed-exceptions ==1.0.2 + - enclosed-exceptions ==1.0.3 - entropy ==0.4.1.1 - enummapset ==0.5.2.2 - enumset ==0.0.4.1 @@ -677,7 +677,7 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.1.4 + - eventstore ==1.1.5 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.3 @@ -695,7 +695,7 @@ default-package-overrides: - exp-pairs ==0.1.6.0 - extensible ==0.4.9 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.8 + - extra ==1.6.9 - extractable-singleton ==0.0.1 - extrapolate ==0.3.1 - facts ==0.0.1.0 @@ -729,7 +729,7 @@ default-package-overrides: - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - fingertree ==0.1.4.1 - - finite-typelits ==0.1.3.0 + - finite-typelits ==0.1.4.2 - first-class-patterns ==0.3.2.4 - fixed ==0.2.1.1 - fixed-length ==0.2 @@ -741,7 +741,7 @@ default-package-overrides: - flay ==0.4 - flexible-defaults ==0.0.2 - floatshow ==0.2.4 - - flow ==1.0.13 + - flow ==1.0.14 - fmlist ==0.9.2 - fn ==0.3.0.2 - focus ==0.1.5.2 @@ -757,7 +757,7 @@ default-package-overrides: - forma ==1.1.0 - format-numbers ==0.1.0.0 - formatting ==6.3.6 - - foundation ==0.0.20 + - foundation ==0.0.21 - free ==5.0.2 - freenect ==1.2.1 - freer-simple ==1.1.0.0 @@ -819,12 +819,12 @@ default-package-overrides: - ghcjs-codemirror ==0.0.0.2 - ghc-parser ==0.2.0.2 - ghc-paths ==0.1.0.9 - - ghc-prof ==1.4.1.2 + - ghc-prof ==1.4.1.3 - ghc-syntax-highlighter ==0.0.2.0 - ghc-tcplugins-extra ==0.3 - - ghc-typelits-extra ==0.2.5 - - ghc-typelits-knownnat ==0.5 - - ghc-typelits-natnormalise ==0.6.1 + - ghc-typelits-extra ==0.2.6 + - ghc-typelits-knownnat ==0.5.1 + - ghc-typelits-natnormalise ==0.6.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.15 - gi-cairo ==1.0.17 @@ -841,7 +841,7 @@ default-package-overrides: - gi-pango ==1.0.16 - giphy-api ==0.6.0.1 - github ==0.19 - - github-release ==1.2.1 + - github-release ==1.2.2 - github-types ==0.2.1 - github-webhooks ==0.10.0 - gitrev ==1.3.1 @@ -888,7 +888,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.7 + - hapistrano ==0.3.5.8 - happstack-server ==7.5.1.1 - happy ==1.19.9 - hasbolt ==0.1.3.0 @@ -911,14 +911,14 @@ default-package-overrides: - haskell-src-exts-simple ==1.20.0.0 - haskell-src-exts-util ==0.2.3 - haskell-src-meta ==0.8.0.3 - - haskell-tools-ast ==1.1.0.1 - - haskell-tools-backend-ghc ==1.1.0.1 - - haskell-tools-builtin-refactorings ==1.1.0.1 - - haskell-tools-debug ==1.1.0.1 - - haskell-tools-demo ==1.1.0.1 - - haskell-tools-prettyprint ==1.1.0.1 - - haskell-tools-refactor ==1.1.0.1 - - haskell-tools-rewrite ==1.1.0.1 + - haskell-tools-ast ==1.1.0.2 + - haskell-tools-backend-ghc ==1.1.0.2 + - haskell-tools-builtin-refactorings ==1.1.0.2 + - haskell-tools-debug ==1.1.0.2 + - haskell-tools-demo ==1.1.0.2 + - haskell-tools-prettyprint ==1.1.0.2 + - haskell-tools-refactor ==1.1.0.2 + - haskell-tools-rewrite ==1.1.0.2 - haskey ==0.3.0.2 - haskey-btree ==0.3.0.0 - haskey-mtl ==0.3.1.0 @@ -973,7 +973,7 @@ default-package-overrides: - hmpfr ==0.4.4 - Hoed ==0.5.1 - hoopl ==3.10.2.2 - - hOpenPGP ==2.7 + - hOpenPGP ==2.7.1 - hopenpgp-tools ==0.21.1 - hopfli ==0.2.2.1 - hostname ==1.0 @@ -995,8 +995,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.5 - hs-functors ==0.1.2.0 - hs-GeoIP ==0.3 @@ -1044,7 +1044,7 @@ default-package-overrides: - http2 ==1.6.3 - http-api-data ==0.3.8.1 - http-client ==0.5.13.1 - - http-client-openssl ==0.2.1.1 + - http-client-openssl ==0.2.2.0 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - http-conduit ==2.3.2 @@ -1065,7 +1065,7 @@ default-package-overrides: - hw-conduit ==0.2.0.3 - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 - - hw-excess ==0.2.0.0 + - hw-excess ==0.2.0.2 - hw-fingertree-strict ==0.1.1.1 - hw-hedgehog ==0.1.0.1 - hw-hspec-hedgehog ==0.1.0.5 @@ -1127,7 +1127,7 @@ default-package-overrides: - IntervalMap ==0.6.0.0 - intervals ==0.8.1 - intro ==0.3.1.0 - - invariant ==0.5 + - invariant ==0.5.1 - invertible ==0.2.0.5 - invertible-grammar ==0.1.1 - io-choice ==0.0.6 @@ -1164,7 +1164,7 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.9.2 - - json-feed ==1.0.2 + - json-feed ==1.0.3 - json-rpc-client ==0.2.5.0 - json-rpc-generic ==0.2.1.4 - json-rpc-server ==0.2.6.0 @@ -1188,17 +1188,17 @@ default-package-overrides: - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.4 + - lackey ==1.0.5 - LambdaHack ==0.8.3.0 - lame ==0.1.1 - language-c ==0.8.1 - language-c-quote ==0.12.2 - - language-docker ==6.0.3 + - language-docker ==6.0.4 - language-ecmascript ==0.19 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - language-puppet ==1.3.19 + - language-puppet ==1.3.19.1 - lapack-carray ==0.0.2 - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.0.1 @@ -1300,7 +1300,7 @@ default-package-overrides: - median-stream ==0.7.0.0 - med-module ==0.1.1 - megaparsec ==6.5.0 - - mega-sdist ==0.3.3 + - mega-sdist ==0.3.3.1 - memory ==0.14.16 - MemoTrie ==0.6.9 - mercury-api ==0.1.0.1 @@ -1309,7 +1309,7 @@ default-package-overrides: - messagepack-rpc ==0.5.1 - metrics ==0.4.1.1 - mfsolve ==0.3.2.0 - - microformats2-parser ==1.0.1.8 + - microformats2-parser ==1.0.1.9 - microlens ==0.4.9.1 - microlens-aeson ==2.3.0 - microlens-contra ==0.1.0.1 @@ -1505,7 +1505,7 @@ default-package-overrides: - pandoc-types ==1.17.5.1 - pango ==0.13.5.0 - papillon ==0.1.0.6 - - parallel ==3.2.1.1 + - parallel ==3.2.2.0 - parallel-io ==0.3.3 - parseargs ==0.2.0.8 - parsec ==3.1.13.0 @@ -1610,7 +1610,7 @@ default-package-overrides: - prettyprinter-compat-wl-pprint ==1.0.0.1 - prettyprinter-convert-ansi-wl-pprint ==1.1 - pretty-show ==1.7 - - pretty-simple ==2.1.0.0 + - pretty-simple ==2.1.0.1 - pretty-types ==0.2.3.1 - primes ==0.2.1.0 - primitive ==0.6.3.0 @@ -1676,10 +1676,10 @@ default-package-overrides: - rank2classes ==1.1.0.1 - Rasterific ==0.7.3 - rasterific-svg ==0.3.3.1 - - ratel ==1.0.4 - - ratel-wai ==1.0.2 + - ratel ==1.0.5 + - ratel-wai ==1.0.3 - ratio-int ==0.1.2 - - rattletrap ==4.1.1 + - rattletrap ==4.1.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 @@ -1713,7 +1713,7 @@ default-package-overrides: - regex-tdfa-text ==1.0.0.3 - reinterpret-cast ==0.1.0 - relational-query ==0.12.0.1 - - relational-query-HDBC ==0.7.0.0 + - relational-query-HDBC ==0.7.0.1 - relational-record ==0.2.2.0 - relational-schemas ==0.1.6.2 - renderable ==0.2.0.1 @@ -1754,7 +1754,7 @@ default-package-overrides: - safe-money ==0.6 - SafeSemaphore ==0.10.1 - saltine ==0.1.0.1 - - salve ==1.0.3 + - salve ==1.0.4 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.3 @@ -1762,8 +1762,8 @@ default-package-overrides: - sandman ==0.2.0.1 - say ==0.1.0.0 - sbp ==2.3.16 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1824,10 +1824,10 @@ default-package-overrides: - servant-tracing ==0.1.0.2 - servant-websockets ==1.1.0 - servant-yaml ==0.1.0.0 - - serverless-haskell ==0.6.1 + - serverless-haskell ==0.6.2 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - - servius ==1.2.0.3 + - servius ==1.2.1.0 - ses-html ==0.4.0.0 - set-cover ==0.0.9 - setenv ==0.1.1.3 @@ -1887,7 +1887,7 @@ default-package-overrides: - speculation ==1.5.0.3 - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 - - Spintax ==0.3.2 + - Spintax ==0.3.3 - splice ==0.6.1.1 - split ==0.2.3.3 - splitmix ==0.0.1 @@ -1927,7 +1927,7 @@ default-package-overrides: - store ==0.5.0 - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - - stratosphere ==0.24.1 + - stratosphere ==0.24.3 - streaming ==0.2.1.0 - streaming-attoparsec ==1.0.0 - streaming-bytestring ==0.1.6 @@ -1947,7 +1947,7 @@ default-package-overrides: - string-qq ==0.0.2 - stringsearch ==0.3.6.6 - string-transform ==1.1.0 - - strive ==5.0.5 + - strive ==5.0.6 - structs ==0.1.1 - stylish-haskell ==0.9.2.0 - summoner ==1.0.4 @@ -2184,7 +2184,7 @@ default-package-overrides: - vector-bytes-instances ==0.1.1 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-sized ==1.0.3.0 + - vector-sized ==1.0.4.0 - vector-space ==0.13 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 @@ -2192,7 +2192,7 @@ default-package-overrides: - verbosity ==0.2.3.0 - versions ==3.4.0.1 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.18 + - viewprof ==0.0.0.19 - vinyl ==0.8.1.1 - vivid ==0.3.0.2 - vivid-osc ==0.3.0.0 @@ -2205,7 +2205,7 @@ default-package-overrides: - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.22.1 + - wai-extra ==3.0.23.0 - wai-handler-launch ==3.0.2.4 - wai-logger ==2.3.2 - wai-middleware-caching ==0.1.0.2 @@ -2221,7 +2221,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - - warp ==3.2.22 + - warp ==3.2.23 - warp-tls ==3.2.4.3 - warp-tls-uid ==0.2.0.5 - wave ==0.1.5 @@ -2269,7 +2269,7 @@ default-package-overrides: - writer-cps-mtl ==0.1.1.4 - writer-cps-transformers ==0.1.1.3 - ws ==0.0.4 - - wuss ==1.1.9 + - wuss ==1.1.10 - X11 ==1.9 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2303,22 +2303,22 @@ default-package-overrides: - xml-types ==0.3.6 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yaml ==0.8.31.1 + - yaml ==0.8.32 - yeshql ==4.1.0.0 - yeshql-core ==4.1.0.0 - yeshql-hdbc ==4.1.0.0 - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - - yesod-auth ==1.6.3 + - yesod-auth ==1.6.4.1 - yesod-auth-fb ==1.9.0 - yesod-auth-hashdb ==1.7 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.5 + - yesod-core ==1.6.6 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.1 - - yesod-form-bootstrap4 ==1.0.0 + - yesod-form ==1.6.2 + - yesod-form-bootstrap4 ==1.0.2 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.0.0 - yesod-newsfeed ==1.6.1.0 @@ -2327,7 +2327,7 @@ default-package-overrides: - yesod-recaptcha2 ==0.2.4 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0 - - yesod-test ==1.6.4 + - yesod-test ==1.6.5 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0 - yes-precure5-command ==5.5.3 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2e3a8e1c867db..4e62d47050635 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -421,16 +421,6 @@ self: super: builtins.intersectAttrs super { # so disable this on Darwin only ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; - idris = overrideCabal super.idris (drv: { - # https://github.com/idris-lang/Idris-dev/issues/2499 - librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp]; - - # tests and build run executable, so need to set LD_LIBRARY_PATH - preBuild = '' - export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH" - ''; - }); - libsystemd-journal = overrideCabal super.libsystemd-journal (old: { librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; }); @@ -452,7 +442,7 @@ self: super: builtins.intersectAttrs super { then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa else dontCheck super.fsnotify; - hidapi = addExtraLibrary super.hidapi pkgs.libudev; + hidapi = addExtraLibrary super.hidapi pkgs.udev; hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; @@ -504,7 +494,7 @@ self: super: builtins.intersectAttrs super { # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; colour = dontCheck super.colour; - manifolds = super.manifolds.override { spatial-rotations = dontCheck self.spatial-rotations; }; + spatial-rotations = dontCheck super.spatial-rotations; LDAP = dontCheck (overrideCabal super.LDAP (drv: { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d1304c7969499..80274f515c52f 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -160,6 +160,9 @@ let "--enable-library-for-ghci" # TODO: Should this be configurable? ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ "--ghc-option=-split-sections" + ] ++ optionals dontStrip [ + "--disable-library-stripping" + "--disable-executable-stripping" ] ++ optionals isGhcjs [ "--ghcjs" ] ++ optionals isCross ([ @@ -391,6 +394,9 @@ stdenv.mkDerivation ({ local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) mv $packageConfFile $packageConfDir/$pkgId.conf done + + # delete confdir if there are no libraries + find $packageConfDir -maxdepth 0 -empty -delete; ''} ${optionalString isGhcjs '' for exeDir in "$out/bin/"*.jsexe; do diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 9ea9dae02db17..591de1236d429 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation (args // { buildInputs = buildInputs ++ - optional stdenv.isLinux glibcLocales ++ + optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++ [ ghc pkgconfig stack ]; STACK_PLATFORM_VARIANT="nix"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 43bf0faf07840..5816f295e0d67 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2891,6 +2891,7 @@ self: { libraryHaskellDepends = [ base parsec text vector ]; executableHaskellDepends = [ base cmdargs either-unwrap ]; testHaskellDepends = [ base hspec hspec-discover parsec text ]; + testToolDepends = [ hspec-discover ]; description = "Libary for parsing Clustal tools output"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -5019,8 +5020,8 @@ self: { ({ mkDerivation, base, cudart, hspec, inline-c }: mkDerivation { pname = "FAI"; - version = "0.1.0.10"; - sha256 = "0hg1598cb44p8bk3a70qahxsvfs8qfm08zzp516b6wg54ky26npg"; + version = "0.1.0.17"; + sha256 = "06z0ikx9i8z9hm7mlmlvdhy57k5dn7qayg2cpas767zvvxjiaayy"; libraryHaskellDepends = [ base inline-c ]; librarySystemDepends = [ cudart ]; testHaskellDepends = [ base hspec inline-c ]; @@ -6051,6 +6052,7 @@ self: { array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; + libraryToolDepends = [ hpp ]; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -10133,8 +10135,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.2.6"; - sha256 = "1dshvq3amnwfvf50g4gs93rc307sk1hi3snjhflzjz0dfn8xa2d4"; + version = "0.3.0"; + sha256 = "0dz0ar75nd04l1cbca7iz9laqv24mach7ajr4k5ibl2717kczkpa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10149,7 +10151,7 @@ self: { testHaskellDepends = [ aeson base hspec http-client http-types vector ]; - description = "A RESTful Web Service for IPv6-related data"; + description = "A RESTful microService for IPv6-related data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -13310,14 +13312,19 @@ self: { }) {}; "OTP" = callPackage - ({ mkDerivation, base, Crypto, time }: + ({ mkDerivation, base, bytestring, cryptohash-sha1 + , cryptohash-sha256, cryptohash-sha512, tasty, tasty-hunit, time + }: mkDerivation { pname = "OTP"; - version = "0.0.0.1"; - sha256 = "0vcxyfk1vx30cfngq5cv3lc34x0sxsirykhbi4ygw5pvd9ylzadb"; - libraryHaskellDepends = [ base Crypto time ]; - testHaskellDepends = [ base Crypto time ]; - description = "HMAC-Based and Time-Based One-Time Passwords"; + version = "0.1.0.0"; + sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb"; + libraryHaskellDepends = [ + base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 + time + ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit time ]; + description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)"; license = stdenv.lib.licenses.mit; }) {}; @@ -13386,8 +13393,8 @@ self: { }: mkDerivation { pname = "Octree"; - version = "0.6.0.0"; - sha256 = "1inyjclxx856gxrxdph649s5kdy2xf0lwr8g57rkqnpqpmprj797"; + version = "0.6.0.1"; + sha256 = "00f4ck5ln8svjjs5by6k82dg9xrjfckg6whccncmd86rql59n74z"; libraryHaskellDepends = [ base deepseq lens linear QuickCheck ]; testHaskellDepends = [ base deepseq lens linear QuickCheck ]; benchmarkHaskellDepends = [ @@ -15599,12 +15606,13 @@ self: { }) {}; "SDL" = callPackage - ({ mkDerivation, base, SDL }: + ({ mkDerivation, base, Cabal, SDL }: mkDerivation { pname = "SDL"; - version = "0.6.6.0"; - sha256 = "0wpddhq5vwm2m1q8ja1p6draz4f40p1snmdshxwqnyyj3nchqz0z"; + version = "0.6.7.0"; + sha256 = "00y67v80a8l09i3k76z09lg25kw72ivl09nag8ckdlk4a0cfnzfq"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ SDL ]; description = "Binding to libSDL"; @@ -15612,12 +15620,13 @@ self: { }) {inherit (pkgs) SDL;}; "SDL-gfx" = callPackage - ({ mkDerivation, base, SDL, SDL_gfx }: + ({ mkDerivation, base, Cabal, SDL, SDL_gfx }: mkDerivation { pname = "SDL-gfx"; - version = "0.6.0.2"; - sha256 = "1i8dfyi0cdhm2mad7fk2dd8qdc3lpbjw52s67vyxi4r1b8rka05b"; + version = "0.6.1.0"; + sha256 = "0sicq48cp9j5b5hpa1s53y505ny0snn2k73f15a4gwh1n5abdxzm"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_gfx ]; description = "Binding to libSDL_gfx"; @@ -15625,14 +15634,13 @@ self: { }) {inherit (pkgs) SDL_gfx;}; "SDL-image" = callPackage - ({ mkDerivation, base, SDL, SDL_image }: + ({ mkDerivation, base, Cabal, SDL, SDL_image }: mkDerivation { pname = "SDL-image"; - version = "0.6.1.2"; - sha256 = "1ybdwlqi5nqzpsbh2md5mxhwmjn910iqysf6nykwjxlmvhcjk281"; - revision = "1"; - editedCabalFile = "0syx3032z15mnvi2apqsml065xk1i5i9jixwv022a9mimlk710vy"; + version = "0.6.2.0"; + sha256 = "1gxwrvswgwjw6g7ym52gik22l9l3ljy592phv97jdmcf3gi6qcg1"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_image ]; description = "Binding to libSDL_image"; @@ -15640,14 +15648,13 @@ self: { }) {inherit (pkgs) SDL_image;}; "SDL-mixer" = callPackage - ({ mkDerivation, base, SDL, SDL_mixer }: + ({ mkDerivation, base, Cabal, SDL, SDL_mixer }: mkDerivation { pname = "SDL-mixer"; - version = "0.6.2.0"; - sha256 = "1fhray79d80dk2aj9mx3ks05mm48sd832g8zgxli226jx471fs8r"; - revision = "1"; - editedCabalFile = "193wigk1c7i4lxkwkj4kd2fzymwg586ky9h7fpsa1cqmz12sc5wz"; + version = "0.6.3.0"; + sha256 = "0k26hqgdh789ka3mv4dsk6rin6x6vwcs6hjmnsqq7j3mnrh1342r"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; @@ -15668,12 +15675,13 @@ self: { }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage - ({ mkDerivation, base, SDL, SDL_ttf }: + ({ mkDerivation, base, Cabal, SDL, SDL_ttf }: mkDerivation { pname = "SDL-ttf"; - version = "0.6.2.2"; - sha256 = "16blaa55jiyrailhv9cjrr7wrp8m6pssj0jfz2p6631g4vqy888n"; + version = "0.6.3.0"; + sha256 = "1hh5v1b5b8yyv1vhgbymn6rwpjpdccmqz2wy1wmjqzcfffdszmag"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_ttf ]; description = "Binding to libSDL_ttf"; @@ -16782,8 +16790,8 @@ self: { ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: mkDerivation { pname = "Spintax"; - version = "0.3.2"; - sha256 = "0j7hkdskc66h02yxrw6aah1drqrwxdhq9c33w5mg0rg0gj0j1rpp"; + version = "0.3.3"; + sha256 = "04vb07r26p4rxgsym5zhqsnyx4sr2a112sa31mdda5hjpy9j3pr1"; libraryHaskellDepends = [ attoparsec base extra mtl mwc-random text ]; @@ -20906,8 +20914,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; - revision = "5"; - editedCabalFile = "0hwla9xz275qzgn9n07311ksl3j40izidki1nbhmrmmmfjin57cv"; + revision = "6"; + editedCabalFile = "0zq9j2hgapb9blvmd9y8kmczizw4a18kksnfqd1py1jzx7hr46n3"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -23005,6 +23013,7 @@ self: { testHaskellDepends = [ aeson base tasty tasty-discover tasty-hunit ]; + testToolDepends = [ tasty-discover ]; description = "A client implementing the Algolia search API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -29044,6 +29053,7 @@ self: { base hedgehog HUnit safe-exceptions tasty tasty-discover tasty-hedgehog tasty-hunit universum ]; + testToolDepends = [ tasty-discover ]; description = "Async combinators"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -29919,6 +29929,7 @@ self: { testHaskellDepends = [ attoparsec base hspec markdown-unlit QuickCheck text ]; + testToolDepends = [ markdown-unlit ]; description = "An Attoparsec compatibility layer for Parsec"; license = stdenv.lib.licenses.mit; }) {}; @@ -30300,8 +30311,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.9"; - sha256 = "0hm0njnfgjfbnpjjqmhim773zbzgkfq96caxckcv8vkrj78l839v"; + version = "1.1.10"; + sha256 = "0rf28h7nzm5ngcrj1900d0vgwbfr1y3s4q7wwbvdw2mg29rw4f0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -32414,23 +32425,11 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; - version = "0.0.7"; - sha256 = "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm"; - libraryHaskellDepends = [ base ghc-prim ]; - description = "Foundation scrap box of array & string"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "basement_0_0_8" = callPackage - ({ mkDerivation, base, ghc-prim }: - mkDerivation { - pname = "basement"; version = "0.0.8"; sha256 = "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67"; libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "basen-bytestring" = callPackage @@ -32680,8 +32679,8 @@ self: { }: mkDerivation { pname = "battleplace"; - version = "0.1.0.5"; - sha256 = "0n0ry8gssd6rnhgsj0q24bbf8ad8wqjqmkxdrn0lxmd6bgj52bv9"; + version = "0.1.0.6"; + sha256 = "01w1im8p4mxbbq8h12kbqzqzr8db41hjprcjlfs1x6wz263ipg1v"; libraryHaskellDepends = [ aeson base bytestring cereal data-default hashable memory servant text vector @@ -32694,8 +32693,8 @@ self: { ({ mkDerivation, base, battleplace, servant, servant-client }: mkDerivation { pname = "battleplace-api"; - version = "0.1.0.1"; - sha256 = "1pi1vcniyrpq1xfrizhvgw7xbrc332649zg4jl1fjbqn4l4xqrlg"; + version = "0.1.0.2"; + sha256 = "148bl4r7fhqrbr8fr4hsgqbyykb7w8q2hi1d8pzk20nkvsrh62ss"; libraryHaskellDepends = [ base battleplace servant servant-client ]; @@ -33232,16 +33231,15 @@ self: { }) {}; "bench-graph" = callPackage - ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, csv - , directory, filepath, split, text, transformers, Unique + ({ mkDerivation, base, Chart, Chart-diagrams, csv, directory + , filepath, split, text, transformers }: mkDerivation { pname = "bench-graph"; - version = "0.1.0"; - sha256 = "0cmb15q4yrgi8f78ijgn8h51g2f183maslffh4l4dxmi2aqn7z8q"; + version = "0.1.3"; + sha256 = "15xsaqxms61p8d5r0lsxhlrdfh451ha6fpldcmh8vcw0q4yb1q47"; libraryHaskellDepends = [ - base bytestring Chart Chart-diagrams csv directory filepath - transformers Unique + base Chart Chart-diagrams csv directory filepath transformers ]; testHaskellDepends = [ base split text ]; description = "Plot and compare benchmarks"; @@ -33545,8 +33543,8 @@ self: { }: mkDerivation { pname = "bhoogle"; - version = "0.1.2.9"; - sha256 = "0cgvwmk9ck9xvpa11vvdd703bx2wd1czcin3g68zyy416v6xwyki"; + version = "0.1.3.1"; + sha256 = "1v1g1lq86zsr6qf3c48pblrqz8g321dzn7v5gh3ddm6fpd5sdbp4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35717,6 +35715,7 @@ self: { scientific semigroups string-conversions tagged test-framework test-framework-quickcheck2 text tf-random time transformers ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ aeson base base16-bytestring blockchain-restful-address-index-api bytestring cereal criterion data-default-class deepseq either @@ -38131,8 +38130,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.37.1"; - sha256 = "04rpiafw7a30drbk8gmp01m6l3iawayy1ma1hn8m257rh2zk66qy"; + version = "0.37.2"; + sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38145,7 +38144,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_37_2" = callPackage + "brick_0_38" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, QuickCheck, stm, template-haskell, text @@ -38153,8 +38152,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.37.2"; - sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w"; + version = "0.38"; + sha256 = "03jczlp361al1vjqd6pi88plmzh83w4jjbzlx80d3m5n9lqpzx56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38945,6 +38944,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) bullet;}; + "bulletproofs" = callPackage + ({ mkDerivation, arithmoi, base, containers, cryptonite, memory + , protolude, QuickCheck, tasty, tasty-discover, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "bulletproofs"; + version = "0.1.0"; + sha256 = "1axm943r0hx5g8a36s4166sf1ifppbd8m6nx25xn7lf27fvsbw9q"; + revision = "1"; + editedCabalFile = "08wgmhrlfv99zcgwd7mqjaz5hnhz4h3a3afzdxnclvzmmqd30njv"; + libraryHaskellDepends = [ + arithmoi base containers cryptonite memory protolude text + ]; + testHaskellDepends = [ + arithmoi base containers cryptonite memory protolude QuickCheck + tasty tasty-discover tasty-hunit tasty-quickcheck text + ]; + testToolDepends = [ tasty-discover ]; + license = stdenv.lib.licenses.asl20; + }) {}; + "bumper" = callPackage ({ mkDerivation, base, Cabal, containers, fclabels, process , regex-compat, split, strict @@ -39785,8 +39806,8 @@ self: { ({ mkDerivation, base, Cabal, HUnit, QuickCheck, safe }: mkDerivation { pname = "byteunits"; - version = "0.4.0.1"; - sha256 = "012n5gry1a3x4qwqbndgzrq0f90hvgkal48c8s9dylh1n6pi871l"; + version = "0.4.0.2"; + sha256 = "1mdkpmqwszllz2yyhssic02k5g7m8hwnd5wghi4vf970g6m6skpp"; libraryHaskellDepends = [ base safe ]; testHaskellDepends = [ base Cabal HUnit QuickCheck ]; description = "Human friendly conversion between byte units (KB, MB, GB...)"; @@ -40918,8 +40939,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.9.3"; - sha256 = "10l1k8rilf032v6pchwhxaq53mr0d08h6xkllidc3c7wfkzcx7qj"; + version = "2.10.1"; + sha256 = "1xwfr53flc2cv7gk583ycmiw7v9x93v1gvhiy6ilqw8a8915vncb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40962,6 +40983,27 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "cabal2spec_2_2_0" = callPackage + ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty + , tasty-golden, time + }: + mkDerivation { + pname = "cabal2spec"; + version = "2.2.0"; + sha256 = "0pcai2ikp6gna1h60dihclq7apj9jczwz4n0lnfc9fr176gzsprp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal filepath time ]; + executableHaskellDepends = [ + base Cabal filepath optparse-applicative + ]; + testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; + description = "Convert Cabal files into rpm spec files"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "cabalQuery" = callPackage ({ mkDerivation, base, Cabal, containers, directory, MissingH , pretty @@ -42359,6 +42401,8 @@ self: { pname = "casr-logbook"; version = "0.3.0"; sha256 = "1hbrvwpr5crrnqwsi9i2pcw89rpy5fy3dg40al1318lmxp6miznh"; + revision = "1"; + editedCabalFile = "03llwc37nhb4syw8a7wsp8n1135x57q9xacakfzw2rm5gby7hywm"; libraryHaskellDepends = [ base containers digit lens lucid text time ]; @@ -42518,6 +42562,8 @@ self: { pname = "casr-logbook-types"; version = "0.0.2"; sha256 = "1dnbmxgfpx953sk9rmpxqzs9mgzgmyp2r55ll9knrfijavfr3arv"; + revision = "1"; + editedCabalFile = "1klq48y2wis4zaqs3lbs3bm8whqaglcayasf9qfrqjjzddjd20ms"; libraryHaskellDepends = [ base containers digit lens time ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -45685,6 +45731,7 @@ self: { sha256 = "18r8lgzyscxnw6xdxg0jxvp2977i02fjh3n5p89fnd8qrh0r2kl4"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-discover mtl text ]; + testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45719,6 +45766,7 @@ self: { web-routes-happstack web-routes-hsp web-routes-th xss-sanitize ]; librarySystemDepends = [ openssl ]; + libraryToolDepends = [ hsx2hs ]; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -45885,6 +45933,7 @@ self: { uuid-orphans web-plugins web-routes web-routes-happstack web-routes-th ]; + libraryToolDepends = [ hsx2hs ]; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -45903,6 +45952,7 @@ self: { base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro mtl text web-plugins ]; + libraryToolDepends = [ hsx2hs ]; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -46403,6 +46453,7 @@ self: { aeson base cassava deepseq hashable hspec markdown-unlit persistent QuickCheck text vector ]; + testToolDepends = [ markdown-unlit ]; description = "Integers bounded by a closed interval"; license = stdenv.lib.licenses.mit; }) {}; @@ -48941,8 +48992,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.5.0.6"; - sha256 = "13rjy6i48nsy3nqk79b4cqgiapjg11knzkzajmxy6ps6iq308vjn"; + version = "1.5.0.8"; + sha256 = "1pgpjmb5pnnil98h6xrr9vmxxn8hgh20k9gjzm3jqzmx0l6dyspc"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -50292,6 +50343,7 @@ self: { pretty-show QuickCheck scientific string-conversions unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; description = "parser for config files, shell variables, command line args"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50477,6 +50529,7 @@ self: { testHaskellDepends = [ base data-default doctest markdown-unlit pretty-show ]; + testToolDepends = [ markdown-unlit ]; description = "Tools for functors from Hask^k to Hask"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -50845,8 +50898,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.1.1.0"; - sha256 = "0p52j96kcgrdiccx48j24jdfsfhwi3n3x2rq75n660qrqiab2gf2"; + version = "2.1.2.0"; + sha256 = "1fgnb4q5bbad6rmknclvwv79s593r054x7iafrhj3czrfzg94dfx"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -52799,6 +52852,7 @@ self: { hspec-discover HTTP http-types lens lifted-async lifted-base monad-control mtl text transformers transformers-base ]; + testToolDepends = [ hspec-discover ]; description = "HTTP Racing Library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -54107,8 +54161,8 @@ self: { }: mkDerivation { pname = "csg"; - version = "0.1.0.3"; - sha256 = "17ysbi3585ag7a098lv7wjr4xsjm8mm3zz5hfvz2ahis2g151ipx"; + version = "0.1.0.4"; + sha256 = "1dril9ayqng04s6jnh28r8by604kkygbjiblp2c4px0bqvz3g5cx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56548,8 +56602,8 @@ self: { pname = "data-interval"; version = "1.3.0"; sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9"; - revision = "1"; - editedCabalFile = "09n6gklg64lgn4x1f48ga9ynssyl4fm8x376blls1mx1xg6kgbz6"; + revision = "2"; + editedCabalFile = "16frb3rlkca5z30lwhw8vpwi4g1y42scvg8v41lvih90jq82pg2s"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -57086,10 +57140,8 @@ self: { ({ mkDerivation, base, hashable, unordered-containers }: mkDerivation { pname = "data-standards"; - version = "0.1.0.0"; - sha256 = "014fk5lsj35iax9amgcn0r9kifyr2ar3afi4zs651l1xl7csmywz"; - revision = "1"; - editedCabalFile = "0g4hlyzkski4zha53w6asanjnk9s2jp5dgql353szm4flldfsx07"; + version = "0.1.0.1"; + sha256 = "0nx8hgv653nh138f9s2x36hwv92sbj5wzl4isaylxn12qqlwx94d"; libraryHaskellDepends = [ base hashable unordered-containers ]; description = "A collection of standards representable by simple data types"; license = stdenv.lib.licenses.mpl20; @@ -58610,8 +58662,8 @@ self: { }: mkDerivation { pname = "decimal-arithmetic"; - version = "0.5.0.0"; - sha256 = "0l740xpnqs5m67hwp3p6l5mzyhs9si39mp5z2x57mnrhvjdydq1j"; + version = "0.5.1.0"; + sha256 = "0ig25l60ix79v4yl2kix8wkhfvsdniaxrzk49hfwqiblwz17kxla"; libraryHaskellDepends = [ base binary binary-bits deepseq mtl ]; testHaskellDepends = [ base binary doctest hspec QuickCheck ]; description = "An implementation of the General Decimal Arithmetic Specification"; @@ -58874,8 +58926,8 @@ self: { ({ mkDerivation, base, containers, foldl }: mkDerivation { pname = "deferred-folds"; - version = "0.5.1"; - sha256 = "0fyfm59fyz30mn5w7y47l2vx6d0ap5vijadlfff1j07ak6lnq1x3"; + version = "0.6"; + sha256 = "1qp99fbx14y49lsh269jdc5mazz30rqwr1if3gc1qn4m5d8dsqir"; libraryHaskellDepends = [ base containers foldl ]; description = "Abstractions over deferred folds"; license = stdenv.lib.licenses.mit; @@ -59020,31 +59072,14 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "1.11.0.1"; - sha256 = "04a4nnipb7qlw0kz4gy7flzndas3zppjxjbp8vvpcc7n5mqcj89x"; - libraryHaskellDepends = [ - base concurrency containers contravariant deepseq exceptions - leancheck profunctors random transformers - ]; - description = "A library for unit-testing concurrent programs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dejafu_1_11_0_2" = callPackage - ({ mkDerivation, base, concurrency, containers, contravariant - , deepseq, exceptions, leancheck, profunctors, random, transformers - }: - mkDerivation { - pname = "dejafu"; - version = "1.11.0.2"; - sha256 = "0v4vbka3s8hmxvhf7kpfbncv4fr0mks01xd8phg3sqw07qyc871l"; + version = "1.11.0.3"; + sha256 = "192a0wv2kdk1js56lm6ikp9mx08fkb0wkxl1yba03p7dfnlj6bnx"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -59574,6 +59609,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "deriveJsonNoPrefix" = callPackage + ({ mkDerivation, aeson, base, hspec, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "deriveJsonNoPrefix"; + version = "0.1.0.1"; + sha256 = "1zwk181c8fv0cv6w3daz3gyb0rwp2cm56piv19iz2vfv3jk9rqqs"; + libraryHaskellDepends = [ aeson base template-haskell ]; + testHaskellDepends = [ + aeson base hspec template-haskell text unordered-containers + ]; + description = "Derive ToJSON/FromJSON instances in a more prefix-friendly manner"; + license = stdenv.lib.licenses.asl20; + }) {}; + "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged @@ -59582,8 +59633,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.5"; - sha256 = "1777569bgb7p1xn9ch90jbg2mk4gph04mzmw3r8c6kq84db1484m"; + version = "0.5.1"; + sha256 = "18mkmwm147h601zbdn2lna357z2picpnsxrmkw2jc863chban5vy"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -59624,8 +59675,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "1.0.2"; - sha256 = "0kyh5fcbv6337baz2prghak5w4x29ms0ccybbp1qkq0cvmvfwrvq"; + version = "1.0.3"; + sha256 = "1z2yv4476a42xndws1zqw0kmiy4wqw1ydqgp7hf7rk3s067wz33m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -59876,25 +59927,25 @@ self: { ({ mkDerivation, aeson, base, base16-bytestring, bloomfilter , BoundedChan, bytestring, cmdargs, conduit, containers , cryptohash-sha256, data-default-class, deepseq, ghc-prim - , lens-simple, leveldb-haskell, lrucaching, resourcet, semigroups - , serialise, text, unordered-containers + , lens-simple, leveldb-haskell, lrucaching, mtl, resourcet + , semigroups, serialise, text, unordered-containers }: mkDerivation { pname = "dfinity-radix-tree"; - version = "0.1.0"; - sha256 = "14q9ick40mz5a0bdz1s7ga4fhw27hkidrsf543nmgm14q5w8q2nf"; + version = "0.1.1"; + sha256 = "1s9yqmx1nlj62xn2khr0y6gwdjrbknz6yk2inir76gbklsc9fw4s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base16-bytestring bloomfilter BoundedChan bytestring conduit containers cryptohash-sha256 data-default-class deepseq ghc-prim - lens-simple leveldb-haskell lrucaching resourcet semigroups + lens-simple leveldb-haskell lrucaching mtl resourcet semigroups serialise ]; executableHaskellDepends = [ - aeson base base16-bytestring bytestring cmdargs cryptohash-sha256 - data-default-class leveldb-haskell resourcet text - unordered-containers + aeson base base16-bytestring bytestring cmdargs containers + cryptohash-sha256 data-default-class leveldb-haskell mtl resourcet + text unordered-containers ]; description = "A generic data integrity layer"; license = stdenv.lib.licenses.gpl3; @@ -60341,6 +60392,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.3"; sha256 = "1g8anclzfm88nd6z539g5f2h6yfb538hdl59sbiqv0vk1c4sr01s"; + revision = "1"; + editedCabalFile = "0cdnriavw7y0cr12n60vd0hwcyi09vkx5zjr47af3bj00lq1v9hk"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -61354,8 +61407,8 @@ self: { }: mkDerivation { pname = "digit"; - version = "0.5.2"; - sha256 = "18y3dln42avvzj8cxz7hkg6w106zhf64aywx23crywjhilcl5ha0"; + version = "0.6"; + sha256 = "13cm8xk3szfcyfdzp108rzwkvwwws34bpla2viyqcr0sivmzdck8"; libraryHaskellDepends = [ base lens papa parsers scientific semigroupoids semigroups template-haskell @@ -62770,6 +62823,26 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "distribution-opensuse" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , deepseq, Diff, extra, foldl, hashable, hsemail, mtl, parsec-class + , pretty, text, time, turtle + }: + mkDerivation { + pname = "distribution-opensuse"; + version = "1.0.0"; + sha256 = "0zy0whx8badksaqqkswslrgrz57mpx3pfjjhrqrvn7088anwb7rr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring containers deepseq Diff extra foldl + hashable hsemail mtl parsec-class pretty text time turtle + ]; + executableHaskellDepends = [ base containers text turtle ]; + description = "Types, functions, and tools to manipulate the openSUSE distribution"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distribution-plot" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, colour, containers , data-default-class, distribution, lens @@ -65435,8 +65508,8 @@ self: { ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }: mkDerivation { pname = "easytensor"; - version = "1.0.0.0"; - sha256 = "0qi7p82s5av0x9xqll4sjwh82x4r6bijypqh29f7xmk4y6dzs19c"; + version = "1.0.0.1"; + sha256 = "0ih92gikf67bq9p599vdb9p9dh4b8p7a687n3xiv3q9qm4pdc8aa"; libraryHaskellDepends = [ base dimensions ]; testHaskellDepends = [ base Cabal dimensions QuickCheck ]; benchmarkHaskellDepends = [ base dimensions time ]; @@ -65779,6 +65852,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "edges" = callPackage + ({ mkDerivation, base, cereal, contravariant, deferred-folds, foldl + , monad-par, pointed, potoki, potoki-cereal, primitive + , primitive-extras, profunctors, QuickCheck, quickcheck-instances + , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck + , text, vector + }: + mkDerivation { + pname = "edges"; + version = "0.4.0.1"; + sha256 = "1a599zi2im1ics8gnb0v0iv2rpzwzl8i2qfglgi1cxzdhcymn5sa"; + libraryHaskellDepends = [ + base cereal contravariant deferred-folds foldl monad-par pointed + potoki potoki-cereal primitive primitive-extras profunctors + QuickCheck semigroupoids text vector + ]; + testHaskellDepends = [ + cereal foldl QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Tools for efficient immutable graphs"; + license = stdenv.lib.licenses.mit; + }) {}; + "edis" = callPackage ({ mkDerivation, base, bytestring, cereal, hedis }: mkDerivation { @@ -65803,6 +65900,7 @@ self: { base comonad doctest QuickCheck tasty tasty-discover tasty-quickcheck uniplate ]; + testToolDepends = [ tasty-discover ]; description = "A monad for rewriting things"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -65947,6 +66045,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover HUnit QuickCheck ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion ]; description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; license = stdenv.lib.licenses.mit; @@ -66013,6 +66112,8 @@ self: { pname = "effects"; version = "0.2.3"; sha256 = "174mlzs1n2zw2jzxn95lkr8f2m2rjigvgpqljrvim9bsb991dhc0"; + revision = "1"; + editedCabalFile = "1vwywcrvb4qm3z7smxd9snvcwikyifl7fn8pxgiwchihm0ajnbvw"; libraryHaskellDepends = [ base containers newtype-generics void ]; description = "Computational Effects"; license = stdenv.lib.licenses.bsd3; @@ -66188,8 +66289,8 @@ self: { }: mkDerivation { pname = "eigen"; - version = "2.1.7"; - sha256 = "080dv9hxjfqaarj0vzmaxjc382a3aqp4z69k6nl4vs09g2i1cfg4"; + version = "3.3.4.1"; + sha256 = "0kpbnl5yrsp9923al5g9x48yf88m4vsdryq69g8fmlh0wdqkdapa"; libraryHaskellDepends = [ base binary bytestring primitive transformers vector ]; @@ -67344,28 +67445,6 @@ self: { }: mkDerivation { pname = "enclosed-exceptions"; - version = "1.0.2"; - sha256 = "1wc9h6zdnb5impvvml6vnjapajjanw7zgpnzg7c0v7115nwfm6vv"; - revision = "1"; - editedCabalFile = "0rjm8g2bm9a7qzklkp0rh5az4qh8nsl0hl119gjik671knygkdj0"; - libraryHaskellDepends = [ - base deepseq lifted-base monad-control transformers - transformers-base - ]; - testHaskellDepends = [ - async base deepseq hspec lifted-base monad-control QuickCheck stm - transformers transformers-base - ]; - description = "Catching all exceptions from within an enclosed computation"; - license = stdenv.lib.licenses.mit; - }) {}; - - "enclosed-exceptions_1_0_3" = callPackage - ({ mkDerivation, async, base, deepseq, hspec, lifted-base - , monad-control, QuickCheck, stm, transformers, transformers-base - }: - mkDerivation { - pname = "enclosed-exceptions"; version = "1.0.3"; sha256 = "1fghjj7nkiddrf03ks8brjpr5x25yi9fs7xg6adbi4mc2gqr6vdg"; libraryHaskellDepends = [ @@ -67378,7 +67457,6 @@ self: { ]; description = "Catching all exceptions from within an enclosed computation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "encode-string" = callPackage @@ -68367,6 +68445,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "errors-ext_0_4_2" = callPackage + ({ mkDerivation, base, binary-ext, bytestring, conduit, errors + , exceptions, HUnit, monad-control, monad-loops, mtl, transformers + }: + mkDerivation { + pname = "errors-ext"; + version = "0.4.2"; + sha256 = "064nvpc8yy3n6nvc7cmxmgblmarg4wlvawj0k7bc3mj6h0rnavj0"; + libraryHaskellDepends = [ + base errors exceptions monad-control mtl transformers + ]; + testHaskellDepends = [ + base binary-ext bytestring conduit errors exceptions HUnit + monad-control monad-loops mtl transformers + ]; + description = "`bracket`-like functions for `ExceptT` over `IO` monad"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersaconcat" = callPackage ({ mkDerivation, base, directory, doctest, filepath, HTTP , network-uri, process, QuickCheck, tagsoup, template-haskell @@ -69469,8 +69567,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.1.4"; - sha256 = "0xhhw5dxq1h4w7dpngrhnaipzhfpzvs4y7jdvimzk86hvgv0mmfj"; + version = "1.1.5"; + sha256 = "1c8iiq943smldh5yvjpfycfjzy8hnsb2dmvcnbzk41cpcdq2zkx8"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger @@ -70433,6 +70531,8 @@ self: { pname = "extended-reals"; version = "0.2.3.0"; sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw"; + revision = "1"; + editedCabalFile = "114s55sx0wq0zq9mgxrhaz4kd87c80zf8s35ani3h4dh1bb33j9w"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -70547,6 +70647,7 @@ self: { base containers deepseq extensible-effects HUnit lens QuickCheck stm tasty tasty-discover tasty-hunit ]; + testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70592,8 +70693,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.8"; - sha256 = "1kngk46nkrjkpqaj845c6r823r8aawlk1ir693lr6rskhy1k7dlp"; + version = "1.6.9"; + sha256 = "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -72328,8 +72429,8 @@ self: { }: mkDerivation { pname = "ffmpeg-light"; - version = "0.12.2.0"; - sha256 = "005q3is5n6lpridfszw3c3la15byc0sbq1b1lwsw59jyffgc587c"; + version = "0.12.2.1"; + sha256 = "1azzm32rvx48vab3i3cnf520nbvcazx18pi36ilgc97nih15lwjw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72774,12 +72875,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "filepath_1_4_2" = callPackage + "filepath_1_4_2_1" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "filepath"; - version = "1.4.2"; - sha256 = "0bnryq00xbcsswxmahl42x85bfh23mxsap0gq8q0dm1v67ij7a0q"; + version = "1.4.2.1"; + sha256 = "04jlcaaab4fvlkgpss2mfmr5ixnp1k8f8051nqf8avfg0qan6hqb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Library for manipulating FilePaths in a cross platform way"; @@ -73139,8 +73240,8 @@ self: { pname = "finite-field"; version = "0.9.0"; sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643"; - revision = "1"; - editedCabalFile = "0npwa4gv94b87y4bam9valnjlsy3rbhk7n7hdc1mx1bwkn4acyds"; + revision = "2"; + editedCabalFile = "11zivn1cjwxc7xy8q50raz1wpfgl0b459ai0f4j304rv7yiwrhdp"; libraryHaskellDepends = [ base deepseq hashable singletons template-haskell ]; @@ -73157,23 +73258,11 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "finite-typelits"; - version = "0.1.3.0"; - sha256 = "17a82djlpapdzw34afv79w99jrpy5nlbdw1k1xjs59bvvqv36wyv"; - libraryHaskellDepends = [ base deepseq ]; - description = "A type inhabited by finitely many values, indexed by type-level naturals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "finite-typelits_0_1_4_0" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "finite-typelits"; - version = "0.1.4.0"; - sha256 = "1kq48lq4v2iq4zqyynr2zzps4wgzh4c6aad157r156jlgyn4nkc4"; + version = "0.1.4.2"; + sha256 = "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj"; libraryHaskellDepends = [ base deepseq ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "firebase-database" = callPackage @@ -73705,6 +73794,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover mtl template-haskell transformers ]; + testToolDepends = [ hspec-discover ]; description = "Opininated testing framework for mtl style (spies, stubs, and mocks)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -74225,8 +74315,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.13"; - sha256 = "0dg29g1d7xi14yf4yjxiy9cmslqgz5c4z141q4bzqn6ms0rwrxx7"; + version = "1.0.14"; + sha256 = "0k6j0mh3lr2fpvjs2jl1agybng32g9z8w3qf5b542ydjl02nvk08"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Write more understandable Haskell"; @@ -75592,19 +75682,6 @@ self: { ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; - version = "0.0.20"; - sha256 = "0bg4g0xf4pb2vmahnfp8c4f0a3v0av73lb5g8bwnp170khxfcsms"; - libraryHaskellDepends = [ base basement ghc-prim ]; - testHaskellDepends = [ base basement ]; - benchmarkHaskellDepends = [ base basement gauge ]; - description = "Alternative prelude with batteries and no dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "foundation_0_0_21" = callPackage - ({ mkDerivation, base, basement, gauge, ghc-prim }: - mkDerivation { - pname = "foundation"; version = "0.0.21"; sha256 = "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf"; libraryHaskellDepends = [ base basement ghc-prim ]; @@ -75612,7 +75689,6 @@ self: { benchmarkHaskellDepends = [ base basement gauge ]; description = "Alternative prelude with batteries and no dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -75977,6 +76053,8 @@ self: { pname = "free-functors"; version = "0.8.4"; sha256 = "0qdllnqghnx6j51zyxqblnz809w7l86qp0d9dg8a4l4kllp1y703"; + revision = "1"; + editedCabalFile = "0yl71dl7rp8si7gshj1f713cjxmk5dzkb6m6d3vicc97b37s6r5j"; libraryHaskellDepends = [ algebraic-classes base bifunctors comonad constraints contravariant profunctors template-haskell transformers @@ -77174,6 +77252,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "funcons-simple" = callPackage + ({ mkDerivation, base, funcons-tools, funcons-values }: + mkDerivation { + pname = "funcons-simple"; + version = "0.1.0.3"; + sha256 = "0ar5sxcalbfyhyvm6ijbyrrz2pzqyj5bihngnf187wrc5llq2ydr"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base funcons-tools funcons-values ]; + description = "A modular interpreter for executing SIMPLE funcons"; + license = stdenv.lib.licenses.mit; + }) {}; + "funcons-tools" = callPackage ({ mkDerivation, base, bv, containers, directory, funcons-values , gll, mtl, multiset, random-strings, regex-applicative, split @@ -78035,6 +78126,7 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib text ]; libraryPkgconfigDepends = [ GConf ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GNOME configuration database system"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) GConf;}; @@ -78894,6 +78986,7 @@ self: { base directory doctest filepath hspec interpolate markdown-unlit mockery QuickCheck shake silently ]; + testToolDepends = [ markdown-unlit ]; description = "A library for generic programming that aims to be easy to understand"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79578,6 +79671,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "geodetic-types" = callPackage + ({ mkDerivation, base, dimensional, lens, semigroups }: + mkDerivation { + pname = "geodetic-types"; + version = "0.0.1"; + sha256 = "0sj82sz20zfys2h4g74wj9gwfyc2c4jkzazw882xrr18g8zx82p8"; + libraryHaskellDepends = [ base dimensional lens semigroups ]; + description = "Types for geodetic operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "geodetics" = callPackage ({ mkDerivation, array, base, checkers, dimensional, HUnit , QuickCheck, test-framework, test-framework-hunit @@ -80069,8 +80173,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.7.3"; - sha256 = "13na5pkmid2jg9ivav62x5dzbcacwl4lcsqd7i7brg4h95iqnmpd"; + version = "0.8.0"; + sha256 = "1wdxap20wh8sdaqnpsk463mihg6v3va786zb1amgzrcjpsv49is5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80152,6 +80256,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-exactprint_0_5_7_0" = callPackage + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "0.5.7.0"; + sha256 = "0r1cwjz96qrx0ww7snmwdh16xslzaqk6mlz3i9n4q779qf0y1n7m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath free ghc ghc-boot + ghc-paths mtl syb + ]; + testHaskellDepends = [ + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb + ]; + description = "ExactPrint for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -80227,6 +80355,7 @@ self: { monad-journal mtl optparse-applicative parsec process process-streaming safe syb transformers ]; + testToolDepends = [ hspec-discover ]; description = "Find the Haddock documentation for a symbol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -80483,27 +80612,6 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.2"; - sha256 = "0rippzp76g2zn8vhxfkvpf9r2l62lid6525ym6zz1pyq4xzsbqrf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers scientific text time - ]; - testHaskellDepends = [ - attoparsec base containers directory filepath process tasty - tasty-hunit temporary text - ]; - description = "Library for parsing GHC time and allocation profiling reports"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-prof_1_4_1_3" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, filepath - , process, scientific, tasty, tasty-hunit, temporary, text, time - }: - mkDerivation { - pname = "ghc-prof"; version = "1.4.1.3"; sha256 = "16ckk4ldpkq7khka5mhkngrcazrnfxw394rm7mcshhlr7f41ydlr"; isLibrary = true; @@ -80517,7 +80625,6 @@ self: { ]; description = "Library for parsing GHC time and allocation profiling reports"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prof-aeson" = callPackage @@ -80736,27 +80843,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.2.5"; - sha256 = "0waznf99wryc0sjyk9xb5c0vsalmmhx0v5vbqsyf5q7r6cjcig4s"; - libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat - ghc-typelits-natnormalise integer-gmp transformers - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat ghc-typelits-natnormalise tasty - tasty-hunit template-haskell - ]; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-extra_0_2_6" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp - , tasty, tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; version = "0.2.6"; sha256 = "0dx6rk6lpklqqklj74mg92vjn66kkjfxp87hwazzlx9wai23r3cm"; libraryHaskellDepends = [ @@ -80769,7 +80855,6 @@ self: { ]; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-knownnat" = callPackage @@ -80779,26 +80864,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.5"; - sha256 = "0mix7zgbnyc3216ykcrjl09rpidq5n2y886k03g8r5pziq1xki00"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra ghc-typelits-natnormalise - template-haskell transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck - ]; - description = "Derive KnownNat constraints from other KnownNat constraints"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-knownnat_0_5_1" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-knownnat"; version = "0.5.1"; sha256 = "0yvdb3y82wrm41p9sbbsmfq91cp9kzx7mmqr20wgxrqamhnw952v"; libraryHaskellDepends = [ @@ -80810,7 +80875,6 @@ self: { ]; description = "Derive KnownNat constraints from other KnownNat constraints"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage @@ -80819,22 +80883,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.6.1"; - sha256 = "0xzwlxcmd3vll86mdjk8pph6f0nw3vq0h3airzv7jagc4j3x9c7x"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp transformers - ]; - testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-natnormalise_0_6_2" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty - , tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; version = "0.6.2"; sha256 = "04a338yfcl6jm1daax08zsy03myii4llzih4mlprkyid8i0yn740"; libraryHaskellDepends = [ @@ -80843,7 +80891,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-presburger" = callPackage @@ -82411,6 +82458,7 @@ self: { base megaparsec smallcheck smallcheck-series tasty tasty-discover tasty-hunit tasty-smallcheck tasty-travis text unordered-containers ]; + testToolDepends = [ tasty-discover ]; description = "A simple parser for Git configuration files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -82850,8 +82898,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.2.1"; - sha256 = "1q01yk6nl60iylsqzz1gzg3q1gpjn6bi13p5lddx1z5hd6hri80h"; + version = "1.2.2"; + sha256 = "0mnkj8p90inaw6cic60hx05yq2lf2aahmv313qi59di5jqkyg106"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83689,8 +83737,8 @@ self: { pname = "glirc"; version = "2.26"; sha256 = "1ax2ygzrsr1r21v9cx4ixnlgrax6nxr4rkh090n1wv6xn02kd3j0"; - revision = "2"; - editedCabalFile = "0fwyd1xvz11b1433lw0c9rb8md1f87mg9kinq3hrfq8jjmaws478"; + revision = "4"; + editedCabalFile = "1kky984mv59s94xj044wxj47ijy4a4fkrp93mkh47ww53azjw1lw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -86624,6 +86672,7 @@ self: { MissingH mtl process QuickCheck regex-posix scientific servant servant-client text ]; + testToolDepends = [ markdown-unlit ]; description = "A Haskell client for Grakn"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -87296,6 +87345,7 @@ self: { QuickCheck text ]; testSystemDepends = [ graphviz ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; @@ -87313,6 +87363,7 @@ self: { aeson base containers process regex-posix scientific text ]; testHaskellDepends = [ base hspec markdown-unlit text ]; + testToolDepends = [ markdown-unlit ]; description = "Execute Graql queries on a Grakn graph"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -88215,6 +88266,7 @@ self: { array base bytestring directory glib mtl ]; libraryPkgconfigDepends = [ gst-plugins-base gstreamer ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; @@ -88368,8 +88420,8 @@ self: { }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.4.0"; - sha256 = "1cxs2rgyjkjwz7y2n205pwqnji4c27k6ilx6prv9a5nsd0msr1h2"; + version = "0.1.5.0"; + sha256 = "0vfxskzhcm1a3i7kvqxfvmqdvx7xk6hnbpsnqymrzjaj11w9r9x0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88633,6 +88685,7 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ gtkglext ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -88690,6 +88743,7 @@ self: { array base containers glib gtk mtl text ]; libraryPkgconfigDepends = [ gtksourceview ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) gtksourceview;}; @@ -88708,6 +88762,7 @@ self: { array base containers glib gtk3 mtl text ]; libraryPkgconfigDepends = [ gtksourceview3 ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; @@ -89129,8 +89184,8 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.7"; - sha256 = "0s4afs5s6sz2j9vkgz6xhx426dva72i6gk8804avjphjrfvvgdzg"; + version = "2.7.1"; + sha256 = "02nws5px5zb9rvsl3hpqr15iw56n0d2pwgdrk3d047l4hx9cbm95"; libraryHaskellDepends = [ aeson asn1-encoding attoparsec base base16-bytestring base64-bytestring bifunctors binary binary-conduit bytestring bzlib @@ -89165,19 +89220,19 @@ self: { }) {}; "hPDB" = callPackage - ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq - , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , ghc-prim, iterable, linear, mmap, mtl, Octree, parallel , QuickCheck, tagged, template-haskell, text, unordered-containers , vector, zlib }: mkDerivation { pname = "hPDB"; - version = "1.2.0.10"; - sha256 = "10a5995872n6y849nhs9yl7zwp7ywfma3mabgywq7acmpppl5ka0"; + version = "1.5.0.0"; + sha256 = "07pc4g0gj56q0nrry6462a8h2v0psp23nbn9sd7fybgz248c39lw"; libraryHaskellDepends = [ - AC-Vector base bytestring containers deepseq directory ghc-prim - iterable mmap mtl Octree parallel QuickCheck tagged - template-haskell text unordered-containers vector zlib + base bytestring containers deepseq directory ghc-prim iterable + linear mmap mtl Octree parallel QuickCheck tagged template-haskell + text unordered-containers vector zlib ]; description = "Protein Databank file format library"; license = stdenv.lib.licenses.bsd3; @@ -89185,25 +89240,26 @@ self: { }) {}; "hPDB-examples" = callPackage - ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq - , directory, ghc-prim, GLUT, hPDB, IfElse, iterable, mtl, Octree - , OpenGL, process, QuickCheck, template-haskell, text, text-format - , time, vector + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , ghc-prim, GLUT, hPDB, IfElse, iterable, linear, mtl, Octree + , OpenGL, process, QuickCheck, template-haskell, text, time, vector }: mkDerivation { pname = "hPDB-examples"; - version = "1.2.0.8"; - sha256 = "0zyfh2693cirr69qcmiwsmk4p8w8v6yacidcs22jcisay95v4qf6"; + version = "1.5.0.0"; + sha256 = "0hhi6x8m7pngcjmxv5mncw66r5bn67i07g347d85lc6yszhrykdp"; + revision = "1"; + editedCabalFile = "1bk3fmdgqyj0p72049w79y0b9hdzb5knzkxzl9z02qsbdj5f5if0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - AC-Vector base bytestring containers deepseq directory ghc-prim - GLUT hPDB iterable mtl Octree OpenGL QuickCheck template-haskell - text text-format vector + base bytestring containers deepseq directory ghc-prim GLUT hPDB + iterable linear mtl Octree OpenGL QuickCheck template-haskell text + vector ]; testHaskellDepends = [ - AC-Vector base bytestring containers deepseq directory ghc-prim - hPDB IfElse iterable mtl process template-haskell text time vector + base bytestring containers deepseq directory ghc-prim hPDB IfElse + iterable linear mtl process template-haskell text time vector ]; description = "Examples for hPDB library"; license = stdenv.lib.licenses.bsd3; @@ -90101,8 +90157,8 @@ self: { }: mkDerivation { pname = "hackage-whatsnew"; - version = "0.1.0.2"; - sha256 = "0z57nnp0sn15399b11h7kb5dxqmg1gd3l8qv7vw8knxv65yfgra3"; + version = "0.1.1"; + sha256 = "140qsl0aqw2zg246inijifvcddmirba613as0hrg11hkd52f6fhr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90584,8 +90640,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.10.2"; - sha256 = "0x9szi43a4l7ii8qbhpgakln2ddaix5p42n39i08w8h54qbx6c08"; + version = "1.10.3"; + sha256 = "00khz032sy78z5rr36d20zj4grbbqkf1rk1x8m0nf05ca6gfwjbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91965,8 +92021,8 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.5.7"; - sha256 = "0fis5g2fg0x5pw7r0p7qy090v90gzqza5qjnpzinnq1yipmr872p"; + version = "0.3.5.8"; + sha256 = "0yg1wgg4mkfjf49xfcnijrwmj747yzbybsvkaq515i618nz5x57z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -93237,6 +93293,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hash-store" = callPackage + ({ mkDerivation, base, base16-bytestring, blake2, bytestring + , directory, filepath + }: + mkDerivation { + pname = "hash-store"; + version = "0.1.0"; + sha256 = "1lbnywgd3kr7nryw0s6pgpznsx526xvagapsl5sdwwss8ginjh78"; + libraryHaskellDepends = [ + base base16-bytestring blake2 bytestring directory filepath + ]; + description = "Hash as cache"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "hash-tree" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, hspec, memory, QuickCheck @@ -93709,8 +93780,8 @@ self: { }: mkDerivation { pname = "haskdogs"; - version = "0.5.1"; - sha256 = "1iilnxw9xq3i5y1fvvjs557xbblfgq992576fpvr405wj6nlhmk3"; + version = "0.5.3"; + sha256 = "1n3vwrm99h4kzcimav18dkbvkpkhspwdf5gz8da1sr4g0m4kg96n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95091,8 +95162,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "1.1.0.1"; - sha256 = "1g450ikg2wi7whw46ibm9pc7jdnk5lng8l7lqryi0nigmrmgz355"; + version = "1.1.0.2"; + sha256 = "0j81dmg2mgxlc4wy054a13bvx549xs19fr729rirdj2illdgbw1c"; libraryHaskellDepends = [ base classyplate ghc mtl pretty references template-haskell uniplate @@ -95159,8 +95230,8 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "1.1.0.1"; - sha256 = "030ylilmgn4drp00d3683kwfyq9rky5i8ihpvmqjkphyq7bbwva4"; + version = "1.1.0.2"; + sha256 = "0c054gvnn38r5vlpka5jsvq3n8lcn3j77jg45g1zl1az0099mzhl"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -95180,8 +95251,8 @@ self: { }: mkDerivation { pname = "haskell-tools-builtin-refactorings"; - version = "1.1.0.1"; - sha256 = "0xlcwyydspn73nv7yi1djncqhswszqn9skrm6hm96scfyqvvxbwa"; + version = "1.1.0.2"; + sha256 = "1wm7c63cw4izg6vlrm2xdyrfvf4cwcqs2n144y8k0zf442xaq5l9"; libraryHaskellDepends = [ aeson base Cabal classyplate containers deepseq directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -95210,8 +95281,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "1.1.0.1"; - sha256 = "1gc20ajz1xzp3343j013w0knqdvhwa5hxwvxr6ydpxgrigjxk18p"; + version = "1.1.0.2"; + sha256 = "0222qiyjncfyvcizsjx8qv4j8pjfrqb1mi18566fg689bhwl8x7z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95247,8 +95318,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "1.1.0.1"; - sha256 = "0vq8d7n8k978d2jv4f3sbvccjj9vqydci33xl1axamslani0k8x2"; + version = "1.1.0.2"; + sha256 = "048k4pa26z3b3m83km8wbhr7nx2z3zmg4gyp1ga15idv73fis3kl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95280,8 +95351,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "1.1.0.1"; - sha256 = "1l84y0pqwcq1y6509gg68flfa1ai5zl2psn57lp1nm17i7cddsjw"; + version = "1.1.0.2"; + sha256 = "1lnv9j4h45g0z1s9pf86py39p2bs8dbz3xybg0bwz89yix8h7nhl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95306,8 +95377,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "1.1.0.1"; - sha256 = "1rzpwy7fvc51vs9sqpxvja84bqjgrpj6943cc2p06d1ynl7vzmk5"; + version = "1.1.0.2"; + sha256 = "0c2m6xqcl22x9ay3n9j64lphmsvxsgcwymvbxscwpki9mv7wbvkx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95337,8 +95408,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.1.0.1"; - sha256 = "16qdvs68zlzjx5gj8034w5qwc79i640kfdnwc81wi84hch7xwy4p"; + version = "1.1.0.2"; + sha256 = "1kqiblwc0dp3p7yx10jqxflsgybc0vvgrvi0ylxhgkmn6cpmnkqv"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -95364,8 +95435,8 @@ self: { }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "1.1.0.1"; - sha256 = "1x8zz8i66cfnvif991bj9nkidp2bwlhs9zfkxwlyhvhrlda45q8f"; + version = "1.1.0.2"; + sha256 = "01j212inqx7hq24kcw7n0619bgz7bj576xrh06h10n0wqhd6qfbq"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split text uniplate @@ -95384,8 +95455,8 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "1.1.0.1"; - sha256 = "0kfw41f4js9s6mf533q7vm7ym63hb289j77r2ypm08490bqjhi9g"; + version = "1.1.0.2"; + sha256 = "12gkmji62kvnqjih9845hmsdj2f52hvmqgrz7s5wclpn3b5fhczq"; libraryHaskellDepends = [ aeson base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -95411,8 +95482,8 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "1.1.0.1"; - sha256 = "0j1925x0qkkm8n0klqbawgd419ra9jrfl4y4hn75j3w4zxzh3v5j"; + version = "1.1.0.2"; + sha256 = "1az7924bsiapn7g8gj75vdi47alrlly0wnwhcd7p8a24kh1hj055"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -97786,6 +97857,7 @@ self: { smallcheck tasty tasty-discover tasty-hedgehog tasty-hunit tasty-smallcheck temporary text transformers vector ]; + testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base binary bytestring criterion deepseq filepath optparse-applicative parsec primitive text transformers vector @@ -99610,8 +99682,8 @@ self: { }: mkDerivation { pname = "herms"; - version = "1.9.0.2"; - sha256 = "0gl2zwmqcvmkk63xip7zqn37qwpii5b8qbf7h289iyrc46a3z29z"; + version = "1.9.0.3"; + sha256 = "0pb0pzaa5b9hmrscdggvafm6ygr843i02brhs604mkhggyqivf74"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -103859,7 +103931,7 @@ self: { libraryHaskellDepends = [ base cgen ]; librarySystemDepends = [ OgreMain ]; libraryPkgconfigDepends = [ OGRE ]; - libraryToolDepends = [ cgen-hs grgen ]; + libraryToolDepends = [ cgen cgen-hs grgen ]; doHaddock = false; description = "Haskell binding to a subset of OGRE"; license = stdenv.lib.licenses.mit; @@ -105177,6 +105249,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hpack_0_29_5" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , http-client, http-client-tls, http-types, HUnit, infer-license + , interpolate, mockery, pretty, QuickCheck, scientific + , template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.29.5"; + sha256 = "1jm70x2d1d5la780aksq3088k5vj8s6j2srslij9slsfkw6mmv56"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -105215,8 +105325,8 @@ self: { }: mkDerivation { pname = "hpack-dhall"; - version = "0.2.0"; - sha256 = "0avkxcrpa1qgyw56wqna773404gcglvqxr81jmzr0hij406x4c8m"; + version = "0.3.0"; + sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105624,6 +105734,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) postgresql;}; + "hpqtypes_1_6_0_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers + , data-default-class, directory, exceptions, filepath, HUnit + , lifted-base, monad-control, mtl, postgresql, QuickCheck, random + , resource-pool, scientific, semigroups, test-framework + , test-framework-hunit, text, text-show, time, transformers + , transformers-base, unordered-containers, vector + }: + mkDerivation { + pname = "hpqtypes"; + version = "1.6.0.0"; + sha256 = "1aydpbkp5if7416dvswiygn7vfhgg7nza9p011gld18pr9mpsf5i"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default-class + exceptions lifted-base monad-control mtl resource-pool semigroups + text text-show time transformers transformers-base vector + ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ + aeson base bytestring exceptions HUnit lifted-base monad-control + mtl QuickCheck random scientific test-framework + test-framework-hunit text text-show time transformers-base + unordered-containers vector + ]; + description = "Haskell bindings to libpqtypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) postgresql;}; + "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers , cryptohash, data-default, exceptions, fields-json, hpqtypes @@ -105632,8 +105772,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.6.1.0"; - sha256 = "1k23dk3f1d3d3a1qdkvwjk91nw7iz4906clnwhd9k2s70zgsw111"; + version = "1.6.2.0"; + sha256 = "095kxfk12bzl7gl44fa7xmwfnx63707s1jz861hqjmi9dv3mm8kp"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash data-default exceptions fields-json hpqtypes lifted-base log-base @@ -106815,6 +106955,7 @@ self: { base bytestring data-default-class hspec hspec-discover temporary text ]; + testToolDepends = [ hspec-discover ]; description = "Integrating Sass into Haskell applications"; license = stdenv.lib.licenses.mit; }) {}; @@ -108485,6 +108626,7 @@ self: { hspec-expectations hspec-meta HUnit QuickCheck stringbuilder transformers ]; + testToolDepends = [ hspec-discover ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -108508,10 +108650,35 @@ self: { hspec-expectations hspec-meta HUnit QuickCheck stringbuilder transformers ]; + testToolDepends = [ hspec-discover ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_5_5" = callPackage + ({ mkDerivation, base, call-stack, directory, hspec-core + , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck + , stringbuilder, transformers + }: + mkDerivation { + pname = "hspec"; + version = "2.5.5"; + sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm"; + libraryHaskellDepends = [ + base call-stack hspec-core hspec-discover hspec-expectations HUnit + QuickCheck transformers + ]; + testHaskellDepends = [ + base call-stack directory hspec-core hspec-discover + hspec-expectations hspec-meta HUnit QuickCheck stringbuilder + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -108607,6 +108774,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_5_5" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.5.5"; + sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random + transformers + ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -108662,6 +108856,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_5_5" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.5.5"; + sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -108833,6 +109046,7 @@ self: { sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j"; libraryHaskellDepends = [ base hspec QuickCheck ]; testHaskellDepends = [ base hspec markdown-unlit QuickCheck ]; + testToolDepends = [ markdown-unlit ]; description = "Document and test laws for standard type classes"; license = stdenv.lib.licenses.mit; }) {}; @@ -110326,6 +110540,7 @@ self: { base containers hspec hspec-discover QuickCheck quickcheck-instances string-conversions text ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ attoparsec base criterion deepseq tagsoup text ]; @@ -110738,23 +110953,6 @@ self: { }: mkDerivation { pname = "http-client-openssl"; - version = "0.2.1.1"; - sha256 = "173s2m73xcf6ramy680ky4zhxhmrymh98g2hv5xa2pnj489j7vi4"; - libraryHaskellDepends = [ base HsOpenSSL http-client network ]; - testHaskellDepends = [ - base HsOpenSSL hspec http-client http-types - ]; - doCheck = false; - description = "http-client backend using the OpenSSL library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client-openssl_0_2_2_0" = callPackage - ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types - , network - }: - mkDerivation { - pname = "http-client-openssl"; version = "0.2.2.0"; sha256 = "1ahh2b34cwkmspwg8zilf2llmayf03p33z2gsw455wkhgfbhshcn"; libraryHaskellDepends = [ base HsOpenSSL http-client network ]; @@ -110764,7 +110962,6 @@ self: { doCheck = false; description = "http-client backend using the OpenSSL library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-request-modifiers" = callPackage @@ -112397,14 +112594,14 @@ self: { "hw-excess" = callPackage ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base - , QuickCheck, safe, storable-record, vector + , QuickCheck, safe, vector }: mkDerivation { pname = "hw-excess"; - version = "0.2.0.0"; - sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi"; + version = "0.2.0.2"; + sha256 = "1xm1nwab2zhlyd0n536pd5sny4miqr8p41pasl9mqvg89v6x0db7"; libraryHaskellDepends = [ - base hw-bits hw-prim hw-rankselect-base safe storable-record vector + base hw-bits hw-prim hw-rankselect-base safe vector ]; testHaskellDepends = [ base hspec hw-bits hw-prim QuickCheck vector @@ -112543,34 +112740,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-json-lens" = callPackage + "hw-json_0_8_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, conduit, containers, criterion, dlist, hspec - , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-json - , hw-parser, hw-prim, hw-rankselect, lens, mmap, mono-traversable - , parsec, QuickCheck, resourcet, scientific, text, transformers - , unordered-containers, vector, word8 + , bytestring, containers, criterion, directory, dlist, hspec + , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim + , hw-rankselect, hw-rankselect-base, mmap, text, vector, word8 }: mkDerivation { - pname = "hw-json-lens"; - version = "0.0.0.1"; - sha256 = "1r0g22271avmvqfl4sph4c6rnqwchbah5ixccksp7p2xa9g5j52z"; + pname = "hw-json"; + version = "0.8.1.0"; + sha256 = "1dllysbajkjsyb0rr9rhp2pmyrl99l7n086w8ifkm3491vgph179"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring conduit containers - dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics hw-json - hw-parser hw-prim hw-rankselect lens mmap mono-traversable - resourcet scientific text unordered-containers vector word8 + ansi-wl-pprint array attoparsec base bytestring containers dlist + hw-balancedparens hw-bits hw-mquery hw-parser hw-prim hw-rankselect + hw-rankselect-base mmap text vector word8 + ]; + executableHaskellDepends = [ + base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery + hw-prim hw-rankselect hw-rankselect-base mmap vector ]; testHaskellDepends = [ - attoparsec base bytestring conduit containers hspec - hw-balancedparens hw-bits hw-conduit hw-json hw-prim hw-rankselect - lens mmap parsec QuickCheck resourcet scientific transformers - unordered-containers vector + attoparsec base bytestring containers hspec hw-balancedparens + hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector ]; benchmarkHaskellDepends = [ - base bytestring conduit criterion hw-bits hw-conduit hw-prim - hw-rankselect lens mmap resourcet scientific unordered-containers - vector + base bytestring criterion directory hw-balancedparens hw-bits + hw-prim hw-rankselect hw-rankselect-base mmap vector + ]; + description = "Memory efficient JSON parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hw-json-lens" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, hw-json + , lens, scientific, word8 + }: + mkDerivation { + pname = "hw-json-lens"; + version = "0.1.0.0"; + sha256 = "1dbgxdbm8xp83hmdygi0y4h5lysacvdhms5g6i7p5i2w6prwqvid"; + libraryHaskellDepends = [ + base bytestring containers hw-json lens scientific word8 + ]; + benchmarkHaskellDepends = [ + base bytestring criterion hw-json lens ]; description = "Lens for hw-json"; license = stdenv.lib.licenses.mit; @@ -112695,6 +112911,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-parser_0_1_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hw-prim, text }: + mkDerivation { + pname = "hw-parser"; + version = "0.1.0.0"; + sha256 = "14ck19m0fizv7zpqxnpgv7fah9x3fp0p5ax5a5zxr5s52b52mq2x"; + libraryHaskellDepends = [ + attoparsec base bytestring hw-prim text + ]; + description = "Simple parser support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector @@ -112828,6 +113058,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-simd" = callPackage + ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava + , containers, criterion, deepseq, directory, hedgehog, hspec + , hw-bits, hw-hspec-hedgehog, hw-prim, hw-rankselect + , hw-rankselect-base, mmap, text, vector + }: + mkDerivation { + pname = "hw-simd"; + version = "0.0.0.3"; + sha256 = "1kkaigvkh932gcdvn7ll93qkz332bp6ylg5wsf8saxnir1n1362k"; + libraryHaskellDepends = [ + base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect + hw-rankselect-base vector + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bits-extra bytestring deepseq directory hedgehog hspec hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text + vector + ]; + benchmarkHaskellDepends = [ + base bits-extra bytestring cassava containers criterion deepseq + directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap + vector + ]; + description = "SIMD library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-string-parse" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { @@ -116042,6 +116301,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indexation" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, hashable, list-t, potoki, potoki-cereal, profunctors + , stm-containers, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "indexation"; + version = "0.2.0.2"; + sha256 = "10wm6k8rjdk4pq9pypnbh9pbqzr0vxbfgmj66d18grpr9g2mk5j1"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl hashable list-t + potoki potoki-cereal profunctors stm-containers text transformers + unordered-containers vector + ]; + description = "Tools for entity indexation"; + license = stdenv.lib.licenses.mit; + }) {}; + "indexed" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -116181,6 +116458,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "infer-license" = callPackage + ({ mkDerivation, base, directory, filepath, hspec, text + , text-metrics + }: + mkDerivation { + pname = "infer-license"; + version = "0.2.0"; + sha256 = "0wlfm6bf55kfvm74xar9lmjg5v1103rs9m3grw1rq5bmcmhzxrhj"; + libraryHaskellDepends = [ + base directory filepath text text-metrics + ]; + testHaskellDepends = [ + base directory filepath hspec text text-metrics + ]; + description = "Infer software license from a given license file"; + license = stdenv.lib.licenses.mit; + }) {}; + "infer-upstream" = callPackage ({ mkDerivation, ansi-wl-pprint, base, github, optparse-applicative , parsec, process, text @@ -116409,8 +116704,8 @@ self: { ({ mkDerivation, base, inj }: mkDerivation { pname = "inj-base"; - version = "0.1.0.0"; - sha256 = "1mxpx2lw7vxjr3mynxx90a49qavsmkf71afqshd2h4xz1kxnjnjh"; + version = "0.2.0.0"; + sha256 = "1cvhk4ww55nd85rwhaagaz2fihcakrqxy9r37jdp3jghaybk9p9d"; libraryHaskellDepends = [ base inj ]; description = "'Inj' instances for 'base'"; license = stdenv.lib.licenses.bsd3; @@ -116550,8 +116845,8 @@ self: { }: mkDerivation { pname = "inline-java"; - version = "0.8.3"; - sha256 = "01xg2ml1khdns5w30n83ibl3k0lc2ym7n0dgvkxgy17b5m8r6kbb"; + version = "0.8.4"; + sha256 = "1ddgwhk40g23lc71f8wbbfck9pqymil0syi14wsawc25sx6zb52v"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ghc jni jvm language-java mtl process template-haskell temporary text @@ -117380,8 +117675,8 @@ self: { }: mkDerivation { pname = "intrinsic-superclasses"; - version = "0.3.0.0"; - sha256 = "18xvpdip1zdgylqcngvk8hz6dsnl3bp681pc31nb562vg2crqzz6"; + version = "0.4.0.0"; + sha256 = "1lnb1sp77fdszz3d4qxgyynla037vn2a4c9wkv2fjjaghbsb1csi"; libraryHaskellDepends = [ base containers haskell-src-meta mtl template-haskell ]; @@ -117482,17 +117777,15 @@ self: { "invariant" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers - , contravariant, ghc-prim, hspec, profunctors, QuickCheck - , semigroups, StateVar, stm, tagged, template-haskell + , contravariant, ghc-prim, hspec, hspec-discover, profunctors + , QuickCheck, semigroups, StateVar, stm, tagged, template-haskell , th-abstraction, transformers, transformers-compat , unordered-containers }: mkDerivation { pname = "invariant"; - version = "0.5"; - sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0"; - revision = "2"; - editedCabalFile = "01n0v2qmbyd44z3wvha6vmbf1nr3bar205nk1r8hsq9jsmrfzaj1"; + version = "0.5.1"; + sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors semigroups StateVar stm tagged template-haskell @@ -117500,6 +117793,7 @@ self: { unordered-containers ]; testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + testToolDepends = [ hspec-discover ]; description = "Haskell98 invariant functors"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -118922,8 +119216,8 @@ self: { }: mkDerivation { pname = "ivory"; - version = "0.1.0.7"; - sha256 = "1qf0kp863ivb57mrc27kh1vm5a7ikfiz1hk32pm3jq8h7i2znh1s"; + version = "0.1.0.8"; + sha256 = "0nwn5h1fnnh9a6fkznscix50yvzqpw50hai7rslfzgizpbnzckrk"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty template-haskell text th-abstraction th-lift @@ -118957,8 +119251,8 @@ self: { }: mkDerivation { pname = "ivory-backend-c"; - version = "0.1.0.7"; - sha256 = "1xj492gzlypwd66w71mz4ndvl27vx2c712nz61myp3i4lx4rnpay"; + version = "0.1.0.8"; + sha256 = "1zp5kddiczkb85ac7y6wn145bzx3hpvzzhincgq8f1ykcr23miz9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory @@ -119035,8 +119329,8 @@ self: { ({ mkDerivation, base, filepath, ivory, ivory-artifact }: mkDerivation { pname = "ivory-hw"; - version = "0.1.0.5"; - sha256 = "0h21r9ij3n49b0m3dcjx22vyxc68v4jifl6yv1wpyn1hgrzxlyck"; + version = "0.1.0.6"; + sha256 = "0az65nj7pl32gyffv2z2vmcgm36cm740y765n4r7389drls5lj5d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory hardware model (STM32F4)"; @@ -119923,8 +120217,8 @@ self: { }: mkDerivation { pname = "jni"; - version = "0.6.0"; - sha256 = "04phf6sqfp8g9rqfj2lxg2j43350wlini1dnsjwyr6yvy888z9ba"; + version = "0.6.1"; + sha256 = "1z71vp8qskymgd4bjv8wxxjn34n49m28vnph0p0wbxgpz2wpn4hz"; libraryHaskellDepends = [ base bytestring choice constraints containers deepseq inline-c singletons @@ -120017,6 +120311,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jord" = callPackage + ({ mkDerivation, base, haskeline, hspec, HUnit }: + mkDerivation { + pname = "jord"; + version = "0.2.0.0"; + sha256 = "0akf6jjijwgn4jsvlzvj7mh9fx9wx0p05gf7bara6hiqj58y6k65"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base haskeline ]; + testHaskellDepends = [ base hspec HUnit ]; + description = "Geographical Position Calculations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jort" = callPackage ({ mkDerivation, array, base, gtk }: mkDerivation { @@ -120578,8 +120887,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.2"; - sha256 = "1485c4rljprf09nn8hd5fdpipjzpcylgmzz3ckw4nna5fhyx2n40"; + version = "1.0.3"; + sha256 = "08y6w4sad6f0f5gs3znw9yfp51cskw9q81xq5q70g6glq14lph50"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -120959,6 +121268,7 @@ self: { aeson aeson-pretty base bytestring containers hspec hspec-core hspec-discover hspec-expectations microlens mtl time ]; + testToolDepends = [ hspec-discover ]; description = "A polymorphic, type-safe, json-structured tracing library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121467,6 +121777,7 @@ self: { hspec-expectations-pretty-diff mtl QuickCheck tasty tasty-discover tasty-hspec tasty-quickcheck template-haskell text vector ]; + testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ attoparsec base binary bytestring containers criterion data-binary-ieee754 deepseq deriving-compat mtl template-haskell @@ -121609,6 +121920,7 @@ self: { testHaskellDepends = [ base bytestring cereal hspec hspec-discover QuickCheck time ]; + testToolDepends = [ hspec-discover ]; description = "Low-level Haskell client library for Apache Kafka 0.7."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -122343,18 +122655,26 @@ self: { }) {}; "keccak" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite + , gauge, HUnit, memory, parsec, QuickCheck, quickcheck-instances + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text }: mkDerivation { pname = "keccak"; - version = "0.1.0"; - sha256 = "1z3daxxpqj0pwv6ln7kils7aqqmcp8m438x9z3xay5szr8l1i8sz"; + version = "0.1.2"; + sha256 = "0jrnx5w2nxxc47lmw71c57cqja3mynx8j3fr89rjwby6mym5yw4g"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring ]; + executableHaskellDepends = [ base base16-bytestring bytestring ]; testHaskellDepends = [ - base base16-bytestring bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 + base base16-bytestring bytestring cryptonite HUnit memory parsec + QuickCheck quickcheck-instances test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + base bytestring cryptonite gauge memory ]; description = "haskell keccak functions"; license = stdenv.lib.licenses.mit; @@ -123634,8 +123954,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.4"; - sha256 = "1x0jrsk9jp7k0l6xz7nxrcdkglld1ab21kh6w1a253zklpwd3vz1"; + version = "1.0.5"; + sha256 = "0ixiqppj7sdkbhp2i6nr4xch82j4r6gxwwn0rvbb0x6wzikkdrf3"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -124470,17 +124790,17 @@ self: { "language-ats" = callPackage ({ mkDerivation, alex, ansi-wl-pprint, array, base , composition-prelude, containers, cpphs, criterion, deepseq, happy - , hspec, hspec-dirstream, micro-recursion-schemes, microlens - , microlens-th, system-filepath, transformers + , hspec, hspec-dirstream, microlens, recursion-schemes + , system-filepath, transformers }: mkDerivation { pname = "language-ats"; - version = "1.2.0.11"; - sha256 = "1kz30k8fdmnrx5zcyy3kpvr81p50m7bwsxgp5qqjrhk2i1a1igfp"; + version = "1.2.0.14"; + sha256 = "13nafbk4h8z3vx12i6zs250795c3ipsgxq83bhgha2w0wjr49d18"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq - micro-recursion-schemes microlens microlens-th transformers + microlens recursion-schemes transformers ]; libraryToolDepends = [ alex cpphs happy ]; testHaskellDepends = [ @@ -124674,8 +124994,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "6.0.3"; - sha256 = "0rp94hgbh2knz8xn146shgaw0qp6lnp0skxzknsi0l6d3xzzr7qr"; + version = "6.0.4"; + sha256 = "1brlqlxa1h7iv2p17h4nb6ly7nr4dr9j815z3yiz0gbj91bgj4c1"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -125247,51 +125567,6 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.19"; - sha256 = "1g6b6dmjx1nk29r55qccvk6csbjig2yc493bmq0dlnqgbn0aiimp"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory exceptions - filecache filepath formatting hashable hruby hslogger hspec - http-api-data http-client lens lens-aeson megaparsec memory mtl - operational parsec pcre-utils process protolude random - regex-pcre-builtin scientific servant servant-client split stm - strict-base-types text time transformers unix unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint base bytestring containers Glob hslogger - http-client lens megaparsec mtl optparse-applicative parallel-io - regex-pcre-builtin strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl - pcre-utils protolude scientific strict-base-types temporary text - transformers unordered-containers vector - ]; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; - }) {}; - - "language-puppet_1_3_19_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, exceptions, filecache, filepath - , formatting, Glob, hashable, hruby, hslogger, hspec - , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson - , megaparsec, memory, mtl, operational, optparse-applicative - , parallel-io, parsec, pcre-utils, process, protolude, random - , regex-pcre-builtin, scientific, servant, servant-client, split - , stm, strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; version = "1.3.19.1"; sha256 = "0f1g9sq3ysyjyps8p68wxh1rmjb3v7iw9gmj8zd7wb5kyjlc4xph"; isLibrary = true; @@ -125320,7 +125595,7 @@ self: { ]; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -125517,6 +125792,7 @@ self: { ansi-wl-pprint base containers hspec hspec-discover megaparsec QuickCheck scientific semigroups text transformers ]; + testToolDepends = [ hspec-discover ]; description = "Parser and pretty printer for the Thrift IDL format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -125811,6 +126087,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "latex-live-snippets" = callPackage + ({ mkDerivation, base, directory, filepath, lens, MissingH }: + mkDerivation { + pname = "latex-live-snippets"; + version = "0.1.0.0"; + sha256 = "0nvw0lf2fdr437ddfdlgba1dh6l50pksgl81zkhg65j0zp9fjp6s"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath lens MissingH + ]; + description = "Automatically inline Haskell snippets into LaTeX documents"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lattices" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty @@ -127034,8 +127325,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "lenses"; - version = "0.1.7"; - sha256 = "09p1ph5ih2dzrbn7h9wjnf4xch04g0amf8cc3q64g5a2clg3vjx4"; + version = "0.1.8"; + sha256 = "1wwl0f1f1scflnbjgqcinkpvpvhn21942bfbg8vlimdap6i5d49h"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Simple Functional Lenses"; license = stdenv.lib.licenses.bsd3; @@ -127730,8 +128021,8 @@ self: { ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: mkDerivation { pname = "libnotify"; - version = "0.2"; - sha256 = "0nazjlilbz3l32fn11shwxjlabvd2kfpxa7vnirpfp1y6k406mk6"; + version = "0.2.1"; + sha256 = "0a55lmalnn840zbryva19k3z4y79fq2q2qjl88wii3im53x0mzmy"; libraryHaskellDepends = [ base bytestring glib gtk ]; librarySystemDepends = [ libnotify ]; description = "Bindings to libnotify library"; @@ -130812,6 +131103,7 @@ self: { base markdown-unlit microlens monad-control mtl o-clock text universum yaml ]; + executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ async base data-default directory filepath hspec HUnit microlens-mtl QuickCheck universum unordered-containers @@ -133652,8 +133944,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.3.3"; - sha256 = "0hhyif8lqq16i25bvpz7z54n2rmnq9q198pjdm4vssh02597lnn8"; + version = "0.5.3.4"; + sha256 = "0gaz5drb8wvlr12ynwag4rcgmsyzd713j0qgpv9ydy3jlk65nrf7"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types lens mtl @@ -134414,6 +134706,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "math-functions_0_3_0_1" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit + , primitive, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.3.0.1"; + sha256 = "1nrslskbgsy9yx0kzc5a0jdahch218qd16343j001pdxkygq21b2"; + libraryHaskellDepends = [ + base data-default-class deepseq primitive vector vector-th-unbox + ]; + testHaskellDepends = [ + base data-default-class deepseq erf HUnit primitive QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + vector vector-th-unbox + ]; + description = "Collection of tools for numeric computations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mathblog" = callPackage ({ mkDerivation, base, bytestring, ConfigFile, containers , data-default, deepseq, directory, either, filepath, fsnotify @@ -135489,25 +135803,6 @@ self: { }: mkDerivation { pname = "mega-sdist"; - version = "0.3.3"; - sha256 = "0vwk3fq34f8nnviw7fxpyqx365v4khvjr45pzgxsgc7rfx7hcw9c"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring conduit conduit-extra http-conduit optparse-simple - rio rio-orphans tar-conduit yaml - ]; - description = "Handles uploading to Hackage from mega repos"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mega-sdist_0_3_3_1" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit - , yaml - }: - mkDerivation { - pname = "mega-sdist"; version = "0.3.3.1"; sha256 = "0p4n5m91i80cns1g5n18bczpyxm8jcc205syr3k8xd7x9gwg69ww"; isLibrary = false; @@ -135518,7 +135813,6 @@ self: { ]; description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "megaparsec" = callPackage @@ -135940,8 +136234,8 @@ self: { pname = "menoh"; version = "0.1.1"; sha256 = "0cbkhafibm65yn4222kfy8j6zkw6q6k3962hwjhbvp2n57avh789"; - revision = "1"; - editedCabalFile = "1mbn1aq24dvaa1amwypik69dmg1x8mm1dz1h4kadzvljc4ld870i"; + revision = "2"; + editedCabalFile = "1hfgg9n86cp3qa9ziycx2134zsvsn76ilkmwrqnc7yb50279dw1b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136444,43 +136738,6 @@ self: { }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.8"; - sha256 = "0hb5i60w369lngfw5a3bai5zvlgchcf1vvxshp9md77lyl7h49ar"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-qq attoparsec base base-compat blaze-markup bytestring - containers data-default either errors html-conduit lens-aeson - network-uri pcre-heavy safe tagsoup text time transformers - unordered-containers vector xml-lens xss-sanitize - ]; - executableHaskellDepends = [ - aeson aeson-pretty base base-compat blaze-html blaze-markup - data-default network network-uri options scotty text wai-cli - wai-extra - ]; - testHaskellDepends = [ - aeson-qq base base-compat bytestring data-default hspec - hspec-expectations-pretty-diff html-conduit mtl network-uri - raw-strings-qq template-haskell text time xml-lens - ]; - description = "A Microformats 2 parser"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "microformats2-parser_1_0_1_9" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base - , base-compat, blaze-html, blaze-markup, bytestring, containers - , data-default, either, errors, hspec - , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl - , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, tagsoup, template-haskell, text, time, transformers - , unordered-containers, vector, wai-cli, wai-extra, xml-lens - , xss-sanitize - }: - mkDerivation { - pname = "microformats2-parser"; version = "1.0.1.9"; sha256 = "1lxbw825yg16nmflf93l1sy6mxa3dnd7a5mdalc034brsnf1vish"; isLibrary = true; @@ -137768,8 +138025,8 @@ self: { pname = "mmark"; version = "0.0.5.6"; sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; - revision = "4"; - editedCabalFile = "0jc342mpqp1s6s9al7dyky54wpvbx6a1jl8yljmwgmhafrbg1kdk"; + revision = "5"; + editedCabalFile = "1m4l42g519hnzjaafsnbjcfr0nrf28x1lmc1kjh5swrg6qd3kf29"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -139860,6 +140117,8 @@ self: { pname = "monoid-extras"; version = "0.5"; sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6"; + revision = "1"; + editedCabalFile = "12dq0flvkw8lqbga3wsygcmkzwc9f16kmq31wh79alybzynz36qw"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -140307,6 +140566,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover motor motor-reflection text ]; + testToolDepends = [ hspec-discover ]; description = "Generate state diagrams from Motor FSM typeclasses"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -140324,6 +140584,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover indexed motor row-types ]; + testToolDepends = [ hspec-discover ]; description = "Reflect on Motor FSM typeclasses to obtain runtime representations"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -142236,6 +142497,8 @@ self: { pname = "mwc-probability"; version = "2.0.4"; sha256 = "0msi72qp5aps3n4ji565r4rzyjg7svwilsh8lch59y2b4q7fvscz"; + revision = "1"; + editedCabalFile = "1b4wbxkxx0szjgzgn5jc1qap80zx6ispxrd51yxs4z7llv15w5k6"; libraryHaskellDepends = [ base mwc-random primitive transformers ]; description = "Sampling function-based probability distributions"; license = stdenv.lib.licenses.mit; @@ -142274,6 +142537,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mwc-random_0_14_0_0" = callPackage + ({ mkDerivation, base, math-functions, primitive, time, vector }: + mkDerivation { + pname = "mwc-random"; + version = "0.14.0.0"; + sha256 = "18pg24sw3b79b32cwx8q01q4k0lm34mwr3l6cdkchl8alvd0wdq0"; + libraryHaskellDepends = [ + base math-functions primitive time vector + ]; + doCheck = false; + description = "Fast, high quality pseudo random number generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-random-accelerate" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -142926,6 +143204,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "named_0_2_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "named"; + version = "0.2.0.0"; + sha256 = "17ldvxypf099wj5phzh2aymzfwmyiyzhz24h1aj2s21nrys5n6n0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Named parameters (keyword arguments) for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "named-formlet" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, mtl , text, transformers @@ -144755,6 +145046,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-messagepack-rpc" = callPackage + ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions + , text, unordered-containers + }: + mkDerivation { + pname = "network-messagepack-rpc"; + version = "0.1.0.0"; + sha256 = "0yqisywmhl0y6f88ifpkv8dlldg5s2c2h8z8cv6mhhqj4qdzp1h3"; + libraryHaskellDepends = [ + base bytestring data-msgpack safe-exceptions text + unordered-containers + ]; + description = "MessagePack RPC"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "network-messagepack-rpc-websocket" = callPackage + ({ mkDerivation, async, base, bytestring, data-msgpack, envy, hspec + , network-messagepack-rpc, QuickCheck, skews, text, websockets + , wss-client + }: + mkDerivation { + pname = "network-messagepack-rpc-websocket"; + version = "0.1.0.0"; + sha256 = "1q7ckch5z08wxrdsv62z07ivdihqvmcwfg2pgcbf66dhgc9bq4f6"; + libraryHaskellDepends = [ + base network-messagepack-rpc text websockets wss-client + ]; + testHaskellDepends = [ + async base bytestring data-msgpack envy hspec + network-messagepack-rpc QuickCheck skews text wss-client + ]; + description = "WebSocket backend for MessagePack RPC"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "network-metrics" = callPackage ({ mkDerivation, base, binary, bytestring, data-default, network , random, time @@ -147393,6 +147720,7 @@ self: { template-haskell text time time-locale-compat transformers transformers-base unliftio unliftio-core utf8-string ]; + testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; }) {}; @@ -147415,6 +147743,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover nvim-hs QuickCheck ]; + testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; }) {}; @@ -147521,6 +147850,7 @@ self: { base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog tasty-hspec type-spec ]; + testToolDepends = [ doctest markdown-unlit ]; benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ]; description = "Type-safe time library"; license = stdenv.lib.licenses.mit; @@ -148379,6 +148709,8 @@ self: { pname = "one-liner"; version = "1.0"; sha256 = "1diigbl8l0m8q1sl0kxjjqbhl3vkpf0rrzxlbqaamp3ahpmgpx67"; + revision = "1"; + editedCabalFile = "1ijc5mj93zyfj7hh12aw3xh30kc1xsp7wf6rbbfal36yllnl2xhs"; libraryHaskellDepends = [ base bifunctors contravariant ghc-prim profunctors tagged transformers @@ -148531,6 +148863,7 @@ self: { multiset postgresql-simple product-profunctors profunctors QuickCheck semigroups text time transformers ]; + testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -150871,6 +151204,55 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_2_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , binary, blaze-html, blaze-markup, bytestring, Cabal + , case-insensitive, cmark-gfm, containers, criterion, data-default + , deepseq, Diff, directory, doctemplates, exceptions + , executable-path, filepath, Glob, haddock-library, hslua + , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls + , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types + , parsec, process, QuickCheck, random, safe, SHA, skylighting + , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, temporary, texmath, text, time, unix + , unordered-containers, vector, weigh, xml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.2.2"; + sha256 = "0rbr6mjm7kfzxrjbglqj6bgz1l1zlbiiff3pi59nhqava3nindqc"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring binary blaze-html + blaze-markup bytestring case-insensitive cmark-gfm containers + data-default deepseq directory doctemplates exceptions filepath + Glob haddock-library hslua hslua-module-text HsYAML HTTP + http-client http-client-tls http-types JuicyPixels mtl network + network-uri pandoc-types parsec process random safe SHA skylighting + split syb tagsoup temporary texmath text time unix + unordered-containers vector xml zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers Diff directory + executable-path filepath Glob hslua pandoc-types process QuickCheck + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time + xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion mtl text time weigh + ]; + doCheck = false; + description = "Conversion between markup formats"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -150994,6 +151376,7 @@ self: { base pandoc-types tasty tasty-discover tasty-hspec tasty-hunit unordered-containers ]; + testToolDepends = [ tasty-discover ]; description = "A Pandoc filter for emphasizing code in fenced blocks"; license = stdenv.lib.licenses.mpl20; }) {}; @@ -151129,6 +151512,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover mtl pandoc-types SHA utf8-string ]; + testToolDepends = [ hspec-discover ]; description = "Render and insert PlantUML diagrams with Pandoc"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -151828,14 +152212,12 @@ self: { }) {}; "parallel" = callPackage - ({ mkDerivation, array, base, containers, deepseq }: + ({ mkDerivation, array, base, containers, deepseq, ghc-prim }: mkDerivation { pname = "parallel"; - version = "3.2.1.1"; - sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj"; - revision = "1"; - editedCabalFile = "12sgigg7r4nmyhbfn1p09ajf4s576yca31b7daj5zpp1mxgb5x7i"; - libraryHaskellDepends = [ array base containers deepseq ]; + version = "3.2.2.0"; + sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; + libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -152715,6 +153097,8 @@ self: { pname = "passman-core"; version = "0.2.0.0"; sha256 = "03l43n8r0jdxbc07qjdazkanzd7lj1kp814ylhvn0ri9zzyfcgm7"; + revision = "1"; + editedCabalFile = "1840hm9wiym9jlgij1b2d8fa90pdscg2rqhzhvrl7qawd3jjxq5x"; libraryHaskellDepends = [ aeson base bcrypt bytestring conduit conduit-extra containers cryptohash-md5 csv-conduit data-ordlist directory filepath int-cast @@ -155131,6 +155515,7 @@ self: { base bytestring exceptions hspec hspec-discover postgresql-simple tmp-postgres ]; + testToolDepends = [ hspec-discover ]; description = "Another postgresql-simple transaction monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155869,6 +156254,7 @@ self: { base bytestring containers hspec hspec-discover QuickCheck semigroups text unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; description = "An alternative implementation of Thrift for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -156806,8 +157192,8 @@ self: { pname = "pipes-random"; version = "1.0.0.4"; sha256 = "17k510v2f5ziysqh7sknyw3rgxf8iblw800z3hh8gymaszkhfajl"; - revision = "1"; - editedCabalFile = "0m32wz3rwxx9gdcl1chk64yspyd1ls13z03zcgjcn865mpbhz97h"; + revision = "2"; + editedCabalFile = "0czw2qfi05d5kbnwzhzr75j1ag6hfbn9nvbjyifdjradfzjxl2s9"; libraryHaskellDepends = [ base mwc-random pipes vector ]; description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; @@ -157922,6 +158308,7 @@ self: { AC-Vector base hspec markdown-unlit QuickCheck random random-shuffle ]; + testToolDepends = [ markdown-unlit ]; description = "Point octree, with bounding boxes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -157999,22 +158386,16 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.7"; - sha256 = "1xw2p96ghclfxmc12kwxyh25r5k9k6h3zriaf38wz5d3j36npa7w"; - revision = "1"; - editedCabalFile = "0mdanymbifnxc85z3aixmn5v08kxa1fjazadrhc0jjf5y110sxc2"; + version = "1.1.1.8"; + sha256 = "16n1yzjnfhwkdps8lcjhpnrmbbrvw2n6qsi90vzjxswkwsvp4hi3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers haskell-src-exts transformers ]; - executableHaskellDepends = [ - array base containers haskell-src-exts transformers - ]; - testHaskellDepends = [ - array base containers haskell-src-exts HUnit QuickCheck - transformers - ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit QuickCheck ]; + doHaddock = false; description = "Tool for refactoring expressions into pointfree form"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -158436,8 +158817,8 @@ self: { pname = "polyvariadic"; version = "0.3.0.3"; sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1"; - revision = "1"; - editedCabalFile = "11jrr3xbkc828564sg3cc6ca1qaibbp43lbyrgi32kjy5l97w7y0"; + revision = "2"; + editedCabalFile = "0bcckgz6v7707rdgipaahqws6gkcmmrq5wyl407awb3fssnqxfkn"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Creation and application of polyvariadic functions"; @@ -158718,6 +159099,7 @@ self: { array base bytestring cairo containers glib gtk mtl ]; libraryPkgconfigDepends = [ gdk_pixbuf gtk2 pango poppler ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; @@ -159459,6 +159841,7 @@ self: { pg-transact postgresql-simple random split stm text time transformers ]; + testToolDepends = [ hspec-discover ]; description = "A PostgreSQL backed queue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -159754,8 +160137,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.0.1.1"; - sha256 = "1mn3wqk0n4ny8b0m891ndqswxr9zafl4hvb20i12q1d6mxirczlf"; + version = "2.0.2"; + sha256 = "00z7al5kk3ry3npghc71vlwba5wmxrlps3lmwllpw8sgf8x288r5"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -159768,8 +160151,8 @@ self: { }: mkDerivation { pname = "potoki-cereal"; - version = "0.2.1.1"; - sha256 = "19rd5ykifa7bv32cyxp8hi942sl7xwav0cqhygp6kngw3vsrsnv8"; + version = "0.3"; + sha256 = "0m7g9dkvzb94iwywf3bil8h57xbs2d3zvgn4d8la54qz5izimszp"; libraryHaskellDepends = [ acquire attoparsec base base-prelude bytestring cereal potoki-core text @@ -159788,8 +160171,8 @@ self: { }: mkDerivation { pname = "potoki-core"; - version = "2.2.1.1"; - sha256 = "18szi60ngxj69y5xpiwfhvp51ggb81kv6kphd3ghjjai7as42nmk"; + version = "2.2.2.1"; + sha256 = "0bnmqw0jk8p7bfhy165w5ha3pl0966z5bxzfacbyiqvhmj68xx6j"; libraryHaskellDepends = [ acquire attoparsec base bytestring directory foldl hashable profunctors ptr stm text transformers unagi-chan @@ -159992,6 +160375,7 @@ self: { base boxes containers HUnit markdown-unlit QuickCheck tasty tasty-hunit tasty-quickcheck vector ]; + testToolDepends = [ markdown-unlit ]; description = "Pretty Print containers in a tabular format"; license = stdenv.lib.licenses.mit; }) {}; @@ -160712,25 +161096,6 @@ self: { }: mkDerivation { pname = "pretty-simple"; - version = "2.1.0.0"; - sha256 = "1jiq9l2zlgk3yzy6mif84fdzvwx3vzzbsh9zvwdph12zxa2y4b68"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base containers mtl parsec text transformers - ]; - testHaskellDepends = [ base doctest Glob ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "pretty printer for data types with a 'Show' instance"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pretty-simple_2_1_0_1" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, criterion - , doctest, Glob, mtl, parsec, text, transformers - }: - mkDerivation { - pname = "pretty-simple"; version = "2.1.0.1"; sha256 = "1lfkbjpcgyiv915xvhpirhx8x7ng1jgrlxd6zlilcvnpkkm2xacs"; isLibrary = true; @@ -160742,7 +161107,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-sop" = callPackage @@ -161107,6 +161471,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "primitive-extras" = callPackage + ({ mkDerivation, base, cereal, deferred-folds, foldl, primitive + , profunctors, vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.3"; + sha256 = "1az9933jkf3891l6svzvg1fhprmcnjj1bklr0rglrljlj8m01laz"; + libraryHaskellDepends = [ + base cereal deferred-folds foldl primitive profunctors vector + ]; + description = "Extras for the \"primitive\" library"; + license = stdenv.lib.licenses.mit; + }) {}; + "primitive-indexed" = callPackage ({ mkDerivation, base, doctest, primitive, QuickCheck }: mkDerivation { @@ -161457,14 +161836,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_3_0" = callPackage + "process_1_6_4_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.3.0"; - sha256 = "0lxkl0gmyy2sn3r9c7dyz8vz1cm6nvygmgrizilliir5bp42m8cc"; + version = "1.6.4.0"; + sha256 = "1w12ssmwpz5glmm964rxdc3fgi2w5sq9lac17rxs8p626r5p6rkn"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -162973,8 +163352,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.6.0"; sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra"; - revision = "1"; - editedCabalFile = "11n7wcfpahbyg8lmq90vvq11fm2ls4761qf9q7pkbvd7vkm6by2n"; + revision = "2"; + editedCabalFile = "1wnp16zs9nx3b250cmh6j84scv821arc0grb8k08h0a3kphavqx1"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -163082,6 +163461,7 @@ self: { sha256 = "12130fpdskml0mdgbr38zki48n5ffid0diiixyn89kzcq948vvmn"; libraryHaskellDepends = [ base generic-deriving ]; testHaskellDepends = [ base hspec hspec-discover ]; + testToolDepends = [ hspec-discover ]; description = "Bindings for the pthread library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -163611,6 +163991,7 @@ self: { tasty tasty-hspec text time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; + testToolDepends = [ hspec-discover ]; doCheck = false; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; @@ -165680,6 +166061,7 @@ self: { base bytestring hspec hspec-discover HUnit QuickCheck transformers vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base blaze-builder bytestring criterion pretty ]; @@ -165976,16 +166358,15 @@ self: { }: mkDerivation { pname = "raketka"; - version = "1.1.1"; - sha256 = "0whm7jzmcq30zg7rb29m50dyx6ikjk1xjxi74w8qsmjy2hyj3ph0"; - revision = "1"; - editedCabalFile = "1adyzp0wc4lajgbs4h6rgliw0qqs13bnq1rhzmqacwji39rx0qsz"; + version = "1.1.2"; + sha256 = "1zyqgldryci4cbwqcbjlkm4k1dfps36x4rk03pi9gf901zw0k38p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base binary conf-json containers distributed-process - distributed-process-simplelocalnet network network-transport - network-transport-tcp random stm tagged template-haskell + aeson async base binary bytestring conf-json containers + distributed-process distributed-process-simplelocalnet network + network-transport network-transport-tcp random stm tagged + template-haskell ]; executableHaskellDepends = [ aeson async base binary bytestring conf-json containers @@ -166880,8 +167261,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.4"; - sha256 = "14ivx9hb7hjy0i7ybz92mcr800zzfspfldzw9jr6qpmrnv43nqdd"; + version = "1.0.5"; + sha256 = "0an55fbl8q7d0h4zlpx8vg4kijwmw99f2fvf50nq06c6snlfjg4r"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -166900,8 +167281,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.0.2"; - sha256 = "07hpsmv3c75r8lc9fpa2mn5xsz5xml5nadzlzq8dihbgv6ma4mss"; + version = "1.0.3"; + sha256 = "0bkk41qk0040a6sbsc5ky968gw1y5501ji7l2040hwz8j4z8wm84"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -166938,8 +167319,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "4.1.1"; - sha256 = "1wwglqr84ijzrbsrid5cfhm96ljnfdj59z766wjbr8fx5gmrcdfw"; + version = "4.1.2"; + sha256 = "0zmacxdf1k5mnvmrrkkvgjghzr4h948z5g73lavhmfg56i6vpkb2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169937,6 +170318,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_12_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-reify-compat, time, time-locale-compat, transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.12.1.0"; + sha256 = "1mdd3lh4kpqaa7l0aqnsnwgi95hbwh9p8dx61js8011wl50j9l9k"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text th-reify-compat + time time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers product-isomorphic quickcheck-simple transformers + ]; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic @@ -169946,8 +170350,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.7.0.0"; - sha256 = "1kzryjkfkg4f616ijyx28p72v9a45gpvjs7jpksb1by24ll9ly46"; + version = "0.7.0.1"; + sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query @@ -169961,7 +170365,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query-HDBC_0_7_0_1" = callPackage + "relational-query-HDBC_0_7_1_1" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic , QuickCheck, quickcheck-simple, relational-query @@ -169970,8 +170374,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.7.0.1"; - sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0"; + version = "0.7.1.1"; + sha256 = "0lgzkqx4nhvwrrgdrr423d4yyadf6x8l664030l2xi4zrxjws2mk"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query @@ -170744,6 +171148,7 @@ self: { hspec-discover ixset lens mtl old-locale parsec QuickCheck stm text time transformers transformers-base transformers-compat ]; + testToolDepends = [ hspec-discover ]; description = "Blogging module using blaze html for markup"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -172112,13 +172517,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rhine_0_4_0_2" = callPackage + "rhine_0_4_0_3" = callPackage ({ mkDerivation, base, containers, dunai, free, time, transformers }: mkDerivation { pname = "rhine"; - version = "0.4.0.2"; - sha256 = "1lsa9sgfrxdwz1jgjd314n7g4a8q97gq990nqdsxrrq2bmvdhpv1"; + version = "0.4.0.3"; + sha256 = "1s88dga75c835ixw1j59chswiv512sdwwg09p0r5jgsl8lqjp6h7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174669,8 +175074,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "1.0.3"; - sha256 = "1688sd4zrw8swb61svnjawaq7w85hgvh4ww7zz3yppl40sl82irj"; + version = "1.0.4"; + sha256 = "0q9z7smss3lf33lq982ghrq8dhv71cppc73zi61b22f0b076njvd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Semantic version numbers and constraints"; @@ -174826,6 +175231,8 @@ self: { pname = "sampling"; version = "0.3.3"; sha256 = "038fl0mdim3r25jsj8bgvnmkd7iy00hpwbc0yqwijsqyss9xrgn8"; + revision = "1"; + editedCabalFile = "168k8ykppa8pikfxy1gmby63kfzr833vswh8wcchz8li9vkd4w2h"; libraryHaskellDepends = [ base containers foldl mwc-random primitive vector ]; @@ -175669,6 +176076,7 @@ self: { regex-tdfa-text singletons smallcheck tagged text unordered-containers validationt vinyl ]; + testToolDepends = [ hspec-discover ]; description = "JSON-biased spec and validation tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -176021,7 +176429,7 @@ self: { async base bytestring data-default-class directory hpc-coveralls hspec hspec-wai http-types lifted-base network text wai ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ hpc-coveralls hspec-discover ]; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -177179,16 +177587,16 @@ self: { "self-extract" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed - , path, path-io, process, unix-compat, ztar + , path, path-io, unix-compat, ztar }: mkDerivation { pname = "self-extract"; - version = "0.3.1"; - sha256 = "01kzvjzb6rh86jzvh4n4802bvzgjz34rwmcrpm4aqzxpca9ax556"; + version = "0.3.2"; + sha256 = "0w4pqh9bcdnkyjmy24am2b894627x9is33vbyw03r0br9pd7q82q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring Cabal extra file-embed path path-io process + base binary bytestring Cabal extra file-embed path path-io unix-compat ztar ]; executableHaskellDepends = [ base ]; @@ -178322,7 +178730,7 @@ self: { jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth servant-server time transformers wai warp wreq ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -178582,7 +178990,7 @@ self: { servant servant-client-core servant-server text transformers transformers-compat wai warp ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ hspec-discover markdown-unlit ]; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -179890,8 +180298,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9"; - revision = "20"; - editedCabalFile = "0g13cchj5wnjpypsj9fgwk4ypy8xzzwrpry2f9zlsyp0lvkqjqrw"; + revision = "21"; + editedCabalFile = "1xrlhbgh54ny4xiqcdbka7i86wkyyqndwwv3r3k47xdr5683iyc1"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -180009,8 +180417,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.6.1"; - sha256 = "1amv4plafwjnw2nd4hc429zpybvd70c4c76hvnmkwc4d13z3rh3b"; + version = "0.6.2"; + sha256 = "1nlby06n8wkildflwlszcy9iljji19mdfkaw0fnnll0l7gir14v5"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -180022,6 +180430,34 @@ self: { http-types iproute lens raw-strings-qq text time unix unordered-containers ]; + testToolDepends = [ hspec-discover ]; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "serverless-haskell_0_7_0" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive + , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq + , text, time, unix, unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.7.0"; + sha256 = "04z67q8g8qkksivvqw8dk8m883f3kicc98m16v17hpdv5kni8qcj"; + libraryHaskellDepends = [ + aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis + amazonka-s3 base bytestring case-insensitive http-types iproute + lens text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis + amazonka-s3 base bytestring case-insensitive hspec hspec-discover + http-types iproute lens raw-strings-qq text time unix + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -180205,24 +180641,6 @@ self: { "servius" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, bytestring - , http-types, markdown, shakespeare, text, wai, wai-app-static - }: - mkDerivation { - pname = "servius"; - version = "1.2.0.3"; - sha256 = "1w330lvkikbsv92g398kmnlw71wym6l080d8xsdfdx2wwl0iyqj7"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base blaze-builder blaze-html bytestring http-types markdown - shakespeare text wai wai-app-static - ]; - description = "Warp web server with template rendering"; - license = stdenv.lib.licenses.mit; - }) {}; - - "servius_1_2_1_0" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, bytestring , cmark-gfm, http-types, shakespeare, text, wai, wai-app-static }: mkDerivation { @@ -180237,7 +180655,6 @@ self: { ]; description = "Warp web server with template rendering"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html" = callPackage @@ -180464,6 +180881,7 @@ self: { base containers mtl smallcheck tasty tasty-discover tasty-hunit tasty-quickcheck tasty-smallcheck ]; + testToolDepends = [ tasty-discover ]; description = "A Haskell implementation of setoid"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -182222,8 +182640,8 @@ self: { pname = "sign"; version = "0.4.3"; sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp"; - revision = "1"; - editedCabalFile = "112xj46k2fzhxiqsnh2fs7fmfrhs6k4q65jxw8mkn58mwl9sr86f"; + revision = "2"; + editedCabalFile = "1j4kxvxd3cl9k2nhlgnx8zrh1ygd0m75q0m2wrqcqv0pf1z39lya"; libraryHaskellDepends = [ base containers deepseq hashable lattices universe-base ]; @@ -183372,8 +183790,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "singleton-typelits"; - version = "0.0.0.0"; - sha256 = "00f2nvs4avl3kxijcl7wb17ip1mcnb4fzqq5ckcz0a247qvv4yig"; + version = "0.1.0.0"; + sha256 = "08xn7qv9kwhj9i69bpzigd76581rpq2jz410gmvr29g5ag1d0k08"; libraryHaskellDepends = [ base ]; description = "Singletons and induction over GHC TypeLits"; license = stdenv.lib.licenses.bsd3; @@ -183627,6 +184045,7 @@ self: { generics-sop hedgehog HUnit lens markdown-unlit tasty tasty-hedgehog tasty-hunit vector-space ]; + testToolDepends = [ markdown-unlit ]; description = "Multidimensional grids with sized specified at compile time"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -183741,6 +184160,7 @@ self: { base containers mtl smallcheck tasty tasty-discover tasty-hunit tasty-quickcheck tasty-smallcheck ]; + testToolDepends = [ tasty-discover ]; description = "Skeletal set - a set with equivalence relation different from equality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -183919,6 +184339,8 @@ self: { pname = "skylighting-core"; version = "0.7.2"; sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq"; + revision = "1"; + editedCabalFile = "0qjmk3i9kjnd3195fhphjgqvsgbw6blfjl40mdyiblw1piyvc6yw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184140,6 +184562,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "slick" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers, lens + , lens-aeson, mustache, pandoc, shake, text, time + }: + mkDerivation { + pname = "slick"; + version = "0.1.0.0"; + sha256 = "0irp1d9z5l8jr33qgbnkq05lpkpll6dw84qyl0cd2xnqs1iklyds"; + libraryHaskellDepends = [ + aeson base binary bytestring containers lens lens-aeson mustache + pandoc shake text time + ]; + testHaskellDepends = [ + aeson base binary bytestring containers lens lens-aeson mustache + pandoc shake text time + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "slidemews" = callPackage ({ mkDerivation, aeson, base, bytestring, MonadCatchIO-transformers , mtl, pandoc, snap-core, snap-server, utf8-string @@ -186669,6 +187110,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "solve" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "solve"; + version = "1.0"; + sha256 = "06sk2imqgzk9zjr10ignigs04avnjjxfsi2qkk7vqfslhcfzgqnq"; + libraryHaskellDepends = [ base containers ]; + description = "Solving simple games"; + license = stdenv.lib.licenses.mit; + }) {}; + "sonic-visualiser" = callPackage ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl , pretty, utf8-string, xml @@ -186721,14 +187173,18 @@ self: { }) {}; "sort-by-pinyin" = callPackage - ({ mkDerivation, air, base, bytestring, containers, text }: + ({ mkDerivation, air, base, bytestring, containers, here + , template-haskell, text + }: mkDerivation { pname = "sort-by-pinyin"; - version = "2017.10.18"; - sha256 = "0gxz5kmkcmq8330v1iclhxqzfb6p9qk4prnskm16qmv2i4dp1p34"; + version = "2018.4.9"; + sha256 = "0r7fnsb4wcmhabybggzfbi1v2qcl7jzsmvwc43v7pwg5fl217nm8"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ air base bytestring containers text ]; - description = "Sort Simplified Chinese by PinYin"; + libraryHaskellDepends = [ + air base bytestring containers here template-haskell text + ]; + description = "sort by pinyin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -187459,18 +187915,19 @@ self: { ({ mkDerivation, aeson, base, bytestring, heavy-logger, HsOpenSSL , hspec, http-client, http-client-openssl, http-types , json-autotype, lens, mime-types, monad-control, mtl - , neat-interpolation, options, SHA, text, text-format-heavy, wreq + , neat-interpolation, options, SHA, split, text, text-format-heavy + , wreq }: mkDerivation { pname = "speechmatics"; - version = "0.7.1.0"; - sha256 = "1sx4q4l1rx6xss6xp1qqdb1nscclaszpkn78cs47rxpa19lcnsd2"; + version = "0.7.2.0"; + sha256 = "0i8xmlk0czqkshkdmnskqp7xpy45ads1x7yzdjn9p5mn0z46h7vb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring heavy-logger HsOpenSSL http-client http-client-openssl http-types json-autotype lens mime-types - monad-control mtl text text-format-heavy wreq + monad-control mtl split text text-format-heavy wreq ]; executableHaskellDepends = [ aeson base bytestring heavy-logger mime-types mtl options SHA text @@ -188787,8 +189244,8 @@ self: { pname = "stache"; version = "1.2.1"; sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; - revision = "6"; - editedCabalFile = "1h4llrsmd270vnw7fxzvw1a22bdkm3srdf5f3v19pbcgm2ahadsj"; + revision = "7"; + editedCabalFile = "08i636hsi0znrm3ma7z2wknma06aa4xzfqwy0z4x9d7vn7fscm48"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -188828,8 +189285,8 @@ self: { pname = "stack"; version = "1.7.1"; sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r"; - revision = "5"; - editedCabalFile = "1pfvn5xc3yq2i2qxml4ww3mm2lidkz1v4f76j0x08g37p37d2lbz"; + revision = "8"; + editedCabalFile = "0l6fnradzx4wf5q5zm1yv3zj8mragvzjk472pz3jsvk6iam6ss2c"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -189903,8 +190360,8 @@ self: { pname = "statistics"; version = "0.14.0.2"; sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l"; - revision = "1"; - editedCabalFile = "0gg7hq8qvbnhp7lnrykh401ggr51izffylgdmy6nip2a81q9dxi0"; + revision = "2"; + editedCabalFile = "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3"; libraryHaskellDepends = [ aeson base base-orphans binary deepseq erf math-functions monad-par mwc-random primitive vector vector-algorithms @@ -190974,8 +191431,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.24.1"; - sha256 = "1kgky2713bik420i93k982zwlnp4ldr6lik2brg4nqwplwzf091i"; + version = "0.24.3"; + sha256 = "1dvac89fzciklhkkagmhq93sk7mscnp3k4nw9izbfr5gyfdmvvdz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190986,6 +191443,7 @@ self: { aeson aeson-pretty base bytestring containers hashable hspec hspec-discover lens template-haskell text unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "EDSL for AWS CloudFormation"; license = stdenv.lib.licenses.mit; }) {}; @@ -191229,24 +191687,25 @@ self: { }) {}; "streaming-benchmarks" = callPackage - ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit - , csv, deepseq, directory, gauge, list-t, list-transformer, logict - , machines, mtl, pipes, random, split, streaming, streamly, text - , transformers, typed-process, vector + ({ mkDerivation, base, bench-graph, bytestring, Chart + , Chart-diagrams, conduit, csv, deepseq, directory, drinkery, gauge + , getopt-generics, machines, mtl, pipes, random, split, streaming + , streamly, template-haskell, text, transformers, typed-process + , vector }: mkDerivation { pname = "streaming-benchmarks"; - version = "0.1.0"; - sha256 = "0nyv4z828fj8jhan7q0bx2s351xmbxz9z81g2x3nyk4ad1rqjpyq"; + version = "0.2.0"; + sha256 = "1vpflmvz2vrll9bangl61rdjnngdxbrmpzg3xha8h85ij3458c0x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring Chart Chart-diagrams csv directory split text - typed-process + base bench-graph bytestring Chart Chart-diagrams csv directory + getopt-generics split text transformers typed-process ]; benchmarkHaskellDepends = [ - base conduit deepseq gauge list-t list-transformer logict machines - mtl pipes random streaming streamly transformers vector + base conduit deepseq drinkery gauge machines mtl pipes random + streaming streamly template-haskell transformers vector ]; description = "Benchmarks to compare streaming packages"; license = stdenv.lib.licenses.mit; @@ -191623,6 +192082,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streamly_0_4_1" = callPackage + ({ mkDerivation, atomic-primops, base, containers, deepseq + , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue + , monad-control, mtl, QuickCheck, random, transformers + , transformers-base + }: + mkDerivation { + pname = "streamly"; + version = "0.4.1"; + sha256 = "0xxkb8vdnbyq5l590wh3ig68xw4ny44aymx4k816cbif2da5w7zy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base containers exceptions ghc-prim heaps + lockfree-queue monad-control mtl transformers transformers-base + ]; + testHaskellDepends = [ + base containers exceptions hspec mtl QuickCheck random transformers + ]; + benchmarkHaskellDepends = [ + atomic-primops base containers deepseq exceptions gauge ghc-prim + heaps lockfree-queue monad-control mtl random transformers + transformers-base + ]; + description = "Beautiful Streaming, Concurrent and Reactive Composition"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -192292,8 +192780,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "5.0.5"; - sha256 = "1kzkhq791ycx5q20vg6pfl1y1mirlk9h00s4ii1pf5l56lw6kgq1"; + version = "5.0.6"; + sha256 = "0dpf986nbsz5j47dl26073qyz290nznghi85mzj2gw0rlj9dp937"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -192303,6 +192791,7 @@ self: { http-client-tls http-types markdown-unlit template-haskell text time transformers ]; + testToolDepends = [ markdown-unlit ]; description = "A client for the Strava V3 API"; license = stdenv.lib.licenses.mit; }) {}; @@ -192380,8 +192869,8 @@ self: { }: mkDerivation { pname = "structured-cli"; - version = "0.9.3.0"; - sha256 = "107kyi11634r7iqx0n6ry60byjab3xigl0xf3waq0lrv7jgrmhbz"; + version = "0.9.4.0"; + sha256 = "1mwrr0brmjb15ncjqapqaslrz3akzn3bs3ajnwsa1d0ji25l2igd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192956,6 +193445,33 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "summoner_1_0_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory + , filepath, generic-deriving, hedgehog, neat-interpolation + , optparse-applicative, process, tasty, tasty-discover + , tasty-hedgehog, text, time, tomland, universum + }: + mkDerivation { + pname = "summoner"; + version = "1.0.5"; + sha256 = "0sxgg1g2d6pwvmp0rbyny3cizbajd0iq2wdyxspfw3rapkjap5j2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring directory filepath + generic-deriving neat-interpolation optparse-applicative process + text time tomland universum + ]; + executableHaskellDepends = [ base universum ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog universum + ]; + testToolDepends = [ tasty-discover ]; + description = "Tool for creating completely configured production Haskell projects"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sump" = callPackage ({ mkDerivation, base, bytestring, data-default, lens, serialport , transformers, vector @@ -193273,8 +193789,8 @@ self: { }: mkDerivation { pname = "superrecord"; - version = "0.5.0.0"; - sha256 = "1bg2kjkwl78lhf34j1xb20lpypp26bavd0h6cnhj4m6d4sq3z86a"; + version = "0.5.0.1"; + sha256 = "0l1zimami83701djj47nk3izb10m6jxszq52zwmb8411dbn9pclb"; libraryHaskellDepends = [ aeson base bytestring constraints deepseq ghc-prim mtl text ]; @@ -193467,6 +193983,7 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base cairo glib mtl text ]; libraryPkgconfigDepends = [ librsvg ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the libsvg-cairo library"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs.gnome3) librsvg;}; @@ -195051,8 +195568,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.8.0.1"; - sha256 = "12glh66b7ih6zxhry1s1a9pbc2arpz0m4z1hvx3r3ji8s87i18kh"; + version = "0.8.0.2"; + sha256 = "0dxdk1yjbk0f648q59dfkgx9asc24f733ww3cs98p799n7jnfl1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197887,6 +198404,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover mtl template-haskell transformers ]; + testToolDepends = [ hspec-discover ]; description = "Test monadic side-effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -198249,6 +198767,7 @@ self: { sha256 = "0wagfhljym2mnwpxld8dcf4qcdbp3d9liyf9mcigd4kiy5sdhfx4"; libraryHaskellDepends = [ base HUnit ]; testHaskellDepends = [ base hspec hspec-discover silently ]; + testToolDepends = [ hspec-discover ]; description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -198493,16 +199012,16 @@ self: { "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath - , HUnit, io-streams, lens, mtl, process, temporary, test-framework - , test-framework-hunit + , HUnit, io-streams, lens, mtl, process, semigroups, temporary + , test-framework, test-framework-hunit }: mkDerivation { pname = "texrunner"; - version = "0.0.1.1"; - sha256 = "0qsx47jml91ndnlln7nmw4p0rh3vf07br29fqsxg831f7xd190v2"; + version = "0.0.1.2"; + sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath io-streams mtl - process temporary + process semigroups temporary ]; testHaskellDepends = [ base bytestring HUnit lens test-framework test-framework-hunit @@ -198634,6 +199153,7 @@ self: { base base16-bytestring base64-bytestring bytestring errors text ]; testHaskellDepends = [ base bytestring hspec hspec-discover text ]; + testToolDepends = [ hspec-discover ]; description = "Safe conversions between textual types"; license = stdenv.lib.licenses.isc; }) {}; @@ -199813,6 +200333,7 @@ self: { sha256 = "1r9qwj3aw5adxzgxb1kgr9s1scrqclf4jfmlhv8nz1dhbqwg84h1"; libraryHaskellDepends = [ base template-haskell time ]; testHaskellDepends = [ base markdown-unlit ]; + testToolDepends = [ markdown-unlit ]; description = "Template Haskell splice that expands to current time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -200359,8 +200880,8 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.11"; - sha256 = "07v9szpjx4hd01rk1wq5a3bcpkxnm317f6xj3mi2klxrdwrhdyav"; + version = "0.2.11.1"; + sha256 = "18s1k3c3013zsvw3midzpwlh7mn2lmz6ryyrh98rhjccz5nl0qvh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -200564,6 +201085,7 @@ self: { base doctest either safe-exceptions silently tasty tasty-discover tasty-hunit text ]; + testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; license = stdenv.lib.licenses.mit; }) {}; @@ -201748,9 +202270,11 @@ self: { base clay containers data-has directory frontmatter inliterate lucid process require temporary text universum yaml ]; + libraryToolDepends = [ require ]; executableHaskellDepends = [ base optparse-generic require universum ]; + executableToolDepends = [ require ]; testHaskellDepends = [ base require ]; description = "A softer alternative to Haddock"; license = stdenv.lib.licenses.asl20; @@ -202154,6 +202678,7 @@ self: { base bytestring directory hspec hspec-discover postgresql-simple process temporary ]; + testToolDepends = [ hspec-discover ]; description = "Start and stop a temporary postgres for testing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -202875,8 +203400,8 @@ self: { }: mkDerivation { pname = "tpdb"; - version = "2.1.0"; - sha256 = "155vpz1l2qdxnyp87qmkyphdrab7jryqjdlvddb55ii7cdjdm6d7"; + version = "2.1.1"; + sha256 = "0hk592dki8hp15a84pnqnjdwql2zczfask71gxf833i0vrph38yb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206313,6 +206838,7 @@ self: { base ghc-typelits-knownnat hedgehog tasty tasty-discover tasty-hedgehog tasty-hspec ]; + testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base criterion deepseq dependent-map dependent-sum ghc-typelits-knownnat @@ -206354,8 +206880,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.6.2.1"; - sha256 = "0qa9vp1fg495b2ddzbdpivlzp0maap7jxqn2xd4z2rrxbrjdlhl2"; + version = "0.6.3.1"; + sha256 = "16jysdh7v8336xkhl6vzni5zj301jsgawwxy8fcrd74p87am2k05"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -207098,6 +207624,8 @@ self: { pname = "unfoldable"; version = "0.9.6"; sha256 = "18gaay37mjgyd5rfpfs84p4q7vqdnv4lcjabaprgm315pblym46d"; + revision = "1"; + editedCabalFile = "1lgyfmv339zfkrf6s4bw1ksk0757vcc1vx07yc4l33idmpsgz77c"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -208500,6 +209028,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unwrapped-functors" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "unwrapped-functors"; + version = "0.1.0.0"; + sha256 = "08q1zvc61gh2l8212xb2p4nvjx7p0qaw1q69085xzgg3hn5rwig2"; + libraryHaskellDepends = [ base ]; + description = "Unwrapping sums/products lifted to functors"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "uom-plugin" = callPackage ({ mkDerivation, base, containers, deepseq, ghc , ghc-tcplugins-extra, hlint, tasty, tasty-hunit, template-haskell @@ -210586,8 +211125,8 @@ self: { pname = "vector"; version = "0.12.0.1"; sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i"; - revision = "2"; - editedCabalFile = "0vzr8kra73anchp86knkmkq2afkd1hw6hirldn9vn69frynb1n6y"; + revision = "3"; + editedCabalFile = "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base HUnit QuickCheck random template-haskell test-framework @@ -210874,8 +211413,8 @@ self: { }: mkDerivation { pname = "vector-sized"; - version = "1.0.3.0"; - sha256 = "1mjg8hncv7xd3w7fsdalvhwiwnsr83nxv21njc01bgj891as44bx"; + version = "1.0.4.0"; + sha256 = "1rdryc5ykqvdpjgx3a895cx2i14ixg0ryhppn89fjzhann79mgk4"; libraryHaskellDepends = [ adjunctions base deepseq distributive finite-typelits indexed-list-literals primitive vector @@ -210884,23 +211423,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-sized_1_0_3_1" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, distributive - , finite-typelits, indexed-list-literals, primitive, vector - }: - mkDerivation { - pname = "vector-sized"; - version = "1.0.3.1"; - sha256 = "0dzf3cg7zfg4k5jiq7h6dw2ihczs42as9cxn8dkswx5v6nahnnxx"; - libraryHaskellDepends = [ - adjunctions base deepseq distributive finite-typelits - indexed-list-literals primitive vector - ]; - description = "Size tagged vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -211307,8 +211829,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.18"; - sha256 = "1cf37vhj21yd6d1bia7jlwwc0bw6d2lwj7wkl936argn3zzxrqf6"; + version = "0.0.0.19"; + sha256 = "1v8lnc3naklznwrla34zgx4hf5vzb2762f9p1cxkb5fdnwslbmlc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -211908,6 +212430,7 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ vte ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -211925,6 +212448,7 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk3 pango ]; libraryPkgconfigDepends = [ vte ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -211964,6 +212488,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_22" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , deepseq, directory, filepath, hashable, HUnit, microlens + , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck + , quickcheck-assertions, random, smallcheck, stm, string-qq + , terminfo, test-framework, test-framework-hunit + , test-framework-smallcheck, text, transformers, unix, utf8-string + , vector + }: + mkDerivation { + pname = "vty"; + version = "5.22"; + sha256 = "0x9kz6pvky1cmbhcf3bs5m3hnhrqj8cm510m4d4a2hf9ish55wvz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq directory filepath + hashable microlens microlens-mtl microlens-th mtl parallel parsec + stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers deepseq HUnit + microlens microlens-mtl mtl QuickCheck quickcheck-assertions random + smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + description = "A simple terminal UI library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -212360,8 +212919,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.22.1"; - sha256 = "0bvj0nc3m314hh6n4rpz6dzb4bqg24b1sz4x0w7bj5ah8msr0z3y"; + version = "3.0.23.0"; + sha256 = "10chij5jy057q1c4zybmb6jq5kff9i9iqijz31q51s6l0fh1zkw8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213835,8 +214394,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.22"; - sha256 = "03jrby2q3xb16xgbmlk3yl36g1mnwq56lj62whks438568626nv4"; + version = "3.2.23"; + sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -214522,6 +215081,7 @@ self: { hspec-discover hspec-expectations memory split stm tagged text time transformers ]; + testToolDepends = [ hspec-discover ]; description = "Ethereum API for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -214914,6 +215474,7 @@ self: { base bytestring cairo glib gtk mtl pango text transformers ]; libraryPkgconfigDepends = [ webkit ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -214961,6 +215522,7 @@ self: { base bytestring cairo glib gtk3 mtl pango text transformers ]; libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -217142,8 +217704,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.9"; - sha256 = "1la0zvdsb1w0k2sj8f9wrnsirljjnbx0a1kalzwalh6d82h2jd9z"; + version = "1.1.10"; + sha256 = "0l4mlmr3b8ndx4nmb3rf0n0bpjxhzxmqv1mslxl432kf02312z09"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -218871,14 +219433,14 @@ self: { ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring , containers, dbus, directory, filepath, hinotify, hspec, HTTP , http-conduit, http-types, iwlib, libmpd, libXpm, libXrandr - , libXrender, mtl, old-locale, parsec, process, regex-compat, stm - , time, timezone-olson, timezone-series, transformers, unix - , utf8-string, wirelesstools, X11, X11-xft + , libXrender, mtl, old-locale, parsec, parsec-numbers, process + , regex-compat, stm, time, timezone-olson, timezone-series + , transformers, unix, utf8-string, wirelesstools, X11, X11-xft }: mkDerivation { pname = "xmobar"; - version = "0.26"; - sha256 = "19g40vqj3cs94i27f66194k7d5cazrv1lx54bz9kc0qy2npxjzgz"; + version = "0.27"; + sha256 = "0agx490q6sbmv3vfq33ys8dsrgwizj3bmha4i1pkxz5wp5q8cx3l"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -218890,15 +219452,17 @@ self: { executableHaskellDepends = [ alsa-core alsa-mixer base bytestring containers dbus directory filepath hinotify HTTP http-conduit http-types iwlib libmpd mtl - old-locale parsec process regex-compat stm time timezone-olson - timezone-series transformers unix utf8-string X11 X11-xft + old-locale parsec parsec-numbers process regex-compat stm time + timezone-olson timezone-series transformers unix utf8-string X11 + X11-xft ]; executableSystemDepends = [ libXpm libXrandr libXrender wirelesstools ]; testHaskellDepends = [ base bytestring containers directory filepath hspec mtl old-locale - parsec process regex-compat stm time transformers unix X11 + parsec parsec-numbers process regex-compat stm time transformers + unix X11 ]; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; @@ -219776,14 +220340,14 @@ self: { "yaml" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, resourcet, scientific, semigroups, template-haskell - , temporary, text, transformers, unordered-containers, vector + , conduit, containers, directory, filepath, hspec, HUnit, mockery + , resourcet, scientific, semigroups, template-haskell, temporary + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "yaml"; - version = "0.8.31.1"; - sha256 = "0lwbdlz2r54nvdr5snmjp5lnkv6wwk118bhy13v1vjz62wclb88v"; + version = "0.8.32"; + sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -219792,15 +220356,15 @@ self: { filepath resourcet scientific semigroups template-haskell text transformers unordered-containers vector ]; - libraryPkgconfigDepends = [ libyaml ]; testHaskellDepends = [ - aeson base base-compat bytestring conduit directory hspec HUnit - mockery resourcet temporary text transformers unordered-containers - vector + aeson attoparsec base base-compat bytestring conduit containers + directory filepath hspec HUnit mockery resourcet scientific + semigroups template-haskell temporary text transformers + unordered-containers vector ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; + }) {}; "yaml_0_9_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring @@ -220375,6 +220939,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yeshql_4_1_0_1" = callPackage + ({ mkDerivation, base, yeshql-core, yeshql-hdbc }: + mkDerivation { + pname = "yeshql"; + version = "4.1.0.1"; + sha256 = "1dlxq8vp18fagfymlzqa4j0ns174s31d7p1vi54wz0b55ml91if4"; + libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ]; + description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yeshql-core" = callPackage ({ mkDerivation, base, containers, convertible, filepath, parsec , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell @@ -220394,6 +220970,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yeshql-core_4_1_0_1" = callPackage + ({ mkDerivation, base, containers, convertible, filepath, parsec + , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "yeshql-core"; + version = "4.1.0.1"; + sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn"; + libraryHaskellDepends = [ + base containers convertible filepath parsec template-haskell + ]; + testHaskellDepends = [ + base containers stm tasty tasty-hunit tasty-quickcheck + ]; + description = "YesQL-style SQL database abstraction (core)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yeshql-hdbc" = callPackage ({ mkDerivation, base, containers, convertible, filepath, HDBC , parsec, stm, tasty, tasty-hunit, tasty-quickcheck @@ -220415,6 +221010,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yeshql-hdbc_4_1_0_1" = callPackage + ({ mkDerivation, base, containers, convertible, filepath, HDBC + , parsec, stm, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, yeshql-core + }: + mkDerivation { + pname = "yeshql-hdbc"; + version = "4.1.0.1"; + sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc"; + libraryHaskellDepends = [ + base containers convertible filepath HDBC parsec template-haskell + yeshql-core + ]; + testHaskellDepends = [ + base containers HDBC stm tasty tasty-hunit tasty-quickcheck + ]; + description = "YesQL-style SQL database abstraction (HDBC backend)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yeshql-postgresql-simple" = callPackage ({ mkDerivation, base, bytestring, containers, convertible , filepath, parsec, postgresql-simple, stm, tasty, tasty-hunit @@ -220422,8 +221038,8 @@ self: { }: mkDerivation { pname = "yeshql-postgresql-simple"; - version = "4.1.0.0"; - sha256 = "1dnwlrgnxg3gvfg6xmfrxqvqbi73402g9m82phqb6s624ifjir0c"; + version = "4.1.0.1"; + sha256 = "09sypmx1w5shn8sazhll02a4yjdhrrxr3cic74vr7ch08pjpkkyq"; libraryHaskellDepends = [ base containers convertible filepath parsec postgresql-simple template-haskell yeshql-core @@ -220562,35 +221178,6 @@ self: { "yesod-auth" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptonite, data-default, email-validate, file-embed - , http-client, http-client-tls, http-conduit, http-types, memory - , mime-mail, network-uri, nonce, persistent, persistent-template - , random, resourcet, safe, shakespeare, template-haskell, text - , time, transformers, unliftio, unliftio-core, unordered-containers - , wai, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.6.3"; - sha256 = "1f4qhsfgar7c2yq7rsm7g3wndg6hhwbmcmjz8dbljdwmzmxl5px0"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory mime-mail network-uri nonce persistent persistent-template - random resourcet safe shakespeare template-haskell text time - transformers unliftio unliftio-core unordered-containers wai - yesod-core yesod-form yesod-persistent - ]; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_6_4_1" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , cryptonite, data-default, email-validate, file-embed, http-client , http-client-tls, http-conduit, http-types, memory, network-uri @@ -220614,7 +221201,6 @@ self: { ]; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -221150,45 +221736,6 @@ self: { ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec - , hspec-expectations, http-types, HUnit, monad-logger, mtl, network - , old-locale, parsec, path-pieces, primitive, QuickCheck, random - , resourcet, safe, semigroups, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.5"; - sha256 = "0yj06bfw7cln4waf76nfj1dm1f5fd13i896f5iy33035xc0bwiml"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq deepseq-generics directory fast-logger - http-types monad-logger mtl old-locale parsec path-pieces primitive - random resourcet safe semigroups shakespeare template-haskell text - time transformers unix-compat unliftio unordered-containers vector - wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces QuickCheck random resourcet shakespeare - streaming-commons template-haskell text transformers unliftio wai - wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text transformers - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_6" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie , deepseq, fast-logger, gauge, hspec, hspec-expectations , http-types, HUnit, monad-logger, mtl, network, parsec , path-pieces, random, resourcet, rio, shakespeare @@ -221219,7 +221766,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -221484,29 +222030,6 @@ self: { ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, template-haskell, text, time - , transformers, wai, xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.6.1"; - sha256 = "05pnsgnhcsq74w91r74p8psh567yxbmyhddj04mnrfzlzzm19zxq"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare - template-haskell text time transformers wai xss-sanitize yesod-core - yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_6_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet , semigroups, shakespeare, text, time, transformers, wai , xss-sanitize, yesod-core, yesod-persistent }: @@ -221523,23 +222046,9 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage - ({ mkDerivation, base, shakespeare, text, yesod-core, yesod-form }: - mkDerivation { - pname = "yesod-form-bootstrap4"; - version = "1.0.0"; - sha256 = "0z19w6d612qxl0w6nmq2vc467s9s9q6ncbjjc2l620px2i7iqrfq"; - libraryHaskellDepends = [ - base shakespeare text yesod-core yesod-form - ]; - description = "renderBootstrap4"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form-bootstrap4_1_0_2" = callPackage ({ mkDerivation, base, text, yesod-core, yesod-form }: mkDerivation { pname = "yesod-form-bootstrap4"; @@ -221548,7 +222057,6 @@ self: { libraryHaskellDepends = [ base text yesod-core yesod-form ]; description = "renderBootstrap4"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bulma" = callPackage @@ -222448,32 +222956,6 @@ self: { "yesod-test" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, conduit, containers - , cookie, hspec, hspec-core, html-conduit, http-types, HUnit - , network, persistent, 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.4"; - sha256 = "0nxrscg4rxdwvivpxfsc735zr8w72w5vrlgaw1mq6ikn4cwidyng"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network persistent pretty-show semigroups text - time transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_5" = 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 @@ -222495,7 +222977,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -224380,8 +224861,8 @@ self: { ({ mkDerivation, base, binary, bytestring, containers }: mkDerivation { pname = "zmidi-core"; - version = "0.8.2"; - sha256 = "02895shbxbswnczgljafr9k7vfrxg7w2sqhnlx8azixkw84lk5mh"; + version = "0.9.0"; + sha256 = "127c36pdp7rq03amz6r3pji1crw0f7q5xp0baf782yq71fjgy4c5"; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Read and write MIDI files"; license = stdenv.lib.licenses.bsd3; @@ -224633,18 +225114,21 @@ self: { }) {}; "ztar" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath, path - , path-io, QuickCheck, tar, tasty, tasty-quickcheck, zip, zlib + ({ mkDerivation, base, bytestring, bytestring-arbitrary, deepseq + , directory, extra, filepath, path, path-io, process, QuickCheck + , tasty, tasty-quickcheck, text, unix-compat, zip, zlib }: mkDerivation { pname = "ztar"; - version = "0.1.0"; - sha256 = "12jndqj9ls67wdx840c25zrvms2s3prbb59scc9dgi93zb6s0k9d"; + version = "0.1.3"; + sha256 = "12pzskr90a724x3wh1dsbpbszh6a58lbp4sxl7sd7s1bk3m2kgq1"; libraryHaskellDepends = [ - base bytestring directory filepath path tar zip zlib + base bytestring deepseq directory filepath path process text + unix-compat zip zlib ]; testHaskellDepends = [ - base extra path path-io QuickCheck tasty tasty-quickcheck + base bytestring bytestring-arbitrary extra path path-io QuickCheck + tasty tasty-quickcheck ]; description = "Creating and extracting arbitrary archives"; license = stdenv.lib.licenses.bsd3; @@ -224684,6 +225168,7 @@ self: { tasty-discover tasty-hunit template-haskell text text-show throwable-exceptions transformers ]; + testToolDepends = [ tasty-discover ]; description = "A lisp processor, An inline-lisp, in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 38e8dfd24c4e7..7b3fe8fba0236 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -36,10 +36,6 @@ let if !isGhcjs then "haddock" else "haddock-ghcjs"; - ghcName = - if !isGhcjs - then "ghc" - else "ghcjs"; ghcDocLibDir = if !isGhcjs then ghc.doc + ''/share/doc/ghc*/html/libraries'' diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 87ac65307aabb..95dac230cc556 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -128,7 +128,7 @@ let preferLocalBuild = true; phases = ["installPhase"]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; installPhase = '' export HOME="$TMP" mkdir -p "$out" diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 7168eb2c956f4..3ed1404fef7ce 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -20,7 +20,7 @@ let }; in stdenv.mkDerivation ({ - name = "${name}-${version}"; + name = "idris-${name}-${version}"; buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs; propagatedBuildInputs = allIdrisDeps; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 4843653e5dc21..4ea149d1137df 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "prefix" ]; - installPhase = '' + installPhase = let + binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; + in '' mkdir -p $prefix/libexec cp clojure-tools-${version}.jar $prefix/libexec cp {,example-}deps.edn $prefix @@ -21,8 +23,8 @@ stdenv.mkDerivation rec { substituteInPlace clojure --replace PREFIX $prefix install -Dt $out/bin clj clojure - wrapProgram $out/bin/clj --suffix PATH ${rlwrap}/bin - wrapProgram $out/bin/clojure --suffix PATH ${jdk}/bin + wrapProgram $out/bin/clj --prefix PATH : ${binPath} + wrapProgram $out/bin/clojure --prefix PATH : ${binPath} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index d2d923d783d78..961cfb4dad077 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1qzciri8qjx5p7x015rk5ws7gj53qidamp85r2r7aj6ssyp3r40k"; + sha256 = "1zqq2jsaq547rm8qh8zpj36059jahsba733cwrmg6iq0c8ai4z3s"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 08612ad284949..08672d28a1f85 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -23,6 +23,8 @@ let libcLib = lib.getLib libc; crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; common = { version, sha256 }: stdenv.mkDerivation (rec { + inherit version; + name = "perl-${version}"; src = fetchurlBoot { @@ -154,33 +156,22 @@ let platforms = platforms.all; }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.1.8"; + crossVersion = "1.2"; perl-cross-src = fetchurlBoot { url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz"; - sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; - }; - - # https://github.com/arsv/perl-cross/issues/60 - perl-cross-gcc7-patch = fetchpatch { - url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch"; - sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810"; + sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; postUnpack = '' unpackFile ${perl-cross-src} - cd perl-cross-* - patch -Np1 -i ${perl-cross-gcc7-patch} - cd .. cp -R perl-cross-${crossVersion}/* perl-${version}/ ''; configurePlatforms = [ "build" "host" "target" ]; - inherit version; - # TODO merge setup hooks setupHook = ./setup-hook-cross.sh; }); @@ -191,13 +182,13 @@ in rec { }; perl524 = common { - version = "5.24.3"; - sha256 = "1m2px85kq2fyp2d4rx3bw9kg3car67qfqwrs5vlv96dx0x8rl06b"; + version = "5.24.4"; + sha256 = "0w0r6v5k5hw5q1k3p4c7krcxidkj2qzsj5dlrlrxhm01n7fksbxz"; }; perl526 = common { - version = "5.26.1"; - sha256 = "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7"; + version = "5.26.2"; + sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp"; }; perl528 = common { diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index cd1a0fc6e18f4..d37f59250d556 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -33,7 +33,6 @@ let majorVersion = "2.7"; minorVersion = "15"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; @@ -161,10 +160,6 @@ let # don't rely on detecting glibc-isms. ++ optional hostPlatform.isLinux "ac_cv_func_lchmod=no"; - postConfigure = if hostPlatform.isCygwin then '' - sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),' - '' else null; - buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib ] diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 7da2cfdd15276..a8b6ffd1da915 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -29,7 +29,6 @@ let majorVersion = "3.4"; minorVersion = "8"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 434c233827092..2bbdb8bdd840d 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -29,7 +29,6 @@ let majorVersion = "3.5"; minorVersion = "5"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index fc68aae1c0457..f8628186d7992 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,9 +27,8 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "5"; + minorVersion = "6"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; @@ -53,7 +52,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "19l7inxm056jjw33zz97z0m02hsi7jnnx5kyb76abj5ml4xhad7l"; + sha256 = "0vz1wqg50zq6g15givdx1s2rq5752y5g2f1978bs6wvf8mfw36yp"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -85,9 +84,8 @@ in stdenv.mkDerivation { # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. (fetchpatch { - url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch"; - sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8"; - extraPrefix = ""; + url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; + sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; }) ]; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index 4c84727d3cbcb..e0cc198c096eb 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -29,7 +29,6 @@ let majorVersion = "3.7"; minorVersion = "0"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; @@ -39,6 +38,8 @@ let ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; + hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); + in stdenv.mkDerivation { name = "python3-${version}"; pythonVersion = majorVersion; @@ -63,12 +64,20 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch - # Fix darwin build https://bugs.python.org/issue34027 (fetchpatch { url = https://bugs.python.org/file47666/darwin-libutil.patch; sha256 = "0242gihnw3wfskl4fydp2xanpl8k5q7fj4dp7dbbqf46a4iwdzpa"; }) + ] ++ optionals hasDistutilsCxxPatch [ + # Fix for http://bugs.python.org/issue1222585 + # Upstream distutils is calling C compiler to compile C++ code, which + # only works for GCC and Apple Clang. This makes distutils to call C++ + # compiler when needed. + (fetchpatch { + url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; + sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; + }) ]; postPatch = '' @@ -153,7 +162,7 @@ in stdenv.mkDerivation { passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { - inherit libPrefix sitePackages x11Support; + inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 36d1a8326e70b..d002f6eb31c1e 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -5,7 +5,7 @@ , readline, sqlite , disableDocs ? false , CoreFoundation -, gsettings_desktop_schemas +, gsettings-desktop-schemas }: let @@ -20,7 +20,7 @@ let glib gmp gtk3 - gsettings_desktop_schemas + gsettings-desktop-schemas libedit libjpeg libpng @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ] + buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ]; preConfigure = '' diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 89d394c875699..bb6f2758f4cf6 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -32,8 +32,6 @@ let generic = { version, sha256 }: let ver = version; tag = ver.gitTag; - isRuby20 = ver.majMin == "2.0"; - isRuby21 = ver.majMin == "2.1"; isRuby25 = ver.majMin == "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 48a409b5367a7..11a06d4f39ace 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -15,11 +15,14 @@ stdenv.mkDerivation rec { sed -e "s@ldconfig@@" -i Makefile ''; - installPhase = '' - make PREFIX="$out" SUFFIX="" install + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=" + ]; + postInstall = '' # create lib link for building apps - ln -s $out/lib/libzita-convolver.so.$version $out/lib/libzita-convolver.so.3 + ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${stdenv.lib.versions.major version} ''; meta = { diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index b2a224e10b11f..e4d1fa2073fab 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , libtool , gettext @@ -17,13 +18,25 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20171219"; + version = "20180710"; # upgrade might break the sage interface + # sage tests to run: + # src/sage/interfaces/mwrank.py + # src/sage/libs/eclib + # ping @timokau for more info src = fetchFromGitHub { owner = "JohnCremona"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1yw488ng0labpxqqpxq0710qnndxl8plvcaqklpbwwd62a47knlr"; + sha256 = "1kmwpw971sipb4499c9b35q5pz6sms5qndqrvq7396d8hhwjg1i2"; }; + patches = [ + # One of the headers doesn't get installed. + # See https://github.com/NixOS/nixpkgs/pull/43476. + (fetchpatch { + url = "https://github.com/JohnCremona/eclib/pull/42/commits/c9b96429815e31a6e3372c106e31eef2a96431f9.patch"; + sha256 = "0cw26h94m66rbh8jjsfnb1bvc6z7ybh8zcp8xl5nhxjxiawhcl73"; + }) + ]; buildInputs = [ pari ntl @@ -35,12 +48,12 @@ stdenv.mkDerivation rec { autoreconfHook ]; doCheck = true; - meta = { + meta = with stdenv.lib; { inherit version; description = ''Elliptic curve tools''; homepage = https://github.com/JohnCremona/eclib; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin timokau ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 5287db756094c..710338842f8d2 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: -stdenv.mkDerivation { - name = "elementary-cmake-modules"; +stdenv.mkDerivation rec { + name = "elementary-cmake-modules-${version}"; + version = "0.1.0"; src = fetchFromGitHub { owner = "elementary"; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index fcbaaaba6ba49..c5ce5e252fac6 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -232,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.0"; + version = "4.0.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d"; + sha256 = "1vn04n0n46zdxq14cma3w8ml2ckh5jxwlybsc4xmvcqdqq0mqpv0"; }; prePatch = '' diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 98cbfdf43f6c8..05da9e18c594d 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4.2"; - sha256 = "0nkq4451masmzlx3p4vprqwc0sl2iwqxbzjrngmvj29q4azp00zb"; + branch = "3.4.3"; + sha256 = "0s2p2bcrywlya4wjlyzi1382vngkiijjvjr6ms64xww5jplwmhmk"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index a6e67052cd03b..40b697c7a76a0 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.0"; - sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii"; + branch = "4.0.1"; + sha256 = "0w0nq98sn5jwx982wzg3vfrxv4p0k1fvsksiz9az0rpvwyqr3rby"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 270e960558224..3d9027db1602e 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -26,7 +26,7 @@ * see `ffmpeg-full' for an ffmpeg build with all features included. * * Need fixes to support Darwin: - * libvpx pulseaudio + * pulseaudio * * Known issues: * 0.6 - fails to compile (unresolved) (so far, only disabling a number of @@ -58,6 +58,8 @@ let disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isAarch32) && reqMin minVer) then fixArg else origArg; vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isAarch32); + + vpxSupport = reqMin "0.6" && !isAarch32; in assert openglSupport -> libGLU_combined != null; @@ -130,7 +132,7 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) "--enable-vdpau" "--enable-libvorbis" - (disDarwinOrArmFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx") + (ifMinVer "0.6" (enableFeature vpxSupport "libvpx")) (ifMinVer "2.4" "--enable-lzma") (ifMinVer "2.2" (enableFeature openglSupport "opengl")) (disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse") @@ -148,7 +150,7 @@ stdenv.mkDerivation rec { "--disable-stripping" # Disable mmx support for 0.6.90 (verFix null "0.6.90" "--disable-mmx") - ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" ] ++ optional stdenv.cc.isClang "--cc=clang"; @@ -159,7 +161,8 @@ stdenv.mkDerivation rec { bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport libGLU_combined - ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optional vpxSupport libvpx + ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks @@ -170,9 +173,15 @@ stdenv.mkDerivation rec { doCheck = false; # fails + # ffmpeg 3+ generates pkg-config (.pc) files that don't have the + # form automatically handled by the multiple-outputs hooks. postFixup = '' moveToOutput bin "$bin" moveToOutput share/ffmpeg/examples "$doc" + for pc in ''${!outputDev}/lib/pkgconfig/*.pc; do + substituteInPlace $pc \ + --replace "includedir=$out" "includedir=''${!outputInclude}" + done ''; installFlags = [ "install-man" ]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 9a7acc287cc4d..b8b55d6a87429 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 -, gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc -, bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: +, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }: let - version = "0.99.2"; + version = "0.99.3"; desktop_schemas = gnome3.gsettings_desktop_schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "1cc82nxd290m4ljkd1phllwb3hkhz41h4ncfdrmhbg3gk47zgpyw"; + sha256 = "0wd6ix1qyz8wmjkfrmr6j99gwywqs7ak1ilsn1ljp72g2z449ayk"; }; patches = [ @@ -28,12 +28,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection - gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper + gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ - bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xlibs.libXau + bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp + libsoup lzma ostree polkit python3 systemd xorg.libXau ]; checkInputs = [ valgrind ]; @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/flatpak \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}" ''; diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index 0c2b7da79eb38..3f4bc56721ee3 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,6 +1,6 @@ --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -324,7 +324,7 @@ +@@ -315,7 +315,7 @@ # running installed-tests: assume we know what we're doing : elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -9,7 +9,7 @@ sed -e 's/^/# /' < bwrap-result echo "1..0 # SKIP Cannot run bwrap" exit 0 -@@ -332,7 +332,7 @@ +@@ -323,7 +323,7 @@ } skip_without_python2 () { @@ -18,7 +18,7 @@ echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support" exit 0 fi -@@ -352,12 +352,12 @@ +@@ -335,12 +335,12 @@ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -135,12 +135,12 @@ collection_args=--collection-id=${COLLECTION_ID} --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -610,7 +610,7 @@ +@@ -584,7 +584,7 @@ { gint exit_code = 0; - char *argv[] = { (char *)bwrap, "--unshare-ipc", "--unshare-net", -- "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL }; -+ "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL }; + char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", +- "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL }; ++ "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL }; g_autofree char *argv_str = g_strjoinv (" ", argv); g_test_message ("Spawning %s", argv_str); g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error); diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 67bf7503db987..2b3f75b80dbd3 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals withBlas [ "--with-blas=${openblas}" ]; + + # issues with ntl -- https://github.com/wbhart/flint2/issues/487 + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + patches = [ (fetchpatch { # Always produce libflint.so.MAJOR; will be included in the next flint version diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 3fd0bb0824404..a1980d62490a0 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.14.1"; + name = "gdbm-1.15"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd"; + sha256 = "03nwsbixdp3nx3fzn3gjy0n7rcppmkkxb2nxbmd8mvb7gwhf7zgr"; }; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 5796425e4385a..56d8cd21f844f 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -3,7 +3,7 @@ , python3Packages , wrapGAppsHook , atk -, dbus_libs +, dbus , evemu , frame , gdk_pixbuf @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { [ pygobject3 ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; - buildInputs = [ atk dbus_libs evemu frame gdk_pixbuf gobjectIntrospection grail + buildInputs = [ atk dbus evemu frame gdk_pixbuf gobjectIntrospection grail gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index fafcf82258ab1..af0830ab70421 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, x11, libXmu, libXi +{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , buildPlatform, hostPlatform , AGL ? null }: @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; + buildInputs = [ xlibsWrapper libXmu libXi ] + ++ optionals stdenv.isDarwin [ AGL ]; propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ff870f525f23b..fd6e0a65abcef 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -4,7 +4,8 @@ , utillinuxMinimal ? null # this is just for tests (not in closure of any regular package) -, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false +, coreutils, dbus, libxml2, tzdata, desktop-file-utils +, shared-mime-info, doCheck ? false }: with stdenv.lib; @@ -121,7 +122,7 @@ stdenv.mkDerivation rec { export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" - export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 642e10ea541d3..75818f756921a 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst_plugins_base }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }: stdenv.mkDerivation rec { name = "gupnp-dlna-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - buildInputs = [ gupnp gst_plugins_base ]; + buildInputs = [ gupnp gst-plugins-base ]; meta = { homepage = https://wiki.gnome.org/Projects/GUPnP/; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch index a74340a6dc969..66f10f4abc1e6 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch @@ -1,21 +1,23 @@ -Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake -=================================================================== ---- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake -+++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake -@@ -200,32 +200,6 @@ +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index 52b2eb2..a04596c 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -232,34 +232,6 @@ # GNUInstallDirs code deals with re-configuring, but that is dealt with # by the _define_* macros in this module). set(_LIBDIR_DEFAULT "lib") -# Override this default 'lib' with 'lib64' iff: -# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling -# - we are NOT on debian +-# - we are NOT on flatpak -# - we are on a 64 bits system -# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf -# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if -# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" -# See http://wiki.debian.org/Multiarch -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) +- AND NOT CMAKE_CROSSCOMPILING +- AND NOT DEFINED ENV{FLATPAK_ID}) - if (EXISTS "/etc/debian_version") # is this a debian system ? - if(CMAKE_LIBRARY_ARCHITECTURE) - set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 9b4f26a906334..1d389f914ddf4 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.47/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.48/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 0a600fe8d0570..68b5c08aa0909 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl, + extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns, karchive, ki18n, qtbase, perl, perlPackages }: @@ -24,7 +24,7 @@ mkDerivation { patches = [ ./kdoctools-no-find-docbook-xml.patch ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook" ]; postFixup = '' moveToOutput "share/doc" "$dev" diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index d0db2284509b6..1ad2254ccf895 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,627 +3,627 @@ { attica = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/attica-5.47.0.tar.xz"; - sha256 = "17i580hhi9rpd6d4nf408snlnf8xivwskkzbjja0snajx0nrd8bj"; - name = "attica-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/attica-5.48.0.tar.xz"; + sha256 = "1q2133gmhfi3wd9978556syzzqc1s6zgjc0p1353w6dmfwxfyzq8"; + name = "attica-5.48.0.tar.xz"; }; }; baloo = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/baloo-5.47.0.tar.xz"; - sha256 = "15jpbl47pr86h5ji2x3079b6x38fchc2pf03rjqlf5mgkabdpafq"; - name = "baloo-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/baloo-5.48.0.tar.xz"; + sha256 = "0rgz2gx99c1k8vgfskx7w6q1sjf98wcvybv88djdlj2s6h2qn8lj"; + name = "baloo-5.48.0.tar.xz"; }; }; bluez-qt = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/bluez-qt-5.47.0.tar.xz"; - sha256 = "1pqgvpgr9xmgv8cxgvqx08jnabgmgzh2skkhwc9d9rdc2i4g7b1k"; - name = "bluez-qt-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz"; + sha256 = "149px5gnplk0y7cl3cz258qks3rq5p0kkk9rc48y59zvlxiyy949"; + name = "bluez-qt-5.48.0.tar.xz"; }; }; breeze-icons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/breeze-icons-5.47.0.tar.xz"; - sha256 = "0fyzk196r8r0mzvijs9ws8ldh5vrw4yrgnvd1szb57vyy1agnnd7"; - name = "breeze-icons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/breeze-icons-5.48.0.tar.xz"; + sha256 = "1p0krrxfz6p0qhy79lnjyi0xsrprw1q4z65xah89kj0wmfriiyqh"; + name = "breeze-icons-5.48.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/extra-cmake-modules-5.47.0.tar.xz"; - sha256 = "1591d27r6a2b7jn6zi2ik0i195pvl014dwxfpxv974hbbb8qnvcp"; - name = "extra-cmake-modules-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/extra-cmake-modules-5.48.0.tar.xz"; + sha256 = "1675xnc9hv8z8gp95ici2zqmbv7i6f65g0kln4fskxmlxnfplnzw"; + name = "extra-cmake-modules-5.48.0.tar.xz"; }; }; frameworkintegration = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/frameworkintegration-5.47.0.tar.xz"; - sha256 = "0iwdfa7q8ryszsl2w3bgix8bxkn3jj2lfdlcicfz9qh6av76p4yf"; - name = "frameworkintegration-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/frameworkintegration-5.48.0.tar.xz"; + sha256 = "1na913ndc55nlmfc61122b1p29h4prxnpc5pqvh6drsgfyacnm8y"; + name = "frameworkintegration-5.48.0.tar.xz"; }; }; kactivities = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kactivities-5.47.0.tar.xz"; - sha256 = "01h5a4m0wkgz1gafhbqdidxdr2x6g5siwcx4csv9293pc5xf0qcd"; - name = "kactivities-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kactivities-5.48.0.tar.xz"; + sha256 = "1zxdzwz8j43hh8d7v1qfihf95kwxvsbqki0zgdhlnj7s0xds0yz8"; + name = "kactivities-5.48.0.tar.xz"; }; }; kactivities-stats = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kactivities-stats-5.47.0.tar.xz"; - sha256 = "0linsga4d7lincnpj747wnbgidp2x7xk3jzh31lpfq8izkmqz1q5"; - name = "kactivities-stats-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kactivities-stats-5.48.0.tar.xz"; + sha256 = "11r61qnrjpc4ls18apb4a13j1lizjq48bxfw3f8p8hjxxxh8z0j6"; + name = "kactivities-stats-5.48.0.tar.xz"; }; }; kapidox = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kapidox-5.47.0.tar.xz"; - sha256 = "1z2ka5fnwqsmjhxdbahk7gkjmhgzndg3lq6196dmpws1zjqf14vq"; - name = "kapidox-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kapidox-5.48.0.tar.xz"; + sha256 = "1b22np0lygnm2r2q1anh0f4b7dh2h0lccx767g4r2w0fw5r1bbb4"; + name = "kapidox-5.48.0.tar.xz"; }; }; karchive = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/karchive-5.47.0.tar.xz"; - sha256 = "0r8xxfg1wsnpzyfggpzhxap853gqfsnmbci1al6xyd0pslgcsb5r"; - name = "karchive-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/karchive-5.48.0.tar.xz"; + sha256 = "10qbx8k1yqqfp1pq5yj8ln3gpj2wnfnlln99gczf99f51fqd65p6"; + name = "karchive-5.48.0.tar.xz"; }; }; kauth = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kauth-5.47.0.tar.xz"; - sha256 = "1s80grzkxvbkw39z5xida50ijb0k3aqy80k5h0025m9rqpbc7ir9"; - name = "kauth-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kauth-5.48.0.tar.xz"; + sha256 = "00mpbs24dm9ycabpcm2wwlv1vdq4dq5qr2zw6bbqpgj3jplakbs7"; + name = "kauth-5.48.0.tar.xz"; }; }; kbookmarks = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kbookmarks-5.47.0.tar.xz"; - sha256 = "0b4b2yp3pvlisf0g1gwnisn2rc94wn874aad3dlg0607kd11xmwk"; - name = "kbookmarks-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kbookmarks-5.48.0.tar.xz"; + sha256 = "11ics7gbdkx1f0pxryf2xwjq4fyqh6a3gzcizymm1m7gmygggqar"; + name = "kbookmarks-5.48.0.tar.xz"; }; }; kcmutils = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcmutils-5.47.0.tar.xz"; - sha256 = "0qpsjijd51cxmp3y8knr6k6bx8bg5hhngsh63nr8yskpms38kj5d"; - name = "kcmutils-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcmutils-5.48.0.tar.xz"; + sha256 = "0nvlzvv2gmc2hz11w6bixz4mccnj09g69byrnvsrwh0psf1kqlmw"; + name = "kcmutils-5.48.0.tar.xz"; }; }; kcodecs = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcodecs-5.47.0.tar.xz"; - sha256 = "1qhdj54cx98dqdy8bqkxm8jgq8mm2i7l3h9vyd2bvvzc8nzhd1hv"; - name = "kcodecs-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcodecs-5.48.0.tar.xz"; + sha256 = "1pz0s3krb4vv01hvpjdr5ngnw1ndxgsfln944fm9pfj0pmk7p92n"; + name = "kcodecs-5.48.0.tar.xz"; }; }; kcompletion = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcompletion-5.47.0.tar.xz"; - sha256 = "1wdw434bi90ldmdxw8wpkgszligqapy19klpnn528vh3gv5is00p"; - name = "kcompletion-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcompletion-5.48.0.tar.xz"; + sha256 = "129mmh46y0r6dcnbxf5yswsr48qj5l25n930nlx7wzaav28y55lp"; + name = "kcompletion-5.48.0.tar.xz"; }; }; kconfig = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kconfig-5.47.0.tar.xz"; - sha256 = "0ifv7i6w7jz221rw07vb40sljx95kdjhxd7l9nfx95dbd5bjb0nq"; - name = "kconfig-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kconfig-5.48.0.tar.xz"; + sha256 = "1g640cnd9j2jp35bb5zgjfxskbg3fj9p03r0yf3dkm1d1681x9a3"; + name = "kconfig-5.48.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kconfigwidgets-5.47.0.tar.xz"; - sha256 = "05pxa7519f0730wrbh2bsqzfvc9dwvrh8l9vjh24rkaiaxnzhd6k"; - name = "kconfigwidgets-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kconfigwidgets-5.48.0.tar.xz"; + sha256 = "0xlnbw34zbmy7fwsi9iks4iv7shki4fqs7wd3yblmyxa2l18ldh9"; + name = "kconfigwidgets-5.48.0.tar.xz"; }; }; kcoreaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcoreaddons-5.47.0.tar.xz"; - sha256 = "0ihbggv5ziazhv66cnc6d4h4m2bci0cgwh498k49phaagrsh9zs0"; - name = "kcoreaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcoreaddons-5.48.0.tar.xz"; + sha256 = "157k4l67iswny5krinfigfc6pabqfyfzya6hc5gcjrdplmnccy1f"; + name = "kcoreaddons-5.48.0.tar.xz"; }; }; kcrash = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcrash-5.47.0.tar.xz"; - sha256 = "15wn4g7c26f3cpk7q2imci7p8pmcksw47h6csihyvlpi3b6ykqg9"; - name = "kcrash-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcrash-5.48.0.tar.xz"; + sha256 = "0qqwdx7piz4wfm4lh41kknfcyw5saw17qh07ghhi7j80whpkazk8"; + name = "kcrash-5.48.0.tar.xz"; }; }; kdbusaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdbusaddons-5.47.0.tar.xz"; - sha256 = "04270rnfmasb9cq7kj40wny7vgkb7hksjnhr4sgyg4v2p8v5dmib"; - name = "kdbusaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdbusaddons-5.48.0.tar.xz"; + sha256 = "0vpd4cij52v43fsifbk3nnmi5csik8h4avima6jw0b09s8xdz8rr"; + name = "kdbusaddons-5.48.0.tar.xz"; }; }; kdeclarative = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdeclarative-5.47.0.tar.xz"; - sha256 = "183l926yyhdw270rcwqh2lf1rjd4a9vbkcjlqyss2k7d79mj6m9s"; - name = "kdeclarative-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdeclarative-5.48.0.tar.xz"; + sha256 = "09nfp6vrj6dc3kfknicr8629ifz976wi4wxdh5bfx15z9296l8pd"; + name = "kdeclarative-5.48.0.tar.xz"; }; }; kded = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kded-5.47.0.tar.xz"; - sha256 = "0z5xsxalxasnyhhkvy247a08l37012fiaahwyy0477p7p5x3c845"; - name = "kded-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kded-5.48.0.tar.xz"; + sha256 = "13527iv6cf44wgxpqfhmkhryihjfi02fi78lf2bnvgwmhd2nl954"; + name = "kded-5.48.0.tar.xz"; }; }; kdelibs4support = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kdelibs4support-5.47.0.tar.xz"; - sha256 = "1rij23ns9axlwi2fvbiz2wv3y3vh1p9cm3nxkkrj3axc0hs39n20"; - name = "kdelibs4support-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kdelibs4support-5.48.0.tar.xz"; + sha256 = "058s5h6sfhi1i3pa59hwpyxzd01jgpb8r68nnbphmryimi5nazqf"; + name = "kdelibs4support-5.48.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdesignerplugin-5.47.0.tar.xz"; - sha256 = "0ijdjjfqj2wpl0jrr2n90i74d378986lkqwdicig2rwkylsivr1g"; - name = "kdesignerplugin-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdesignerplugin-5.48.0.tar.xz"; + sha256 = "1kswvxgjpyi1p1kg4z5x5df8yqhrwhcpavzx4a83dg6hp5xk0l2l"; + name = "kdesignerplugin-5.48.0.tar.xz"; }; }; kdesu = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdesu-5.47.0.tar.xz"; - sha256 = "1rc2v13d4i0wwzmgrbwf6i6khcd4wfa79flq764cvx62flingfvr"; - name = "kdesu-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdesu-5.48.0.tar.xz"; + sha256 = "14ka3h06xbfv357z29zgbwnjcfwspi42f0fm3m7lszqhz9skj4v5"; + name = "kdesu-5.48.0.tar.xz"; }; }; kdewebkit = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdewebkit-5.47.0.tar.xz"; - sha256 = "1yg4lydz03y6cc1f44larfd4xnvnbnzpkfa97qxjzvvrk06hdxx3"; - name = "kdewebkit-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdewebkit-5.48.0.tar.xz"; + sha256 = "0wf2prv85sayz1mqq0ymrqw3p0f3ikakhgzy01pixrp7qgwqkkrv"; + name = "kdewebkit-5.48.0.tar.xz"; }; }; kdnssd = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdnssd-5.47.0.tar.xz"; - sha256 = "0xgv4fvhyr3gk99vaicq45zqf5mnbc4xpyz66jfhsk1w655bqijp"; - name = "kdnssd-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdnssd-5.48.0.tar.xz"; + sha256 = "01hra59b0sm82j7ry78f3clrypc80q59vx9h0ahacbab4pzq41p5"; + name = "kdnssd-5.48.0.tar.xz"; }; }; kdoctools = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdoctools-5.47.0.tar.xz"; - sha256 = "06zlk04ldi9cq3ricni74s3737gmvs73g2k9mgfkdjq5grcsw177"; - name = "kdoctools-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdoctools-5.48.0.tar.xz"; + sha256 = "0v8x198kfgz2p56nyy9cb6lks5yazdbdg55c4ps5bw36dbmpd3v8"; + name = "kdoctools-5.48.0.tar.xz"; }; }; kemoticons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kemoticons-5.47.0.tar.xz"; - sha256 = "1hg72mf629g67wll5b80rw9k85qia1jdfhabg64vy7n7i9fm912y"; - name = "kemoticons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kemoticons-5.48.0.tar.xz"; + sha256 = "166sjwrn9dm4km8sypdwcfsylcamhl1gfl28h8hrv498zhnyrfb9"; + name = "kemoticons-5.48.0.tar.xz"; }; }; kfilemetadata = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kfilemetadata-5.47.0.tar.xz"; - sha256 = "0ywp45akvn0cky757azkf6p4ql2l02xy7fplbhv7j6qz39s0p2vm"; - name = "kfilemetadata-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kfilemetadata-5.48.0.tar.xz"; + sha256 = "0krn53a2s950fb980gdap5hwf994kxfd4h8zk7a4s9cick957z5f"; + name = "kfilemetadata-5.48.0.tar.xz"; }; }; kglobalaccel = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kglobalaccel-5.47.0.tar.xz"; - sha256 = "1lcac55kanddpn6nphmyixp33mk8zmhfih7p9vzhnxvrc5k9r6hb"; - name = "kglobalaccel-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kglobalaccel-5.48.0.tar.xz"; + sha256 = "15dlpm69d38bsgl6hc7f1mjjq8qyxac010whx4rcsk4vsrwdfnm7"; + name = "kglobalaccel-5.48.0.tar.xz"; }; }; kguiaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kguiaddons-5.47.0.tar.xz"; - sha256 = "14pivzmpsmmqrhvmvlc10fc7mc6gdq214qy27r4dsxmjdvgljhhj"; - name = "kguiaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kguiaddons-5.48.0.tar.xz"; + sha256 = "0viqq9qg448fh12isc1kkmzcnnsjqw5fx4wlshyza19gfr4ym0dz"; + name = "kguiaddons-5.48.0.tar.xz"; }; }; kholidays = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kholidays-5.47.0.tar.xz"; - sha256 = "001misp4bdd4q05ns4bch7gx1j8h2wpa2is7zdazqy0bp1blsfwb"; - name = "kholidays-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kholidays-5.48.0.tar.xz"; + sha256 = "04vjp2jm2c6qgj50jbqkkgqh8b759pd4dpsczfkyq30p03vybxr4"; + name = "kholidays-5.48.0.tar.xz"; }; }; khtml = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/khtml-5.47.0.tar.xz"; - sha256 = "1c9fja1mb2jrlrial2mz2bvw004s14kn7jnakawqg0d19fhlqg1h"; - name = "khtml-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/khtml-5.48.0.tar.xz"; + sha256 = "1zrilnvvvvjq82hm6gbh5pvzfygy8w7a0140d3l74jjgy01394m1"; + name = "khtml-5.48.0.tar.xz"; }; }; ki18n = { - version = "5.47.0"; + version = "5.48.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/ki18n-5.47.0.tar.xz"; - sha256 = "1a190wf2ms09cwzpk1ylx7kjfz8yvzv2p14fjwyld6vf32hgl9r6"; - name = "ki18n-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/ki18n-5.48.1.tar.xz"; + sha256 = "0m9x6bagviqrnm0hx7ykggqiykxv3qi11bmi0xz2f02y78q89f3h"; + name = "ki18n-5.48.1.tar.xz"; }; }; kiconthemes = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kiconthemes-5.47.0.tar.xz"; - sha256 = "14j8d1glrcd6a9xn86jxa7wx80bpf5wax5vkv09swcbbshp7vqdp"; - name = "kiconthemes-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kiconthemes-5.48.0.tar.xz"; + sha256 = "1xqbg10qlk1zdha4kfyya1471r35gnz63iyj0ks3gzyfjvbivpy4"; + name = "kiconthemes-5.48.0.tar.xz"; }; }; kidletime = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kidletime-5.47.0.tar.xz"; - sha256 = "0dirflwwnq83nxml66kk4bf70nl04dhrg8pvh9md3hip5cn6mq2f"; - name = "kidletime-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kidletime-5.48.0.tar.xz"; + sha256 = "184b1qdh4bwsdg9lyl4d8rcs833fqcmfvbb5qmdd3mqvvg8xv9mm"; + name = "kidletime-5.48.0.tar.xz"; }; }; kimageformats = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kimageformats-5.47.0.tar.xz"; - sha256 = "19j6wdfv9yncdgcm5ij0rz5rv0a3jlgdnwmyrw1gjyz5isv2qp4f"; - name = "kimageformats-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kimageformats-5.48.0.tar.xz"; + sha256 = "1myxp583gw5d50ddkkv6ipbdzf6k3sdk9gambklay1dzmy4b91sc"; + name = "kimageformats-5.48.0.tar.xz"; }; }; kinit = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kinit-5.47.0.tar.xz"; - sha256 = "1rc0ig4gw7lkvkpwcik6krn5w1zqj6y710c58i9kr9vxxpffj170"; - name = "kinit-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kinit-5.48.0.tar.xz"; + sha256 = "08sf3j1bpxzqjim777d6znn8f7rzs5vpm4wz21s1ng3f32z2km9a"; + name = "kinit-5.48.0.tar.xz"; }; }; kio = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kio-5.47.0.tar.xz"; - sha256 = "0847dxrhdywrx2v6knf6l70slm8dfz4n4j1c1si13jrj1fp2w4ji"; - name = "kio-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kio-5.48.0.tar.xz"; + sha256 = "0am03nwbfidb5dxs8j8qaan4mcs7xv75sk135rslwfp5q56v1fa0"; + name = "kio-5.48.0.tar.xz"; }; }; kirigami2 = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kirigami2-5.47.0.tar.xz"; - sha256 = "1mdahdb5z0i9bf63480b2j6xm7cgsh1anx0cljn2hivglpixjbgd"; - name = "kirigami2-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kirigami2-5.48.0.tar.xz"; + sha256 = "0f01rnzzv2w7mmb0war8kph46c3wbdbz7s9i6rwh6g7kg6zvzn52"; + name = "kirigami2-5.48.0.tar.xz"; }; }; kitemmodels = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kitemmodels-5.47.0.tar.xz"; - sha256 = "0151arf7s5ns2qadn86z385i9v9z8rga0jcj8pnw329k4pjpc2ks"; - name = "kitemmodels-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kitemmodels-5.48.0.tar.xz"; + sha256 = "13b0fqy4yg4zahqq8376gnna36mfg94yb5d1fz0cgw7fk9d920gf"; + name = "kitemmodels-5.48.0.tar.xz"; }; }; kitemviews = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kitemviews-5.47.0.tar.xz"; - sha256 = "0dnk7y50d5wxpl4fppb0hdzy5w6xa04a178y49zggpjm5x048mp5"; - name = "kitemviews-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kitemviews-5.48.0.tar.xz"; + sha256 = "0cdyw0gy67yhhxv44j1bhhd4qnj7rwi0fjzf275532bf3js1j12w"; + name = "kitemviews-5.48.0.tar.xz"; }; }; kjobwidgets = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kjobwidgets-5.47.0.tar.xz"; - sha256 = "05vgqm3nfpbwbnv46ajb8hc5wzs1444513ahay1qn8vpah4kqbpp"; - name = "kjobwidgets-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kjobwidgets-5.48.0.tar.xz"; + sha256 = "0a5awpbka6mk4r4m5if7s9i5ybysykpcmlj69liabzcv0k1x5y6w"; + name = "kjobwidgets-5.48.0.tar.xz"; }; }; kjs = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kjs-5.47.0.tar.xz"; - sha256 = "1rhvmdwmsr48ih0qrpwphiwcl25af8shwj8nrkq619krc549gf8q"; - name = "kjs-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kjs-5.48.0.tar.xz"; + sha256 = "0ysbf6m63cw2iywwr7p5ngsh7s7ml9sc1sqkhnbh7racn0pzc1l4"; + name = "kjs-5.48.0.tar.xz"; }; }; kjsembed = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kjsembed-5.47.0.tar.xz"; - sha256 = "104nv33zpqh78zxqj1z9sj6cyliv0l9gzgmsc4n9nq9fcr1f2hdd"; - name = "kjsembed-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kjsembed-5.48.0.tar.xz"; + sha256 = "0j74g3xb23k55pixk76z2ib6yyc7f2iwvwqvvw1f907rn43g6qqx"; + name = "kjsembed-5.48.0.tar.xz"; }; }; kmediaplayer = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kmediaplayer-5.47.0.tar.xz"; - sha256 = "0cz0m2sa48893p6vq4pm92xmvq2aqqgfmijlskzdpd3gp3x9l1qw"; - name = "kmediaplayer-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kmediaplayer-5.48.0.tar.xz"; + sha256 = "1kw35c5dmwsrkinfgmylzgvw3zcg0yimlfcl52bhdg0x7sgdbjkq"; + name = "kmediaplayer-5.48.0.tar.xz"; }; }; knewstuff = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/knewstuff-5.47.0.tar.xz"; - sha256 = "04zn4iy0gy00d835qjfmb0prm802ggphj4aw328v29474nqs14nf"; - name = "knewstuff-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/knewstuff-5.48.0.tar.xz"; + sha256 = "0g2sxk6wqqgynmqgz6jxknlrsmpj4y94cn7vpw84isd9brsr5hfv"; + name = "knewstuff-5.48.0.tar.xz"; }; }; knotifications = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/knotifications-5.47.0.tar.xz"; - sha256 = "08cm2aks35lzspchyb6p25bfk4mrljb6wf7yi29674k4kg7gr6sv"; - name = "knotifications-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/knotifications-5.48.0.tar.xz"; + sha256 = "11p03jgkw8zvfsal6q3yxz5shkpxiknnryw2a120sjmsab87imzb"; + name = "knotifications-5.48.0.tar.xz"; }; }; knotifyconfig = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/knotifyconfig-5.47.0.tar.xz"; - sha256 = "0zava15sabmxc38ngmw9yylwnm27h8ah8df0jadxbqjpaaf0jssl"; - name = "knotifyconfig-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/knotifyconfig-5.48.0.tar.xz"; + sha256 = "1rlzmp1lzrniav2d5sjzh43mdm47i5dpa2rlsqppqq5887wjphcm"; + name = "knotifyconfig-5.48.0.tar.xz"; }; }; kpackage = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kpackage-5.47.0.tar.xz"; - sha256 = "1pwlvcmn9crjgqf1ccwb86zq962jnwavx6h6dcx7vb982z772j98"; - name = "kpackage-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kpackage-5.48.0.tar.xz"; + sha256 = "18q6gp1gmzjyid803j7mcm9dbqg4bcd059qlp6sb6rkllygv4pcr"; + name = "kpackage-5.48.0.tar.xz"; }; }; kparts = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kparts-5.47.0.tar.xz"; - sha256 = "1b21kmn8bjq69qhldacqpby9pa56c4y8j84kkwailylk3nngilsf"; - name = "kparts-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kparts-5.48.0.tar.xz"; + sha256 = "1p4xdrxfvq5xj17zf8gfxc0c9lryp8n9ahinardlb3rnb1wcw4hv"; + name = "kparts-5.48.0.tar.xz"; }; }; kpeople = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kpeople-5.47.0.tar.xz"; - sha256 = "13x1f5jwxhmdq5qq43qzfmxm20j95dwa0fck1ns1rg8k7gazmdqb"; - name = "kpeople-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kpeople-5.48.0.tar.xz"; + sha256 = "1gddld3phsqknm3x0k0wnhgqid5dqsqbw06v91vbl8746np04zf7"; + name = "kpeople-5.48.0.tar.xz"; }; }; kplotting = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kplotting-5.47.0.tar.xz"; - sha256 = "0sw448g5wa2gz6krzp7d8q1ryh6qs51hgxv432fjpblijnwzb6xx"; - name = "kplotting-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kplotting-5.48.0.tar.xz"; + sha256 = "17f78wppaj433x6fm108z5zw849qvnjsxisa92rxmkm9c64wzijg"; + name = "kplotting-5.48.0.tar.xz"; }; }; kpty = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kpty-5.47.0.tar.xz"; - sha256 = "1q4hkm701ridf07a4m93zvifi1sk6vn8z1h0b1rz5srxasaxnxlh"; - name = "kpty-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kpty-5.48.0.tar.xz"; + sha256 = "0ywkiw7gpqx7zrj6wrvfsn2sjkyxzsmqn8p91z0kz1s3id2s04fk"; + name = "kpty-5.48.0.tar.xz"; }; }; kross = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kross-5.47.0.tar.xz"; - sha256 = "13nav8fihj1pammiwz8na482qpsmcxmyxd47rqhwldvxz1z0kbq1"; - name = "kross-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kross-5.48.0.tar.xz"; + sha256 = "0zxhn8wai71ll1113k47xmcspbp16iz1rybm6m2qs6f4j5ghif8q"; + name = "kross-5.48.0.tar.xz"; }; }; krunner = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/krunner-5.47.0.tar.xz"; - sha256 = "0j3j6831y5j96cl19jdwcnd9h4rl95ymj3gy5sxilazgafzfihbd"; - name = "krunner-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/krunner-5.48.0.tar.xz"; + sha256 = "0mdwyvx656ba8pwvg4qw8jr268iffqrp9ipr28m71hkx0sh7k6hn"; + name = "krunner-5.48.0.tar.xz"; }; }; kservice = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kservice-5.47.0.tar.xz"; - sha256 = "0ryipmvydh924zjpfzmwivwagaad9dicnfcfa4drrygbwnm60bd9"; - name = "kservice-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kservice-5.48.0.tar.xz"; + sha256 = "1r5d3cdvmbyqn8hm2hjalgg1ncnpdh1w7fd5rr0k97j5qj29ypis"; + name = "kservice-5.48.0.tar.xz"; }; }; ktexteditor = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/ktexteditor-5.47.0.tar.xz"; - sha256 = "1k089k9ssk06734wnjyfmvlgxy2hqxh7fgy5qiyjvp807kmf4jkb"; - name = "ktexteditor-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/ktexteditor-5.48.0.tar.xz"; + sha256 = "1fnq6d3ky277rbg3ngq55gdswrgfxsn19c43s23xcbfaymmhapj7"; + name = "ktexteditor-5.48.0.tar.xz"; }; }; ktextwidgets = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/ktextwidgets-5.47.0.tar.xz"; - sha256 = "19w84d6v8yrci4fb6c7m91q2ykc9p24cf85cnm6lsb8ggis4dsyr"; - name = "ktextwidgets-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/ktextwidgets-5.48.0.tar.xz"; + sha256 = "0hf4rpnkc9qfpnpfm6bsrrjrvvkr6785pnakqyfbjcgbyavp58hg"; + name = "ktextwidgets-5.48.0.tar.xz"; }; }; kunitconversion = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kunitconversion-5.47.0.tar.xz"; - sha256 = "0avm3g78zfzrh4h6ampf54n9j715ii5cra8praq0waiy94idn7cq"; - name = "kunitconversion-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kunitconversion-5.48.0.tar.xz"; + sha256 = "0hipqjj82zkq8ysvg304m5jblxxrvjh8vfc3wgl93zvj0mwx06db"; + name = "kunitconversion-5.48.0.tar.xz"; }; }; kwallet = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwallet-5.47.0.tar.xz"; - sha256 = "0hy3kzkcqbzkjkvnaaanfdcnwcidnbw6j14ifvhlh2padql7kyix"; - name = "kwallet-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwallet-5.48.0.tar.xz"; + sha256 = "047jp26igla05isq6hg5bq9l3xd3dfa3v8dq3rz4im7dwa10hshr"; + name = "kwallet-5.48.0.tar.xz"; }; }; kwayland = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwayland-5.47.0.tar.xz"; - sha256 = "0j15xzlzxqi0g8lj5k9w0lbnvx26h6bblgz8rhqlkl80ml2wzgfv"; - name = "kwayland-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwayland-5.48.0.tar.xz"; + sha256 = "1qcb2kg1a23fvl6i0xky6mzmn3f6pqkvpv0dy245bd01x7q4csg4"; + name = "kwayland-5.48.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwidgetsaddons-5.47.0.tar.xz"; - sha256 = "0d2sxh6g7igjdsgj9agknx8zvymyvq9rb0xkfbr044vg5q0g99js"; - name = "kwidgetsaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwidgetsaddons-5.48.0.tar.xz"; + sha256 = "079f28ifadxhvk4miwlnhw3dvg7bmb6gjiqcg2w65bmp21rsywb7"; + name = "kwidgetsaddons-5.48.0.tar.xz"; }; }; kwindowsystem = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwindowsystem-5.47.0.tar.xz"; - sha256 = "1hfbjy17b6iw6443a3zw304syi4j0vid7nmm5hqdv8685lnp4wx6"; - name = "kwindowsystem-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwindowsystem-5.48.0.tar.xz"; + sha256 = "1b6cvx3yqkqmvji2y7ys421hmj98xhww1rlgphfdvrdaqzl4579n"; + name = "kwindowsystem-5.48.0.tar.xz"; }; }; kxmlgui = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kxmlgui-5.47.0.tar.xz"; - sha256 = "194linh0px5mk404hbgrzcfx9zblk4q835nvj4lrbl62nffzwnlp"; - name = "kxmlgui-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kxmlgui-5.48.0.tar.xz"; + sha256 = "0n38bxxip1c4fgj00jvph98qhb11ifx40z4m0pjafm52bg0kaa2h"; + name = "kxmlgui-5.48.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kxmlrpcclient-5.47.0.tar.xz"; - sha256 = "1wmsycpg5yljdpa0slv47baqpag6jzg75g0l2jddl3knznp7br8i"; - name = "kxmlrpcclient-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kxmlrpcclient-5.48.0.tar.xz"; + sha256 = "0s0xrx2p0jngk83zb8zjn4vkwnj46wzbxzj904g71ca428nmfx40"; + name = "kxmlrpcclient-5.48.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/modemmanager-qt-5.47.0.tar.xz"; - sha256 = "00wxsc4wz5fflld4h1w77726w1c06g1ql5qld2r30yibx1fb2slb"; - name = "modemmanager-qt-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/modemmanager-qt-5.48.0.tar.xz"; + sha256 = "17pnzpv3g3g25vnh9jjjk3fk6i3lhk6icl56ifcsmpj09nlw41im"; + name = "modemmanager-qt-5.48.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/networkmanager-qt-5.47.0.tar.xz"; - sha256 = "02c2d1jm3azzbwd52awq6ikjsgfg9f2dc12dkw14zkz41r87gcyh"; - name = "networkmanager-qt-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/networkmanager-qt-5.48.0.tar.xz"; + sha256 = "15qikndykampl63bnp6rik1vkmwpivqf1krbsb0r29fmwyzhy38v"; + name = "networkmanager-qt-5.48.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/oxygen-icons5-5.47.0.tar.xz"; - sha256 = "19w7ab5b7qdhj3j0pg8378k918kwjd1m5lm13jdg2kkn1f4j0j4m"; - name = "oxygen-icons5-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/oxygen-icons5-5.48.0.tar.xz"; + sha256 = "08y1gy2xgzby9wxbh90cfzly1aym9nym5r8m7z848a4v7chp0wpw"; + name = "oxygen-icons5-5.48.0.tar.xz"; }; }; plasma-framework = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/plasma-framework-5.47.0.tar.xz"; - sha256 = "1d3f2k5y966jnwrjps1x5lx9scpakq3ri3111m5h0vidkrlvnhsa"; - name = "plasma-framework-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/plasma-framework-5.48.0.tar.xz"; + sha256 = "1hl1q1v8kmq20bzm2bfrpjx1f1rljg2akib0sc65nw6vclrcgh82"; + name = "plasma-framework-5.48.0.tar.xz"; }; }; prison = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/prison-5.47.0.tar.xz"; - sha256 = "17j12mg11fnjnlj04fzxd5x95cs2f34xc2lk09hjlm7ihkw932xh"; - name = "prison-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/prison-5.48.0.tar.xz"; + sha256 = "04asjh9k6qhz6mzqvcw5famjh8fdfrjj5gwhar9lpzvl53k9236q"; + name = "prison-5.48.0.tar.xz"; }; }; purpose = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/purpose-5.47.0.tar.xz"; - sha256 = "1symzvzk50d3szz2rh7c9jd60hzpvlv6d8n7r6j9rzrplvshk879"; - name = "purpose-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/purpose-5.48.0.tar.xz"; + sha256 = "015dcsz2pybfl13dq0fhja7j05bvchjd6bcwmniq8cwc2dg2qxyp"; + name = "purpose-5.48.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/qqc2-desktop-style-5.47.0.tar.xz"; - sha256 = "1w897ixs0bfhzrzq8v4yg3rsrd8zmb08j5xh52ysb4mp7zs8jcyk"; - name = "qqc2-desktop-style-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/qqc2-desktop-style-5.48.0.tar.xz"; + sha256 = "1wc4vxjipdw3zq1lqwz3s7f0gzrcvs8svy9ip5r40qcz2w55s4an"; + name = "qqc2-desktop-style-5.48.0.tar.xz"; }; }; solid = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/solid-5.47.0.tar.xz"; - sha256 = "041fvxxlazbpdl5ncdpxzj8jq48rk31kd1nqsm8p5wqglzrz6dsl"; - name = "solid-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/solid-5.48.0.tar.xz"; + sha256 = "0fy070kbqs9hvi1ngmqzfz8a9vnry0mrin51z1yfdc44806bk2ns"; + name = "solid-5.48.0.tar.xz"; }; }; sonnet = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/sonnet-5.47.0.tar.xz"; - sha256 = "14nfrv1z1lpjhxsxhjx8bi88yp1qx4dzwf6v22w0mk71qc6z2rgr"; - name = "sonnet-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/sonnet-5.48.0.tar.xz"; + sha256 = "1mzl2a61jrqflnlkkrp079z428sf2bc811qwfx0rdh0jp7bc7sq4"; + name = "sonnet-5.48.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/syntax-highlighting-5.47.0.tar.xz"; - sha256 = "0bv25cv3xvhl9v23dn3yxhdcv5ag2i1zhvna6gnng6k30n316v0c"; - name = "syntax-highlighting-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/syntax-highlighting-5.48.0.tar.xz"; + sha256 = "03cfljg90iszpxmx6f0dv1w1r451yqzi9bk27x56s5xzsghj8bv5"; + name = "syntax-highlighting-5.48.0.tar.xz"; }; }; threadweaver = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/threadweaver-5.47.0.tar.xz"; - sha256 = "0h48b6mvgq3igbs6jzngj1iad7m5kgkird17shk86ma79k6igriz"; - name = "threadweaver-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/threadweaver-5.48.0.tar.xz"; + sha256 = "0pks8sddqdhlcrqgb106b6jy0gh3gfcss2rdavqfck6d9780v125"; + name = "threadweaver-5.48.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 853d23c974586..dcff8c2757e1f 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { name = "frog-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; - name = "frog-${release.version}.tar.gz"; }; + name = "frog-v${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 icu diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json index 1147322be6da8..6ea449387172b 100644 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json @@ -1,5 +1,5 @@ { - "version": "v0.13", + "version": "0.13", "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13", "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg" } diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index b726d9c2b42aa..dfe1455759a67 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -21,7 +21,7 @@ assert faacSupport -> enableUnfree; let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in /* ToDo: - - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools + - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools - maybe do some more splitting into outputs */ diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index e84df0c1aedf9..b5402984d16f0 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl -, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml -, cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key +, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, udev, kmod, parted, libyaml +, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key }: let @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml + glib udev kmod parted cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 6531a4cd9ed49..347e3218c1dc6 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libevent openssl ]; - doCheck = (!stdenv.isDarwin); + doCheck = !stdenv.isDarwin; checkPhase = "ctest"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 34ba39d799ed5..1342ee6773f71 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -3,7 +3,7 @@ let baseName = "libdbusmenu-qt"; v = "0.9.2"; - homepage = "http://launchpad.net/${baseName}"; + homepage = "https://launchpad.net/${baseName}"; name = "${baseName}-${v}"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; cmakeFlags = "-DWITH_DOC=OFF"; - + meta = with stdenv.lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index b2a0021d53b56..e7157afbaee53 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; + propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; meta = { diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index fd9c8dc9a5e32..1efc16b2bf5c9 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,29 +1,53 @@ -{ stdenv, fetchFromGitHub, perl, cmake }: +{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobjectIntrospection +, python3, tzdata, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glib, libxml2, icu }: stdenv.mkDerivation rec { name = "libical-${version}"; - version = "2.0.0"; + version = "3.0.3"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "0xsvqy1hzmwxn783wrb2k8p751544pzv39v9ynr9pj4yzkwjzsvb"; + sha256 = "0dhlfn6n136di4fbqd74gdaibyh5zz1vac5x8ii3bjc2d5h7hw8h"; }; - nativeBuildInputs = [ perl cmake ]; + nativeBuildInputs = [ + perl pkgconfig cmake ninja vala gobjectIntrospection + (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests + gtk-doc docbook_xsl docbook_xml_dtd_43 # docs + ]; + buildInputs = [ glib libxml2 icu ]; + + cmakeFlags = [ + "-DGOBJECT_INTROSPECTION=True" + "-DICAL_GLIB_VAPI=True" + ]; patches = [ # TODO: upstream this patch + # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch ]; - doCheck = false; # fails all the tests (ctest) + # Using install check so we do not have to manually set + # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + export TZDIR=${tzdata}/share/zoneinfo + ctest --output-on-failure + + runHook postInstallCheck + ''; meta = with stdenv.lib; { homepage = https://github.com/libical/libical; description = "An Open Source implementation of the iCalendar protocols"; - license = licenses.mpl10; + license = licenses.mpl20; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index 715ba1fa8426c..59d23e490e5a0 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,9 +1,9 @@ --- a/src/libical/icaltz-util.c +++ b/src/libical/icaltz-util.c -@@ -96,9 +96,9 @@ typedef struct - static char *zdir = NULL; +@@ -94,9 +94,9 @@ + static const char *zdir = NULL; - static char *search_paths[] = { + static const char *search_paths[] = { + "/etc/zoneinfo", "/usr/share/zoneinfo", "/usr/lib/zoneinfo", @@ -11,13 +11,13 @@ "/usr/share/lib/zoneinfo" }; -@@ -179,6 +179,15 @@ static void set_zonedir(void) +@@ -178,6 +178,15 @@ const char *fname = ZONES_TAB_SYSTEM_FILENAME; size_t i, num_search_paths; + const char *env_tzdir = getenv ("TZDIR"); + if (env_tzdir) { -+ snprintf(file_path, MAXPATHLEN, "%s/%s", env_tzdir, fname); ++ sprintf (file_path, "%s/%s", env_tzdir, fname); + if (!access (file_path, F_OK|R_OK)) { + zdir = env_tzdir; + return; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 0e900ca9db644..24dd4f2465c6a 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { sed -i -e '/preload/d' Makefile.in ''; - configureFlags = lib.optional stdenv.isFreeBSD "--with-pic" - ++ lib.optional enableStatic "--enable-static" - ++ lib.optional (!enableShared) "--disable-shared"; + configureFlags = [ + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; meta = { description = "An iconv(3) implementation"; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 1bde9336c66df..1f5ee90337aa5 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus-glib, libdbusmenu-glib +, glib, dbus-glib, libdbusmenu , gtkVersion ? "3", gtk2 ? null, gtk3 ? null , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ]; buildInputs = [ - glib dbus-glib libdbusmenu-glib + glib dbus-glib libdbusmenu python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 8168ff0edae43..38ba93d4f7c59 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { name = "libsass-${version}"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz"; }; - patchPhase = '' + patches = [ + # CVE-2018-11693, is in master but no release yet + (fetchpatch { + url = "https://github.com/sass/libsass/commit/af0e12cdf09d43dbd1fc11e3f64b244277cc1a1e.patch"; + sha256 = "1y8yvjvvz91lcr1kpq2pw8729xhdgp15mbldcw392pfzdlliwdyl"; + }) + ]; + + preConfigure = '' export LIBSASS_VERSION=${version} ''; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index bd54b3aa343a2..400a107c5186f 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, x11}: +{stdenv, fetchurl, automake, autoconf, xlibsWrapper}: stdenv.mkDerivation { name = "libstroke-0.5.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; - buildInputs = [ automake autoconf x11 ]; + buildInputs = [ automake autoconf xlibsWrapper ]; # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. # Also, modern automake doesn't like things and returns error code 63. But it generates the file. diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 4dc601745a42b..ce8d741adf23c 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,17 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig -, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { - version = "1.20.3"; + version = "1.21.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1a8a679wni560z7x6w5i431vh2g0f34cznflcn52klx1vwcggrg7"; + sha256 = "1jjg34ppnlrnb634q9mla7whl7rm9xmjgnzckrznqcycwzir074b"; }; + patches = [ + (fetchpatch { + url = "https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d.patch"; + sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj"; + }) + ]; + postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent @@ -19,15 +25,28 @@ stdenv.mkDerivation rec { "getaddrinfo_fail" "getaddrinfo_fail_sync" "threadpool_multiple_event_loops" # times out on slow machines ] - # sometimes: timeout (no output), failed uv_listen - ++ stdenv.lib.optionals stdenv.isDarwin [ "process_title" "emfile" ]; + # 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 [ + "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" + "tcp_bind6_error_inval" "tcp_bind6_error_addrinuse" "tcp_read_stop" + "tcp_unexpected_read" "tcp_write_to_half_open_connection" + "tcp_oob" "tcp_close_accept" "tcp_create_early_accept" + "tcp_create_early" "tcp_close" "tcp_bind_error_inval" + "tcp_bind_error_addrinuse" "tcp_shutdown_after_write" + "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot" + "multiple_listen" "delayed_accept" + "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" + ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' sed '/${tdRegexp}/d' -i test/test-list.h ''; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh @@ -35,10 +54,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # These should be turned back on, but see https://github.com/NixOS/nixpkgs/issues/23651 - # For now the tests are just breaking large swaths of the nixpkgs binary cache for Darwin, - # and I'd rather have everything else work at all than have stronger assurance here. - doCheck = !stdenv.isDarwin; + doCheck = true; meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index b12ed9613510d..02c13e413e33d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit , pkgconfig, makeWrapper, libtool, autoconf, automake -, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr +, coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 1150d04e1b491..263796cdc783b 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, xkeyboard_config, libxml2, xorg +{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobjectIntrospection }: let - version = "5.3"; + version = "5.4"; in stdenv.mkDerivation rec { name = "libxklavier-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/libxklavier/${version}/${name}.tar.xz"; - sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; + src = fetchgit { + url = "git://anongit.freedesktop.org/git/libxklavier"; + rev = name; + sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -17,14 +18,20 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ]; buildInputs = [ gobjectIntrospection ]; + preAutoreconf = '' + export NOCONFIGURE=1 + gtkdocize + ''; + configureFlags = [ "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" "--with-xkb-bin-base=${xorg.xkbcomp}/bin" "--disable-xmodmap-support" + "--enable-gtk-doc" ]; meta = with stdenv.lib; { @@ -34,4 +41,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 3828ebcb7a707..367c4e9638422 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate -, libuchardet, pkgconfig, glib, libtidy, libxml2, libuuid, openssl +, libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl }: stdenv.mkDerivation rec { @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libetpan cmake icu cyrus_sasl libctemplate libuchardet glib - libtidy libxml2 libuuid openssl + html-tidy libxml2 libuuid openssl ]; postPatch = '' substituteInPlace CMakeLists.txt \ --replace " icule iculx" "" \ --replace "tidy/tidy.h" "tidy.h" \ - --replace "/usr/include/tidy" "${libtidy}/include" \ + --replace "/usr/include/tidy" "${html-tidy}/include" \ --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ --replace buffio.h tidybuffio.h diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f8152bea2cc17..9c0bf29d49089 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "18.0.3"; + version = "18.1.4"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0c4yskqwmh5k0wavjrkfcldafvnpcx8gjcx584bscxks69krd789"; + sha256 = "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h"; }; prePatch = "patchShebangs ."; @@ -154,7 +154,7 @@ let self = stdenv.mkDerivation { libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland wayland-protocols libvdpau libelf libXvMC libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/ - valgrind-light python2 + valgrind-light python2 python2.pkgs.Mako ]; enableParallelBuilding = true; @@ -205,6 +205,11 @@ let self = stdenv.mkDerivation { for js in $drivers/share/glvnd/egl_vendor.d/*.json; do substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" done + + # Update search path used by pkg-config + for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do + substituteInPlace "$pc" --replace $out $drivers + done '' + optionalString (vulkanDrivers != []) '' # Update search path used by Vulkan (it's pointing to $out but # drivers are in $drivers) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 57b810c0b448c..2d4de33904226 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.8.0"; + version = "6.10.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8"; + sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr"; }; buildInputs = [ diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 32467e4849b54..ab50cf1e17ca0 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -1,27 +1,60 @@ -{ stdenv, fetchurl, perl, gmp, libtool +{ stdenv +, lib +, fetchurl +, perl +, gmp +, gf2x ? null +# I asked the ntl maintainer weather or not to include gf2x by default: +# > If I remember correctly, gf2x is now thread safe, so there's no reason not to use it. +, withGf2x ? true +, tune ? false # tune for current system; non reproducible and time consuming }: +assert withGf2x -> gf2x != null; + stdenv.mkDerivation rec { name = "ntl-${version}"; - version = "9.11.0"; + version = "11.2.1"; src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "1wcwxpcby1c50llncz131334qq26lzh3dz21rahymgvakrq0369p"; + sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489"; }; - buildInputs = [ perl gmp libtool ]; + buildInputs = [ + gmp + ]; + + nativeBuildInputs = [ + perl # needed for ./configure + ]; sourceRoot = "${name}/src"; enableParallelBuilding = true; - dontAddPrefix = true; + dontAddPrefix = true; # DEF_PREFIX instead - configureFlags = [ "DEF_PREFIX=$(out)" "WIZARD=off" "SHARED=on" "NATIVE=off" "CXX=c++" ]; + # reference: http://shoup.net/ntl/doc/tour-unix.html + configureFlags = [ + "DEF_PREFIX=$(out)" + "SHARED=on" # genereate a shared library (as well as static) + "NATIVE=off" # don't target code to current hardware (reproducibility, portability) + "TUNE=${ + if tune then + "auto" + else if stdenv.targetPlatform.isx86 then + "x86" # "chooses options that should be well suited for most x86 platforms" + else + "generic" # "chooses options that should be OK for most platforms" + }" + ] ++ lib.optionals withGf2x [ + "NTL_GF2X_LIB=on" + "GF2X_PREFIX=${gf2x}" + ]; - # doCheck = true; # takes some time + doCheck = true; # takes some time - meta = { + meta = with lib; { description = "A Library for doing Number Theory"; longDescription = '' NTL is a high-performance, portable C++ library providing data @@ -30,7 +63,8 @@ stdenv.mkDerivation rec { the integers and over finite fields. ''; homepage = http://www.shoup.net/ntl/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ timokau ]; + license = licenses.gpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 2e1ed060acac0..73e7fd42cdba8 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pcre2-${version}"; - version = "10.23"; + version = "10.31"; src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz"; + sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0"; }; configureFlags = [ @@ -14,34 +14,8 @@ stdenv.mkDerivation rec { "--enable-jit" ]; - patches = [ - (fetchpatch { - name = "CVE-2017-7186-part1.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date"; - sha256 = "10yzglvbn7h06hg7zffr5zh378i5jihvx7d5gggkynws79vgwvfr"; - stripLen = 2; - extraPrefix = ""; - }) - (fetchpatch { - name = "CVE-2017-7186-part2.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date"; - sha256 = "1bggk7vd5hg0bjg96lj4h1lacmr6grq68dm6iz1n7vg3zf7virjn"; - stripLen = 2; - extraPrefix = ""; - }) - (fetchpatch { - name = "CVE-2017-8786.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2test.c?r1=692&r2=697&view=patch"; - sha256 = "1c629nzrk4il2rfclwyc1a373q58m4q9ys9wr91zhl4skfk7x19b"; - stripLen = 2; - extraPrefix = ""; - }) - ]; - outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; - doCheck = false; # fails 1 of 3 tests - postFixup = '' moveToOutput bin/pcre2-config "$dev" ''; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7e7314c936dd3..c50fc9fb35c8f 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xorg +, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf, freefont_ttf }: @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils - alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2 + alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 84709441b5e71..9a43470de3b72 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "podofo-0.9.5"; + name = "podofo-0.9.6"; src = fetchurl { url = "mirror://sourceforge/podofo/${name}.tar.gz"; - sha256 = "012kgfx5j5n6w4zkc1d290d2cwjk60jhzsjlr2x19g3yi75q2jc5"; + sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9"; }; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 1a98ecc874365..c89e9e4296cfd 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -9,10 +9,11 @@ in { cudnn_cudatoolkit_7 = generic rec { - version = "4.0"; + # Old URL is v4 instead of v4.0 for some reason... + version = "4"; cudatoolkit = cudatoolkit_7; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz"; - sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f"; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v4.0-prod.tgz"; + sha256 = "01a4v5j4v9n2xjqcc4m28c3m67qrvsx87npvy7zhx7w8smiif2fd"; }; cudnn_cudatoolkit_7_5 = generic rec { diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 51bda19cf1391..bb1258655b5bf 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -5,24 +5,18 @@ { stdenv , lib -, requireFile , cudatoolkit +, fetchurl }: stdenv.mkDerivation rec { name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; inherit version; - - src = requireFile rec { - name = srcName; + src = fetchurl { + # URL from NVIDIA docker containers: https://gitlab.com/nvidia/cuda/blob/centos7/7.0/runtime/cudnn4/Dockerfile + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/${srcName}"; inherit sha256; - message = '' - This nix expression requires that ${name} is already part of the store. - Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library - at https://developer.nvidia.com/cudnn, and run the following command in the download directory: - nix-prefetch-url file://\$PWD/${name} - ''; }; installPhase = '' diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix new file mode 100644 index 0000000000000..4f36ac2ba1c75 --- /dev/null +++ b/pkgs/development/libraries/stb/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "stb-${version}"; + version = "20180211"; + + src = fetchFromGitHub { + owner = "nothings"; + repo = "stb"; + rev = "e6afb9cbae4064da8c3e69af3ff5c4629579c1d2"; + sha256 = "079nsn9bnb8c0vfq26g5l53q6gzx19a5x9q2nb55mpcljxsgxnmf"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/include/stb + cp *.h $out/include/stb/ + ''; + + meta = with stdenv.lib; { + description = "Single-file public domain libraries for C/C++"; + homepage = https://github.com/nothings/stb; + license = licenses.publicDomain; + platforms = platforms.all; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 63060bf555331..36768acd991ac 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 -, clucene_core, fam, zlib, dbus_tools, pkgconfig +, clucene_core, fam, zlib, dbus, pkgconfig }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus.out ]; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 24dc3667d172a..d14010c857e4b 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; - checkInputs = [ dbus_daemon dbus-python ]; + checkInputs = [ dbus.daemon dbus-python ]; patches = [ # https://github.com/TelepathyIM/telepathy-qt/issues/25 diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 53faf07623e9b..a8515975c353a 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook, pkgconfig, gettext, python2 -, swig, glib, utillinux, cryptsetup, nss, gpgme +{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 +, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme }: let - version = "0.3.10"; + version = "0.3.11"; in stdenv.mkDerivation rec { name = "volume_key-${version}"; src = fetchgit { url = https://pagure.io/volume_key.git; - rev = "ece1ce305234da454e330905c615ec474d9781c5"; - sha256 = "16qdi5s6ycsh0iyc362gly7ggrwamky8i0zgbd4ajp3ymk9vqdva"; + rev = "volume_key-${version}"; + sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma"; }; - outputs = [ "out" "man" "dev" ]; + outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gettext python2 swig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gettext python3 ncurses swig ]; buildInputs = [ glib cryptsetup nss utillinux gpgme ]; - patches = [ - # Use pkg-config for locating Python.h - # https://pagure.io/volume_key/pull-request/12 - (fetchpatch { - url = https://pagure.io/fork/cathay4t/volume_key/c/8eda66d3b734ea335e37cf9d7d173b9e8ebe2fd9.patch; - sha256 = "01lr1zijk0imkk681zynm4w5ad3y6c9vdrmrzaib7w7ima75iczr"; - }) + makeFlags = [ + "pyexecdir=$(py)/${python3.sitePackages}" + "pythondir=$(py)/${python3.sitePackages}" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 797c64729ecf8..e154403697fec 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vulkan Header files and API registry"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4b84f696eec69..e44a678194ae8 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, - x11, libxcb, libXrandr, libXext, wayland, libGL_driver }: + xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: let version = "1.1.77.0"; in assert version == vulkan-headers.version; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ]; + buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index c905c40cf9603..c4d94af850dd5 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -13,7 +13,6 @@ let + optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index a672bbf52a90a..2b9244ff1b184 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL -, libX11, dbus_libs, wayland-protocols, libdrm, mesa_noglu +, libX11, dbus, wayland-protocols, libdrm, mesa_noglu , libpthreadstubs, libXdmcp, libXext, libXfixes , withOptionalPackages ? true, zlib, valgrind, doxygen }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL - libX11 libXfixes dbus_libs wayland-protocols + libX11 libXfixes dbus wayland-protocols libpthreadstubs libXdmcp libXext libdrm mesa_noglu ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 33cf5dd4af84a..7acbaa260a0c0 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38 -, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib +, autoconf, automake, libtool, gettext, dbus, telepathy-glib , gtk3, json-glib, librdf_raptor2, dbus-glib , pythonSupport ? true, python2Packages }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ]; buildInputs = [ - glib sqlite dbus_libs telepathy-glib dbus-glib + glib sqlite dbus telepathy-glib dbus-glib gtk3 json-glib librdf_raptor2 python2Packages.rdflib ]; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 111d995274983..1dc2488f55a25 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -1,6 +1,5 @@ {pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}: let - addDeps = newdeps: x: {deps = x.deps ++ newdeps;}; addNativeLibs = libs: x: { propagatedBuildInputs = libs; }; skipBuildPhase = x: { overrides = y: ((x.overrides y) // { buildPhase = "true"; }); diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 1e8ea65c73d9a..fd8651e89cf5b 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -25,9 +25,6 @@ stdenv.mkDerivation rec { sed_script_1 = "'s|^PROGDIR=`dirname $0`" + "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; - sed_script_2 = - "'s|^MYNDKDIR=`dirname $0`" + - "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; runtime_paths = (lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 390c5eb7a2058..20b3ff3b8f509 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -7,10 +7,6 @@ args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; let - platformName = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then "linux" - else if stdenv.system == "x86_64-darwin" then "macosx" - else throw "Platform: ${stdenv.system} is not supported!"; - androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; abiVersions = []; diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 30b63e5ca4dae..b06f05ddb3eb0 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -213,10 +213,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.9.0"; + version = "2.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.9.0.tgz"; - sha1 = "1c2f5ade46b87cc3b1f3b7c66eeb7b0f4df4d968"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.11.2.tgz"; + sha1 = "fc7235c2ec82a6ede6caf47485a68a2c6fa2e1f5"; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index e183feb99720b..6d60ca9a78306 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -112,193 +112,193 @@ let sha512 = "lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug=="; }; }; - "@types/node-10.5.1" = { + "@types/node-10.5.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.1"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz"; - sha512 = "AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz"; + sha512 = "m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q=="; }; }; - "@types/node-8.10.20" = { + "@types/node-8.10.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.20"; + version = "8.10.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz"; - sha512 = "M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.21.tgz"; + sha512 = "87XkD9qDXm8fIax+5y7drx84cXsu34ZZqfB7Cial3Q/2lxSoJ/+DRaWckkCbxP41wFSIrrb939VhzaNxj4eY1w=="; }; }; - "@webassemblyjs/ast-1.5.12" = { + "@webassemblyjs/ast-1.5.13" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.12.tgz"; - sha512 = "bmTBEKuuhSU6dC95QIW250xO769cdYGx9rWn3uBLTw2pUpud0Z5kVuMw9m9fqbNzGeuOU2HpyuZa+yUt2CTEDA=="; + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.13.tgz"; + sha512 = "49nwvW/Hx9i+OYHg+mRhKZfAlqThr11Dqz8TsrvqGKMhdI2ijy3KBJOun2Z4770TPjrIJhR6KxChQIDaz8clDA=="; }; }; - "@webassemblyjs/floating-point-hex-parser-1.5.12" = { + "@webassemblyjs/floating-point-hex-parser-1.5.13" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz"; - sha512 = "epTvkdwOIPpTE9edHS+V+shetYzpTbd91XOzUli1zAS0+NSgSe6ZsNggIqUNzhma1s4bN2f/m8c6B1NMdCERAg=="; + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz"; + sha512 = "vrvvB18Kh4uyghSKb0NTv+2WZx871WL2NzwMj61jcq2bXkyhRC+8Q0oD7JGVf0+5i/fKQYQSBCNMMsDMRVAMqA=="; }; }; - "@webassemblyjs/helper-api-error-1.5.12" = { + "@webassemblyjs/helper-api-error-1.5.13" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz"; - sha512 = "Goxag86JvLq8ucHLXFNSLYzf9wrR+CJr37DsESTAzSnGoqDTgw5eqiXSQVd/D9Biih7+DIn8UIQCxMs8emRRwg=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz"; + sha512 = "dBh2CWYqjaDlvMmRP/kudxpdh30uXjIbpkLj9HQe+qtYlwvYjPRjdQXrq1cTAAOUSMTtzqbXIxEdEZmyKfcwsg=="; }; }; - "@webassemblyjs/helper-buffer-1.5.12" = { + "@webassemblyjs/helper-buffer-1.5.13" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz"; - sha512 = "tJNUjttL5CxiiS/KLxT4/Zk0Nbl/poFhztFxktb46zoQEUWaGHR9ZJ0SnvE7DbFX5PY5JNJDMZ0Li4lm246fWw=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz"; + sha512 = "v7igWf1mHcpJNbn4m7e77XOAWXCDT76Xe7Is1VQFXc4K5jRcFrl9D0NrqM4XifQ0bXiuTSkTKMYqDxu5MhNljA=="; }; }; - "@webassemblyjs/helper-code-frame-1.5.12" = { + "@webassemblyjs/helper-code-frame-1.5.13" = { name = "_at_webassemblyjs_slash_helper-code-frame"; packageName = "@webassemblyjs/helper-code-frame"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz"; - sha512 = "0FrJgiST+MQDMvPigzs+UIk1vslLIqGadkEWdn53Lr0NsUC2JbheG9QaO3Zf6ycK2JwsHiUpGaMFcHYXStTPMA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz"; + sha512 = "yN6ScQQDFCiAXnVctdVO/J5NQRbwyTbQzsGzEgXsAnrxhjp0xihh+nNHQTMrq5UhOqTb5LykpJAvEv9AT0jnAQ=="; }; }; - "@webassemblyjs/helper-fsm-1.5.12" = { + "@webassemblyjs/helper-fsm-1.5.13" = { name = "_at_webassemblyjs_slash_helper-fsm"; packageName = "@webassemblyjs/helper-fsm"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz"; - sha512 = "QBHZ45VPUJ7UyYKvUFoaxrSS9H5hbkC9U7tdWgFHmnTMutkXSEgDg2gZg3I/QTsiKOCIwx4qJUJwPd7J4D5CNQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz"; + sha512 = "hSIKzbXjVMRvy3Jzhgu+vDd/aswJ+UMEnLRCkZDdknZO3Z9e6rp1DAs0tdLItjCFqkz9+0BeOPK/mk3eYvVzZg=="; }; }; - "@webassemblyjs/helper-module-context-1.5.12" = { + "@webassemblyjs/helper-module-context-1.5.13" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz"; - sha512 = "SCXR8hPI4JOG3cdy9HAO8W5/VQ68YXG/Hfs7qDf1cd64zWuMNshyEour5NYnLMVkrrtc0XzfVS/MdeV94woFHA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz"; + sha512 = "zxJXULGPLB7r+k+wIlvGlXpT4CYppRz8fLUM/xobGHc9Z3T6qlmJD9ySJ2jknuktuuiR9AjnNpKYDECyaiX+QQ=="; }; }; - "@webassemblyjs/helper-wasm-bytecode-1.5.12" = { + "@webassemblyjs/helper-wasm-bytecode-1.5.13" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz"; - sha512 = "0Gz5lQcyvElNVbOTKwjEmIxGwdWf+zpAW/WGzGo95B7IgMEzyyfZU+PrGHDwiSH9c0knol9G7smQnY0ljrSA6g=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz"; + sha512 = "0n3SoNGLvbJIZPhtMFq0XmmnA/YmQBXaZKQZcW8maGKwLpVcgjNrxpFZHEOLKjXJYVN5Il8vSfG7nRX50Zn+aw=="; }; }; - "@webassemblyjs/helper-wasm-section-1.5.12" = { + "@webassemblyjs/helper-wasm-section-1.5.13" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz"; - sha512 = "ge/CKVKBGpiJhFN9PIOQ7sPtGYJhxm/mW1Y3SpG1L6XBunfRz0YnLjW3TmhcOEFozIVyODPS1HZ9f7VR3GBGow=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz"; + sha512 = "IJ/goicOZ5TT1axZFSnlAtz4m8KEjYr12BNOANAwGFPKXM4byEDaMNXYowHMG0yKV9a397eU/NlibFaLwr1fbw=="; }; }; - "@webassemblyjs/ieee754-1.5.12" = { + "@webassemblyjs/ieee754-1.5.13" = { name = "_at_webassemblyjs_slash_ieee754"; packageName = "@webassemblyjs/ieee754"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz"; - sha512 = "F+PEv9QBzPi1ThLBouUJbuxhEr+Sy/oua1ftXFKHiaYYS5Z9tKPvK/hgCxlSdq+RY4MSG15jU2JYb/K5pkoybg=="; + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz"; + sha512 = "TseswvXEPpG5TCBKoLx9tT7+/GMACjC1ruo09j46ULRZWYm8XHpDWaosOjTnI7kr4SRJFzA6MWoUkAB+YCGKKg=="; }; }; - "@webassemblyjs/leb128-1.5.12" = { + "@webassemblyjs/leb128-1.5.13" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.12.tgz"; - sha512 = "cCOx/LVGiWyCwVrVlvGmTdnwHzIP4+zflLjGkZxWpYCpdNax9krVIJh1Pm7O86Ox/c5PrJpbvZU1cZLxndlPEw=="; + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.13.tgz"; + sha512 = "0NRMxrL+GG3eISGZBmLBLAVjphbN8Si15s7jzThaw1UE9e5BY1oH49/+MA1xBzxpf1OW5sf9OrPDOclk9wj2yg=="; }; }; - "@webassemblyjs/utf8-1.5.12" = { + "@webassemblyjs/utf8-1.5.13" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.12.tgz"; - sha512 = "FX8NYQMiTRU0TfK/tJVntsi9IEKsedSsna8qtsndWVE0x3zLndugiApxdNMIOoElBV9o4j0BUqR+iwU58QfPxQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.13.tgz"; + sha512 = "Ve1ilU2N48Ew0lVGB8FqY7V7hXjaC4+PeZM+vDYxEd+R2iQ0q+Wb3Rw8v0Ri0+rxhoz6gVGsnQNb4FjRiEH/Ng=="; }; }; - "@webassemblyjs/wasm-edit-1.5.12" = { + "@webassemblyjs/wasm-edit-1.5.13" = { name = "_at_webassemblyjs_slash_wasm-edit"; packageName = "@webassemblyjs/wasm-edit"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz"; - sha512 = "r/oZAyC4EZl0ToOYJgvj+b0X6gVEKQMLT34pNNbtvWBehQOnaSXvVUA5FIYlH8ubWjFNAFqYaVGgQTjR1yuJdQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz"; + sha512 = "X7ZNW4+Hga4f2NmqENnHke2V/mGYK/xnybJSIXImt1ulxbCOEs/A+ZK/Km2jgihjyVxp/0z0hwIcxC6PrkWtgw=="; }; }; - "@webassemblyjs/wasm-gen-1.5.12" = { + "@webassemblyjs/wasm-gen-1.5.13" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz"; - sha512 = "LTu+cr1YRxGGiVIXWhei/35lXXEwTnQU18x4V/gE+qCSJN21QcVTMjJuasTUh8WtmBZtOlqJbOQIeN7fGnHWhg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz"; + sha512 = "yfv94Se8R73zmr8GAYzezFHc3lDwE/lBXQddSiIZEKZFuqy7yWtm3KMwA1uGbv5G1WphimJxboXHR80IgX1hQA=="; }; }; - "@webassemblyjs/wasm-opt-1.5.12" = { + "@webassemblyjs/wasm-opt-1.5.13" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz"; - sha512 = "LBwG5KPA9u/uigZVyTsDpS3CVxx3AePCnTItVL+OPkRCp5LqmLsOp4a3/c5CQE0Lecm0Ss9hjUTDcbYFZkXlfQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz"; + sha512 = "IkXSkgzVhQ0QYAdIayuCWMmXSYx0dHGU8Ah/AxJf1gBvstMWVnzJnBwLsXLyD87VSBIcsqkmZ28dVb0mOC3oBg=="; }; }; - "@webassemblyjs/wasm-parser-1.5.12" = { + "@webassemblyjs/wasm-parser-1.5.13" = { name = "_at_webassemblyjs_slash_wasm-parser"; packageName = "@webassemblyjs/wasm-parser"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz"; - sha512 = "xset3+1AtoFYEfMg30nzCGBnhKmTBzbIKvMyLhqJT06TvYV+kA884AOUpUvhSmP6XPF3G+HVZPm/PbCGxH4/VQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz"; + sha512 = "XnYoIcu2iqq8/LrtmdnN3T+bRjqYFjRHqWbqK3osD/0r/Fcv4d9ecRzjVtC29ENEuNTK4mQ9yyxCBCbK8S/cpg=="; }; }; - "@webassemblyjs/wast-parser-1.5.12" = { + "@webassemblyjs/wast-parser-1.5.13" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz"; - sha512 = "QWUtzhvfY7Ue9GlJ3HeOB6w5g9vNYUUnG+Y96TWPkFHJTxZlcvGfNrUoACCw6eDb9gKaHrjt77aPq41a7y8svg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz"; + sha512 = "Lbz65T0LQ1LgzKiUytl34CwuhMNhaCLgrh0JW4rJBN6INnBB8NMwUfQM+FxTnLY9qJ+lHJL/gCM5xYhB9oWi4A=="; }; }; - "@webassemblyjs/wast-printer-1.5.12" = { + "@webassemblyjs/wast-printer-1.5.13" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz"; - sha512 = "XF9RTeckFgDyl196uRKZWHFFfbkzsMK96QTXp+TC0R9gsV9DMiDGMSIllgy/WdrZ3y3dsQp4fTA5r4GoaOBchA=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz"; + sha512 = "QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ=="; }; }; - "@zeit/schemas-1.2.0" = { + "@zeit/schemas-1.6.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; - version = "1.2.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-1.2.0.tgz"; - sha512 = "iceEQm4zFjgAVUPAj8Wto62xUJxOxicXULWFD2q9Z2Rwi1pVnz1QlDMfNTuNZUULmV7/0xFpOthf8JK8xpTYZA=="; + url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-1.6.0.tgz"; + sha512 = "fUCDfGPOU2FPOpX8+9ctuHs5+HIvuP3w6Fx+Q0eQLQs8Ow/GFa9zMgkYtVWhHS5S+dtXmBDm4ZpYcXtZgLQq0A=="; }; }; "CSSselect-0.4.1" = { @@ -688,13 +688,13 @@ let sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; }; }; - "agent-base-4.2.0" = { + "agent-base-4.2.1" = { name = "agent-base"; packageName = "agent-base"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz"; - sha512 = "c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz"; + sha512 = "JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg=="; }; }; "aggregate-error-1.0.0" = { @@ -769,15 +769,6 @@ let sha512 = "VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA=="; }; }; - "ajv-6.5.1" = { - name = "ajv"; - packageName = "ajv"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz"; - sha512 = "pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ=="; - }; - }; "ajv-6.5.2" = { name = "ajv"; packageName = "ajv"; @@ -922,13 +913,13 @@ let sha1 = "538ae528af8982f28ae30d86f2f17456d2609873"; }; }; - "ansi-diff-stream-1.2.1" = { - name = "ansi-diff-stream"; - packageName = "ansi-diff-stream"; - version = "1.2.1"; + "ansi-diff-1.1.1" = { + name = "ansi-diff"; + packageName = "ansi-diff"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; - sha512 = "PaKs34INoKpTzcjyKd2GM/CCEeTyDgWKuHSgF0z7ywjpbBFj/pzQf/30v+TR6VBBLia6Mso+W2ygU22ljqbi6A=="; + url = "https://registry.npmjs.org/ansi-diff/-/ansi-diff-1.1.1.tgz"; + sha512 = "XnTdFDQzbEewrDx8epWXdw7oqHMvv315vEtfqDiEhhWghIf4++h26c3/FMz7iTLhNrnj56DNIXpbxHZq+3s6qw=="; }; }; "ansi-escapes-1.4.0" = { @@ -1003,6 +994,15 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; + "ansi-split-1.0.1" = { + name = "ansi-split"; + packageName = "ansi-split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-split/-/ansi-split-1.0.1.tgz"; + sha512 = "RRxQym4DFtDNmHIkW6aeFVvrXURb11lGAEPXNiryjCe8bK8RsANjzJ0M2aGOkvBYwP4Bl/xZ8ijtr6D3j1x/eg=="; + }; + }; "ansi-styles-1.0.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -1876,13 +1876,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.266.1" = { + "aws-sdk-2.275.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.266.1"; + version = "2.275.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.266.1.tgz"; - sha512 = "b8lisloCETh0Fx0il540i+Hbgf3hyegQ6ezoJFggfc1HIbqzvIjVJYJhOsYl1fL1o+iMUaVU4ZH8cSyoMFR2Tw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.275.1.tgz"; + sha512 = "lcpgoiHLhdcolUT7aJdg/CmlYO5ecf+3A+4dIceO72mFovCWZde1Rvr07QNbQ8gT0paqr5j2rs2b6c23Y/K0RQ=="; }; }; "aws-sign-0.2.0" = { @@ -1948,13 +1948,13 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-batch-3.1.0" = { + "azure-arm-batch-3.1.1" = { name = "azure-arm-batch"; packageName = "azure-arm-batch"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.1.0.tgz"; - sha512 = "AwRxOn/4718n3N4rlUsnFTavKsQoNHJzcfH9BWpUadiov9mMVxH3vXPhM1sb0KVO21GPqh4s3w9s1RUpJvstkA=="; + url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.1.1.tgz"; + sha512 = "qRv/QB8vTwnO5I8tjdEnrBuRjh4SCD2rdQaHPQatkYmx7Of3gz57JfX4FrNNZXqKIyCoTlWoNWhM/jzCAL3TyA=="; }; }; "azure-arm-cdn-4.0.1" = { @@ -2578,6 +2578,15 @@ let sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; }; }; + "base64-js-1.2.0" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; + }; + }; "base64-js-1.2.3" = { name = "base64-js"; packageName = "base64-js"; @@ -3478,13 +3487,13 @@ let sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; }; - "browserify-des-1.0.1" = { + "browserify-des-1.0.2" = { name = "browserify-des"; packageName = "browserify-des"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz"; - sha512 = "zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw=="; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; "browserify-incremental-3.1.1" = { @@ -4603,13 +4612,13 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; - "circular-json-0.5.4" = { + "circular-json-0.5.5" = { name = "circular-json"; packageName = "circular-json"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.4.tgz"; - sha512 = "vnJA8KS0BfOihugYEUkLRcnmq21FbuivbxgzDLXNs3zIk4KllV4Mx4UuTzBXht9F00C7QfD1YqMXg1zP6EXpig=="; + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.5.tgz"; + sha512 = "13YaR6kiz0kBNmIVM87Io8Hp7bWOo4r61vkEANy8iH9R9bc6avud/1FT0SBpqR1RpIQADOh/Q+yHZDA1iL6ysA=="; }; }; "clarinet-0.11.0" = { @@ -6224,13 +6233,13 @@ let sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; }; }; - "cordova-common-2.2.4" = { + "cordova-common-2.2.5" = { name = "cordova-common"; packageName = "cordova-common"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.4.tgz"; - sha512 = "tL6cfygm2EUU658Id4ROs/BFETvxFKX1gj8rxoXOWR1xxzPtXfgvjiqmMBsUIbBgIZomsq09Xj48qkU7xHBJ1Q=="; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.5.tgz"; + sha1 = "f93cef2ad494cfcbf56c46e3d612aaa9cb5fcc32"; }; }; "cordova-create-1.1.2" = { @@ -6368,13 +6377,13 @@ let sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; - "crc-3.5.0" = { + "crc-3.7.0" = { name = "crc"; packageName = "crc"; - version = "3.5.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz"; - sha1 = "98b8ba7d489665ba3979f59b21381374101a1964"; + url = "https://registry.npmjs.org/crc/-/crc-3.7.0.tgz"; + sha512 = "ZwmUex488OBjSVOMxnR/dIa1yxisBMJNEi+UxzXpKhax8MPsQtoRQtl5Qgo+W7pcSVkRXa3BEVjaniaWKtvKvw=="; }; }; "crc32-stream-2.0.0" = { @@ -6701,13 +6710,13 @@ let sha512 = "vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg=="; }; }; - "cssom-0.3.3" = { + "cssom-0.3.4" = { name = "cssom"; packageName = "cssom"; - version = "0.3.3"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.3.tgz"; - sha512 = "pjE/I/NSp3iyeoxXN5QaoJpgzYUMj2dJHx9OSufoTliJLDx+kuOQaMCJW8OwvrKJswhXUHnHN6eUmUSETN0msg=="; + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz"; + sha512 = "+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog=="; }; }; "cssstyle-0.2.37" = { @@ -6908,13 +6917,13 @@ let sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA=="; }; }; - "dat-doctor-1.4.0" = { + "dat-doctor-2.0.0" = { name = "dat-doctor"; packageName = "dat-doctor"; - version = "1.4.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz"; - sha512 = "1A3npklzv62UErw/rBaSkKDiiYnPNl7yNOtg1QeuJ1AtOEnyfH1iY9QiaVqPj6mFF2CIT4/pCSapueQFX7Cn/Q=="; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-2.0.0.tgz"; + sha512 = "plNNUnBklePVTE5xsQA8gdYZKveT+2VnZ7Us/zY2kw+JF0mLAK+zVl0jEtl7px3jvEEQD+seVMs42uOg59dmAg=="; }; }; "dat-encoding-4.0.2" = { @@ -6962,22 +6971,22 @@ let sha512 = "cu6Fwapm34myc5um6jdQBrtDkjx28oVkOVHbaV4YNLdxrRqUm+FlWuIqFk7zaCZDoZg5TMlCG1SF0j3AFbiOYA=="; }; }; - "dat-log-1.1.1" = { + "dat-log-1.2.0" = { name = "dat-log"; packageName = "dat-log"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-log/-/dat-log-1.1.1.tgz"; - sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; + url = "https://registry.npmjs.org/dat-log/-/dat-log-1.2.0.tgz"; + sha512 = "oK6R74WV8TdhGR9VCLym7D/vlN8lXND5AyhJhrjtm1WNDrg/6Clx1Tk7k3Dt8quy2AmmGO7vbIk7iwFtzTAJfA=="; }; }; - "dat-node-3.5.9" = { + "dat-node-3.5.11" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.9"; + version = "3.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.9.tgz"; - sha512 = "JGZPtreK8YDFUG5JHBJSKIpSTAkqlRS0WlS6WnlJd6ap4GtQOdPYNvQyt/1AcL1ja4zM8GLnbOWGj37a6ExKQA=="; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.11.tgz"; + sha512 = "8vDc4XwOtOdZgtw/YSb5k/8KIu0+jByaZCsWv5gY5RbrnCouh0Qa7CvIWezZyl0FFke5LIvHuzme2iRiEYIdOw=="; }; }; "dat-registry-4.0.0" = { @@ -7763,6 +7772,15 @@ let sha1 = "b5e30361a6db023176d562892db85940a718f47e"; }; }; + "diffy-2.0.0" = { + name = "diffy"; + packageName = "diffy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diffy/-/diffy-2.0.0.tgz"; + sha512 = "T1+MF7chaOtNaBeV59td6lYlci6dCTUraySH8LDltafhd+FLTsYpJJbLVpl6S4ih6kPFMaHSIqQ92bRVvoE+3Q=="; + }; + }; "dir-glob-2.0.0" = { name = "dir-glob"; packageName = "dir-glob"; @@ -7799,22 +7817,13 @@ let sha512 = "EEmZQFE0PiOsJj7G3KVCwFGbYs4QchUvzA91iHtZ6HfkIqfBEDSTGLygJrUlY1Tr77WDV+qZVrZuNghHxSL/vw=="; }; }; - "discovery-swarm-4.4.2" = { + "discovery-swarm-5.1.2" = { name = "discovery-swarm"; packageName = "discovery-swarm"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-4.4.2.tgz"; - sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; - }; - }; - "discovery-swarm-5.1.1" = { - name = "discovery-swarm"; - packageName = "discovery-swarm"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.1.tgz"; - sha512 = "r38993qP/fcuAlNLSOwGZUps1inzNA4wXkIkv/piwFDseyIWNjYyk/4DHGxyf/bWMB86gPWIUdA6AhydkWmgdA=="; + url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.2.tgz"; + sha512 = "aqNdl4l76PFb301I1hXkHZSakQTOXR0yRbfDtF7XrZKk+9V5gMQBbQ2xPgnQPfDVG0IeErxkQkoWqp4f9EJe5w=="; }; }; "dispensary-0.18.0" = { @@ -7853,15 +7862,6 @@ let sha512 = "bvjUS5Cylrm1uJJop/dFhEpnYtz2NQFOO0/z6vk0ORtx0AqKvUwPToc4reJk+TnHV9GBxbtZXj7ad5dJT/Dqkg=="; }; }; - "dns-discovery-5.6.1" = { - name = "dns-discovery"; - packageName = "dns-discovery"; - version = "5.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz"; - sha512 = "r27fv3lDuZXCqmb5b04tV2aDxVbwVJaSyPzwPlOYCUbk9F7JvsY+n7EBfY2Z952bGx5TZt3SLQ+ELFjfqyLVoA=="; - }; - }; "dns-discovery-6.1.0" = { name = "dns-discovery"; packageName = "dns-discovery"; @@ -7907,15 +7907,6 @@ let sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw=="; }; }; - "dns-socket-1.6.3" = { - name = "dns-socket"; - packageName = "dns-socket"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz"; - sha512 = "/mUy3VGqIP69dAZjh2xxHXcpK9wk2Len1Dxz8mWAdrIgFC8tnR/aQAyU4a+UTXzOcTvEvGBdp1zFiwnpWKaXng=="; - }; - }; "dns-socket-3.0.0" = { name = "dns-socket"; packageName = "dns-socket"; @@ -8024,13 +8015,13 @@ let sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; }; - "dom4-2.1.0" = { + "dom4-2.1.3" = { name = "dom4"; packageName = "dom4"; - version = "2.1.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/dom4/-/dom4-2.1.0.tgz"; - sha512 = "18oT+LfQaOT46/HmdB+t8A3+ROaN/sY/P0C9i0PyasmeuDq+iThh09gpI8rmt2ZA5B6KuHpuW2qURAZMjNs+gg=="; + url = "https://registry.npmjs.org/dom4/-/dom4-2.1.3.tgz"; + sha512 = "begvh4z5GV0kyxx+YgJZ7sIo/jsELx/v7MQxoLZpOvT5yFo18X8dfgtUmKAwdGuyMeugncylarLHlO4gIK6YNw=="; }; }; "domain-browser-1.1.7" = { @@ -8303,13 +8294,13 @@ let sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; }; }; - "ecstatic-3.2.0" = { + "ecstatic-3.2.1" = { name = "ecstatic"; packageName = "ecstatic"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.0.tgz"; - sha512 = "Goilx/2cfU9vvfQjgtNgc2VmJAD8CasQ6rZDqCd2u4Hsyd/qFET6nBf60jiHodevR3nl3IGzNKtrzPXWP88utQ=="; + url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.1.tgz"; + sha512 = "BAdHx9LOCG1fwxY8MIydUBskl8UUQrYeC3WE14FA1DPlBzqoG1aOgEkypcSpmiiel8RAj8gW1s40RrclfrpGUg=="; }; }; "editions-1.3.4" = { @@ -8952,13 +8943,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escodegen-1.10.0" = { + "escodegen-1.11.0" = { name = "escodegen"; packageName = "escodegen"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz"; - sha512 = "fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g=="; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz"; + sha512 = "IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw=="; }; }; "escodegen-1.8.1" = { @@ -8997,13 +8988,13 @@ let sha512 = "bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ=="; }; }; - "eslint-5.0.1" = { + "eslint-5.1.0" = { name = "eslint"; packageName = "eslint"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; - sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.1.0.tgz"; + sha512 = "DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -9015,13 +9006,13 @@ let sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; }; }; - "eslint-scope-3.7.1" = { + "eslint-scope-3.7.3" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "3.7.1"; + version = "3.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz"; + sha512 = "W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA=="; }; }; "eslint-scope-4.0.0" = { @@ -9033,6 +9024,15 @@ let sha512 = "1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA=="; }; }; + "eslint-utils-1.3.1" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz"; + sha512 = "Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q=="; + }; + }; "eslint-visitor-keys-1.0.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -9087,13 +9087,13 @@ let sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; }; }; - "esprima-4.0.0" = { + "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "esprima-fb-13001.1001.0-dev-harmony-fb" = { @@ -10446,13 +10446,13 @@ let sha512 = "uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg=="; }; }; - "follow-redirects-1.5.0" = { + "follow-redirects-1.5.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz"; - sha512 = "fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.1.tgz"; + sha512 = "v9GI1hpaqq1ZZR6pBD1+kI7O24PhDvNGNodjS3MdcEqyrahCp8zbtpv+2B/krUnSmUH80lbAS7MrdeK5IylgKg=="; }; }; "for-each-0.3.3" = { @@ -11076,13 +11076,13 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "get-caller-file-1.0.2" = { + "get-caller-file-1.0.3" = { name = "get-caller-file"; packageName = "get-caller-file"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; - sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; }; "get-func-name-2.0.0" = { @@ -11527,13 +11527,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "global-tunnel-ng-2.1.1" = { + "global-tunnel-ng-2.4.0" = { name = "global-tunnel-ng"; packageName = "global-tunnel-ng"; - version = "2.1.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.1.1.tgz"; - sha1 = "dab824432260b6dcb70d173b78288e2fa6e0b880"; + url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.4.0.tgz"; + sha1 = "97a1847150e7f22ed30771a35aaa4922327a7957"; }; }; "globals-11.7.0" = { @@ -11635,13 +11635,13 @@ let sha512 = "Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw=="; }; }; - "got-8.3.1" = { + "got-8.3.2" = { name = "got"; packageName = "got"; - version = "8.3.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.1.tgz"; - sha512 = "tiLX+bnYm5A56T5N/n9Xo89vMaO1mrS9qoDqj3u/anVooqGozvY/HbXzEpDfbNeKsHCBpK40gSbz8wGYSp3i1w=="; + url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; + sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; }; }; "graceful-fs-1.2.3" = { @@ -12130,13 +12130,13 @@ let sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; }; }; - "hash.js-1.1.4" = { + "hash.js-1.1.5" = { name = "hash.js"; packageName = "hash.js"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz"; - sha512 = "A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw=="; + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz"; + sha512 = "eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA=="; }; }; "hasha-2.2.0" = { @@ -12337,13 +12337,13 @@ let sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; }; }; - "hosted-git-info-2.6.1" = { + "hosted-git-info-2.7.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.6.1"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz"; - sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; + sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="; }; }; "hot-shots-4.8.0" = { @@ -12670,13 +12670,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.17.1" = { + "hypercore-6.17.3" = { name = "hypercore"; packageName = "hypercore"; - version = "6.17.1"; + version = "6.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.1.tgz"; - sha512 = "fwBwdx3oaUsaKIRI3e1M78GikrH4EmS/lpbOmRlTnELdYUTIHAAt4qg8YtSbB8PtwiPujT9DjSU+VMj8jAQArQ=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.3.tgz"; + sha512 = "BJwZ4bRV3tYG3R+iE3ydW3GWpZrPLbi86I75qUg9bQ5jMWgwdh+llKgYFvSJhJtoT/MVxrcuXFDkuHiJ0GYMvw=="; }; }; "hypercore-crypto-1.0.0" = { @@ -12706,13 +12706,13 @@ let sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww=="; }; }; - "hyperdrive-http-4.2.2" = { + "hyperdrive-http-4.3.2" = { name = "hyperdrive-http"; packageName = "hyperdrive-http"; - version = "4.2.2"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz"; - sha512 = "NgfZGxfQoYIEIuYat+dki/GAWpjmM/X+5YL5faTrX3VgXdGObVOhKEHQISk855T8C+R4aPP8QpF1YR8adUVBNw=="; + url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.3.2.tgz"; + sha512 = "dVEtiPiaoR0BNtO8SBvBqRJQMVMV1zzXLIWBBGjVefhISfybfyOBuGi7xzhGnHj+4oK7E8Wwt2Bo5W/J5ecpIg=="; }; }; "hyperdrive-network-speed-2.1.0" = { @@ -13291,13 +13291,13 @@ let sha1 = "e3fa357b773da619f26e95f049d055c72796f86b"; }; }; - "ipaddr.js-1.7.0" = { + "ipaddr.js-1.8.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.7.0.tgz"; - sha1 = "2206ed334afc32e01fed3ee838b6b2521068b9d2"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz"; + sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"; }; }; "irc-replies-2.0.1" = { @@ -13444,13 +13444,13 @@ let sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; }; }; - "is-callable-1.1.3" = { + "is-callable-1.1.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; - sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; }; }; "is-ci-1.1.0" = { @@ -14245,13 +14245,13 @@ let sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; }; }; - "jaeger-client-3.10.0" = { + "jaeger-client-3.11.0" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.10.0.tgz"; - sha1 = "ad0e830ead7aabad2601a52a7e463f0d942b0091"; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.11.0.tgz"; + sha1 = "4b38b820dd2a8fe355a81f4d84d85bc463c95d20"; }; }; "jed-1.1.1" = { @@ -14344,6 +14344,15 @@ let sha1 = "9866df395102130e38f7f996bceb65443209c25b"; }; }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; "js-yaml-0.3.7" = { name = "js-yaml"; packageName = "js-yaml"; @@ -15227,15 +15236,6 @@ let sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42"; }; }; - "leb-0.3.0" = { - name = "leb"; - packageName = "leb"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leb/-/leb-0.3.0.tgz"; - sha1 = "32bee9fad168328d6aea8522d833f4180eed1da3"; - }; - }; "leek-0.0.24" = { name = "leek"; packageName = "leek"; @@ -15299,13 +15299,13 @@ let sha512 = "PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew=="; }; }; - "level-sublevel-6.6.2" = { + "level-sublevel-6.6.5" = { name = "level-sublevel"; packageName = "level-sublevel"; - version = "6.6.2"; + version = "6.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.2.tgz"; - sha512 = "+hptqmFYPKFju9QG4F6scvx3ZXkhrSmmhYui+hPzRn/jiC3DJ6VNZRKsIhGMpeajVBWfRV7XiysUThrJ/7PgXQ=="; + url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.5.tgz"; + sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA=="; }; }; "leveldown-0.10.6" = { @@ -16289,13 +16289,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-2.10.0" = { + "log4js-2.11.0" = { name = "log4js"; packageName = "log4js"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-2.10.0.tgz"; - sha512 = "NnhN9PjFF9zhxinAjlmDYvkqqrIW+yA3LLJAoTJ3fs6d1zru86OqQHfsxiUcc1kRq3z+faGR4DeyXUfiNbVxKQ=="; + url = "https://registry.npmjs.org/log4js/-/log4js-2.11.0.tgz"; + sha512 = "z1XdwyGFg8/WGkOyF6DPJjivCWNLKrklGdViywdYnSKOvgtEBo2UyEMZS5sD2mZrQlU3TvO8wDWLc8mzE1ncBQ=="; }; }; "loggly-1.1.1" = { @@ -16334,6 +16334,15 @@ let sha1 = "d821b7138ca1cb581c172990ef14db200b5c474b"; }; }; + "long-4.0.0" = { + name = "long"; + packageName = "long"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz"; + sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; + }; + }; "longest-1.0.1" = { name = "longest"; packageName = "longest"; @@ -16379,13 +16388,13 @@ let sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; }; }; - "loose-envify-1.3.1" = { + "loose-envify-1.4.0" = { name = "loose-envify"; packageName = "loose-envify"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; - sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; }; "lossless-json-1.0.2" = { @@ -16982,6 +16991,15 @@ let sha1 = "1fb5fb5f0b2edf1add184917e918f094a9ff3465"; }; }; + "menu-string-1.2.0" = { + name = "menu-string"; + packageName = "menu-string"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/menu-string/-/menu-string-1.2.0.tgz"; + sha512 = "b6RTFmSlLjs20Qninl0Wq6dOstjpaPM2pQ63li06pLVTGIIoxjuMRbOmYbGW8l73/AiGNoCK9yXfdfIpLIURPQ=="; + }; + }; "meow-3.7.0" = { name = "meow"; packageName = "meow"; @@ -17234,13 +17252,13 @@ let sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; }; }; - "mime-db-1.34.0" = { + "mime-db-1.35.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.34.0"; + version = "1.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.34.0.tgz"; - sha1 = "452d0ecff5c30346a6dc1e64b1eaee0d3719ff9a"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz"; + sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="; }; }; "mime-types-2.0.14" = { @@ -17279,13 +17297,13 @@ let sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; }; - "mimic-response-1.0.0" = { + "mimic-response-1.0.1" = { name = "mimic-response"; packageName = "mimic-response"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; - sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; }; "min-document-2.19.0" = { @@ -18170,22 +18188,22 @@ let sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; }; }; - "nanobus-3.3.0" = { + "nanobus-4.3.3" = { name = "nanobus"; packageName = "nanobus"; - version = "3.3.0"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/nanobus/-/nanobus-3.3.0.tgz"; - sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; + url = "https://registry.npmjs.org/nanobus/-/nanobus-4.3.3.tgz"; + sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw=="; }; }; - "nanoid-1.0.4" = { + "nanoid-1.1.0" = { name = "nanoid"; packageName = "nanoid"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.4.tgz"; - sha512 = "zWPAK2WibMbVda1DvhYbahj7DAXLMvSI4Ik7553nPyJ2p8I5qJr4/j/6kgHJalrOx4FRbbme2Oa6utdzr6I/tA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.1.0.tgz"; + sha512 = "iOCqgXieGrk8/wDt1n9rZS2KB1dYVssemY0NTWjfzVr+1t1gAmdTp1u2+YHppKro3Bk5S+Gs+xmYCfpuXauYXQ=="; }; }; "nanolru-1.0.0" = { @@ -18206,13 +18224,22 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; - "nanotiming-1.0.1" = { + "nanoscheduler-1.0.3" = { + name = "nanoscheduler"; + packageName = "nanoscheduler"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoscheduler/-/nanoscheduler-1.0.3.tgz"; + sha512 = "jBbrF3qdU9321r8n9X7yu18DjP31Do2ItJm3mWrt90wJTrnDO+HXpoV7ftaUglAtjgj9s+OaCxGufbvx6pvbEQ=="; + }; + }; + "nanotiming-7.3.1" = { name = "nanotiming"; packageName = "nanotiming"; - version = "1.0.1"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanotiming/-/nanotiming-1.0.1.tgz"; - sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3"; + url = "https://registry.npmjs.org/nanotiming/-/nanotiming-7.3.1.tgz"; + sha512 = "l3lC7v/PfOuRWQa8vV29Jo6TG10wHtnthLElFXs4Te4Aas57Fo4n1Q8LH9n+NDh9riOzTVvb2QNBhTS4JUKNjw=="; }; }; "native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = { @@ -18363,13 +18390,40 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "neat-log-1.1.2" = { + "neat-input-1.7.0" = { + name = "neat-input"; + packageName = "neat-input"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-input/-/neat-input-1.7.0.tgz"; + sha512 = "oPAF9Js5IVPL6eYxn4vE4mwSuqEKTODnlcWHyv7/BW5RXaRs7QOmjp2eOp2KQ/vLuo3UoEsFcezrfHwSrec+2g=="; + }; + }; + "neat-log-2.4.0" = { name = "neat-log"; packageName = "neat-log"; - version = "1.1.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz"; - sha512 = "LUk9cZY/FakJlQ7OcZaHakNV0AzBwfx9iqU4hwYx7NhVYBjZBeykmcHJD5y+cfVWpyaHdjIYnb+gKTVkS+DlSg=="; + url = "https://registry.npmjs.org/neat-log/-/neat-log-2.4.0.tgz"; + sha512 = "5Gb0J17bqRxKBfgetrYCZav7kpFgunDhFq0i+kEq5Kn36Cuw4IskIl3yd+/P8jCcAzaKrQ7mrb+p6r/NP5esWA=="; + }; + }; + "neat-spinner-1.0.0" = { + name = "neat-spinner"; + packageName = "neat-spinner"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-spinner/-/neat-spinner-1.0.0.tgz"; + sha512 = "+T6UtYItDTE1L30g/nLRjP55dFlvldrzCRsn4CrcNHIbhg5JUe0hnOx1DHFViysUC7I1cevBQVjdGJ9ZftY9DA=="; + }; + }; + "neat-tasks-1.1.1" = { + name = "neat-tasks"; + packageName = "neat-tasks"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-tasks/-/neat-tasks-1.1.1.tgz"; + sha512 = "U8HkIv90/lrdNlHVp63PoF3FeuQUvJ6toMX6InqRqpBmQq9iukZRAnq/yCE4Ii6WHZRYa6DEiTH/EGFTZ0rIGg=="; }; }; "needle-0.10.0" = { @@ -20886,13 +20940,13 @@ let sha1 = "a32b907f28d17f61b74d45d46fd89dea3c4e88b5"; }; }; - "please-upgrade-node-3.0.2" = { + "please-upgrade-node-3.1.1" = { name = "please-upgrade-node"; packageName = "please-upgrade-node"; - version = "3.0.2"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.2.tgz"; - sha512 = "bslfSeW+ksUbB/sYZeEdKFyTG4YWU9YKRvqfSRvZKE675khAuBUPqV5RUwJZaGuWmVQLweK45Q+lPHFVnSlSug=="; + url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz"; + sha512 = "KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ=="; }; }; "plist-1.2.0" = { @@ -20913,6 +20967,15 @@ let sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; }; }; + "plist-2.1.0" = { + name = "plist"; + packageName = "plist"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz"; + sha1 = "57ccdb7a0821df21831217a3cad54e3e146a1025"; + }; + }; "plist-3.0.1" = { name = "plist"; packageName = "plist"; @@ -21471,13 +21534,13 @@ let sha512 = "jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ=="; }; }; - "proxy-agent-3.0.0" = { + "proxy-agent-3.0.1" = { name = "proxy-agent"; packageName = "proxy-agent"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz"; - sha512 = "g6n6vnk8fRf705ShN+FEXFG/SDJaW++lSs0d9KaJh4uBWW/wi7en4Cpo5VYQW3SZzAE121lhB/KLQrbURoubZw=="; + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.1.tgz"; + sha512 = "mAZexaz9ZxQhYPWfAjzlrloEjW+JHiBFryE4AJXFDTnaXfmH/FKqC1swTRKuEPbHWz02flQNXFOyDUF7zfEG6A=="; }; }; "proxy-from-env-1.0.0" = { @@ -22083,15 +22146,6 @@ let sha512 = "nb4fClpzoUY+v1SHrro+9yykN90eMA1rc+xM39tnZ5R3BgFY+J/NxPZ0KuUpishEsvnwou9Fvm2wa3cjeuG7vg=="; }; }; - "random-access-memory-2.4.0" = { - name = "random-access-memory"; - packageName = "random-access-memory"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz"; - sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; - }; - }; "random-access-memory-3.0.0" = { name = "random-access-memory"; packageName = "random-access-memory"; @@ -22767,6 +22821,15 @@ let sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"; }; }; + "remove-array-items-1.0.0" = { + name = "remove-array-items"; + packageName = "remove-array-items"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-array-items/-/remove-array-items-1.0.0.tgz"; + sha1 = "07bf42cb332f4cf6e85ead83b5e4e896d2326b21"; + }; + }; "remove-bom-buffer-3.0.0" = { name = "remove-bom-buffer"; packageName = "remove-bom-buffer"; @@ -23316,13 +23379,13 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; - "router-1.3.2" = { + "router-1.3.3" = { name = "router"; packageName = "router"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.3.2.tgz"; - sha1 = "bfaa16888a5283d5ee40d999da7a9fa15296a60c"; + url = "https://registry.npmjs.org/router/-/router-1.3.3.tgz"; + sha1 = "c142f6b5ea4d6b3359022ca95b6580bd217f89cf"; }; }; "rsvp-3.6.2" = { @@ -23451,13 +23514,13 @@ let sha512 = "3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA=="; }; }; - "rxjs-6.2.1" = { + "rxjs-6.2.2" = { name = "rxjs"; packageName = "rxjs"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz"; - sha512 = "OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz"; + sha512 = "0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ=="; }; }; "safe-buffer-5.0.1" = { @@ -23883,13 +23946,13 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; - "serve-handler-3.2.1" = { + "serve-handler-3.3.0" = { name = "serve-handler"; packageName = "serve-handler"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.2.1.tgz"; - sha512 = "4UYBO6zH61m5YUD54lJ1A8POOPmOOhBdNXJgy5/plzoOBcIluUJgmsayeI4af+QeUNPa5G5e609ycWTpJmKo2Q=="; + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.3.0.tgz"; + sha512 = "cJi7lLmrYEOLdz8sWCSNwrYJaxdhgWGQKFLPUXS4swpm/CXbQ5QRtuvIESSXQF4/iheYRNcQ+M6maH9UhTp0LA=="; }; }; "serve-index-1.7.3" = { @@ -24468,6 +24531,15 @@ let sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; }; }; + "smart-buffer-4.0.1" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.1.tgz"; + sha512 = "RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg=="; + }; + }; "smartdc-auth-2.3.1" = { name = "smartdc-auth"; packageName = "smartdc-auth"; @@ -24558,13 +24630,13 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.88.0" = { + "snyk-1.88.2" = { name = "snyk"; packageName = "snyk"; - version = "1.88.0"; + version = "1.88.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.88.0.tgz"; - sha1 = "10d171427de94f6474d64fdc524d6f87c0ab069e"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.88.2.tgz"; + sha1 = "fff27ebbaa4f624398bd6d31b76c008912efd6b7"; }; }; "snyk-config-2.1.0" = { @@ -24882,6 +24954,15 @@ let sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691"; }; }; + "socks-2.2.1" = { + name = "socks"; + packageName = "socks"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-2.2.1.tgz"; + sha512 = "0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w=="; + }; + }; "socks-proxy-agent-3.0.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -24891,6 +24972,15 @@ let sha512 = "ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA=="; }; }; + "socks-proxy-agent-4.0.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz"; + sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw=="; + }; + }; "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -25431,15 +25521,6 @@ let sha1 = "cbd243953cc42effd548b5d22388ed689ec639bd"; }; }; - "status-logger-3.1.1" = { - name = "status-logger"; - packageName = "status-logger"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz"; - sha512 = "dNYazf7T9aD9XMvvP/ZZTL8nzhS1piUfFq7HVDOHFdO2LBnPMqdkS5kaoXjK7gvH/0mT6ZcafuDTSSd7DIVYAA=="; - }; - }; "statuses-1.2.1" = { name = "statuses"; packageName = "statuses"; @@ -27241,15 +27322,6 @@ let sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334"; }; }; - "tunnel-0.0.4" = { - name = "tunnel"; - packageName = "tunnel"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz"; - sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213"; - }; - }; "tunnel-0.0.5" = { name = "tunnel"; packageName = "tunnel"; @@ -27511,13 +27583,13 @@ let sha512 = "hobogryjDV36VrLK3Y69ou4REyrTApzUblVFmdQOYRe8cYaSmFJXMb4dR9McdvYDSbeNdzUgYr2YVukJaErJcA=="; }; }; - "uglify-js-3.4.2" = { + "uglify-js-3.4.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.2"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; - sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.4.tgz"; + sha512 = "RiB1kNcC9RMyqwRrjXC+EjgLoXULoDnCaOnEDzUCHkBN0bHwmtF5rzDMiDWU29gu0kXCRRWwtcTAVFWRECmU2Q=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -28195,13 +28267,13 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "use-3.1.0" = { + "use-3.1.1" = { name = "use"; packageName = "use"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; - sha512 = "6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw=="; + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; "user-home-1.1.1" = { @@ -28366,13 +28438,13 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; - "utp-native-1.7.1" = { + "utp-native-1.7.2" = { name = "utp-native"; packageName = "utp-native"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz"; - sha512 = "FSs76hQZsSsdI4YeePxb5SQoWmHxDRznImGiAN905O1svyHvcoQ3hYptu3Y9hPxRHeB3lHzJR5KRZy0Byj7qqg=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.2.tgz"; + sha512 = "jxNZIa49OXRCFbbqlp0SWsTCasvD9QjumUW85++KMaT21PKMDn6dLl2GsSsf1OsWRI8yKdzXg1OxhNsifPjyEA=="; }; }; "uue-3.1.2" = { @@ -28825,13 +28897,13 @@ let sha512 = "bxj9nRadNkXYfVG/fjA5a+KA5WaJCeP1F2Tnj3rYFS0pKALZQCPNqk3KO/LdiGFidjyICMG7xoHvYO9J9xosXg=="; }; }; - "vscode-languageserver-4.2.1" = { + "vscode-languageserver-4.3.0" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.2.1.tgz"; - sha512 = "5WAxaK1nEpe52ZaWNMqmd6rO5CIE72J/7UkGKPUTdGa0l0haWHS69tpRz+LetBlgTpP7PYacl4xhDaLZv82a+g=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.3.0.tgz"; + sha512 = "4dTpnyTB6Q0HmMhxaG60rrpQthbTBlMtFX5cwJpPxcPzLZIFDWB3msR6TxGCzWpdYF11REIJihWByobpGkljdQ=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -28843,22 +28915,22 @@ let sha512 = "PN5hVQQQxrtHSZR8UCstqaoI9f2H9JctFTtdIpONWjzQNurWrc48qSXXU/vTfnbSrNou8qrJgkZ4QEZsyozOMA=="; }; }; - "vscode-languageserver-protocol-3.8.1" = { + "vscode-languageserver-protocol-3.9.0" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.8.1"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.8.1.tgz"; - sha512 = "KdeetvQ2JavRiuE9afNrV5+xJZocj7NGPQwH4kpSFw5cp+0wijv87qgXfSEvmwPUaknhMBoSuSrSIG/LRrzWJQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.9.0.tgz"; + sha512 = "i1sG5iU88Mocc7egTeh6dAow/yRWpPK5PLJaxsWsKiA+dspq1Yzr/R1bNLPc+6P/ab010lXhzdUHQY0CuIUyDw=="; }; }; - "vscode-languageserver-types-3.8.2" = { + "vscode-languageserver-types-3.9.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.8.2.tgz"; - sha512 = "2RMkyt1O1czGPCnkjKZWSio2D8oh3XlQ4zi4W2xL8q2Dvi4hB3/DEt+wYyzo4hmE2ZFP0RB8PXyzHyed7p1hbw=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.9.0.tgz"; + sha512 = "Qzh3VsU3t0zhKtYl1revyax+4gGHl2ejNzYXeiZYQMF3i0vX4dtPohxGDFoZYfGFQI738aXYbSUQmhLeBckDlQ=="; }; }; "vscode-uri-1.0.3" = { @@ -28879,13 +28951,13 @@ let sha1 = "3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"; }; }; - "walk-2.3.13" = { + "walk-2.3.14" = { name = "walk"; packageName = "walk"; - version = "2.3.13"; + version = "2.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/walk/-/walk-2.3.13.tgz"; - sha512 = "78SMe7To9U7kqVhSoGho3GfspA089ZDBIj2f8jElg2hi6lUCoagtDJ8sSMFNlpAh5Ib8Jt1gQ6Y7gh9mzHtFng=="; + url = "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz"; + sha512 = "5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg=="; }; }; "walk-sync-0.3.2" = { @@ -29473,13 +29545,13 @@ let sha512 = "ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA=="; }; }; - "ws-5.2.1" = { + "ws-5.2.2" = { name = "ws"; packageName = "ws"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.1.tgz"; - sha512 = "2NkHdPKjDBj3CHdnAGNpmlliryKqF+n9MYXX7/wsVC4yqYocKreKNjydPDvT3wShAZnndlM0RytEfTALCDvz7A=="; + url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; + sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; "wtf-8-1.0.0" = { @@ -29599,15 +29671,6 @@ let sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; }; }; - "xml2js-0.4.17" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.4.17"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz"; - sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; - }; - }; "xml2js-0.4.19" = { name = "xml2js"; packageName = "xml2js"; @@ -29653,15 +29716,6 @@ let sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; - "xmlbuilder-4.2.1" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz"; - sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; - }; - }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -30023,6 +30077,15 @@ let sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; }; }; + "yauzl-2.10.0" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + }; "yauzl-2.4.1" = { name = "yauzl"; packageName = "yauzl"; @@ -30041,15 +30104,6 @@ let sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; }; }; - "yauzl-2.9.2" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"; - }; - }; "yeast-0.1.2" = { name = "yeast"; packageName = "yeast"; @@ -30068,13 +30122,13 @@ let sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7"; }; }; - "yeoman-doctor-3.0.1" = { + "yeoman-doctor-3.0.2" = { name = "yeoman-doctor"; packageName = "yeoman-doctor"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-3.0.1.tgz"; - sha512 = "ccV0Yf7nL9dTCIY+H+7gp/qtRegf8C6CGcUIr95FEc+UBR1Y17CxPvrvH72FQ4zmDv0VM/egiMavamtVIkhEgw=="; + url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-3.0.2.tgz"; + sha512 = "/KbouQdKgnqxG6K3Tc8VBPAQLPbruQ7KkbinwR+ah507oOFobHnGs8kqj8oMfafY6rXInHdh7nC5YzicCR4Z0g=="; }; }; "yeoman-environment-2.3.0" = { @@ -30239,7 +30293,7 @@ in sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" sources."lodash-4.17.10" - sources."loose-envify-1.3.1" + sources."loose-envify-1.4.0" sources."matcher-collection-1.0.5" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -30413,7 +30467,7 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ - sources."@types/node-8.10.20" + sources."@types/node-8.10.21" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -30429,7 +30483,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."azure-arm-authorization-2.0.0" - sources."azure-arm-batch-3.1.0" + sources."azure-arm-batch-3.1.1" sources."azure-arm-cdn-4.0.1" sources."azure-arm-commerce-2.0.0" sources."azure-arm-compute-3.0.0-preview" @@ -30880,7 +30934,7 @@ in sources."get-stdin-4.0.1" sources."glob-6.0.4" sources."graceful-fs-3.0.11" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -30909,7 +30963,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -31011,7 +31065,7 @@ in }) sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.1" + sources."browserify-des-1.0.2" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" @@ -31053,7 +31107,7 @@ in sources."glob-7.1.2" sources."has-1.0.3" sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.5" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" @@ -31272,7 +31326,7 @@ in sources."hat-0.0.3" sources."hawk-0.10.2" sources."hoek-0.7.6" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."immediate-chunk-store-1.0.8" sources."indent-string-2.1.0" sources."inflight-1.0.6" @@ -31282,7 +31336,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.7.0" + sources."ipaddr.js-1.8.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -31315,7 +31369,7 @@ in ]; }) sources."mime-1.6.0" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.3.5" @@ -31580,7 +31634,7 @@ in sources."commander-2.16.0" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.5.0" + sources."follow-redirects-1.5.1" sources."has-flag-3.0.0" sources."humanize-plus-1.8.2" sources."is-buffer-1.1.6" @@ -31679,7 +31733,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.0" + sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.32" sources."block-stream-0.0.9" @@ -31703,7 +31757,7 @@ in }) sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.1" + sources."browserify-des-1.0.2" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-transform-tools-1.7.0" @@ -31727,7 +31781,7 @@ in sources."commander-2.16.0" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) (sources."compression-1.7.2" // { @@ -31752,7 +31806,7 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."cordova-app-hello-world-3.12.0" - sources."cordova-common-2.2.4" + sources."cordova-common-2.2.5" (sources."cordova-create-1.1.2" // { dependencies = [ sources."q-1.0.1" @@ -31775,7 +31829,6 @@ in sources."q-1.0.1" sources."shelljs-0.3.0" sources."underscore-1.8.3" - sources."xmlbuilder-8.2.2" ]; }) sources."cordova-registry-mapper-1.1.15" @@ -31867,11 +31920,11 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.5" sources."hawk-3.1.3" sources."hmac-drbg-1.0.1" sources."hoek-2.16.3" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."htmlescape-1.1.1" sources."http-errors-1.6.3" sources."http-signature-1.1.1" @@ -32003,7 +32056,7 @@ in sources."pegjs-0.10.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."plist-3.0.1" + sources."plist-2.1.0" sources."prepend-http-1.0.4" sources."process-0.11.10" sources."process-nextick-args-1.0.7" @@ -32087,7 +32140,6 @@ in dependencies = [ sources."base64-js-1.1.2" sources."plist-2.0.1" - sources."xmlbuilder-8.2.2" ]; }) sources."slash-1.0.0" @@ -32173,7 +32225,7 @@ in ]; }) sources."xdg-basedir-2.0.0" - sources."xmlbuilder-9.0.7" + sources."xmlbuilder-8.2.2" sources."xmldom-0.1.27" sources."xtend-4.0.1" ]; @@ -32350,20 +32402,18 @@ in dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; - version = "13.10.0"; + version = "13.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz"; - sha512 = "H8H6erdvvLjwI6bYu4mgEz5KCaHNmwwzKvBvv+bhX93VEf1J3v0L/6T9IQPCico/veFxNcUSqaDAV9FuZguhCw=="; + url = "https://registry.npmjs.org/dat/-/dat-13.11.3.tgz"; + sha512 = "YOp0II25xNPlD06/RGB5q1x244em2Sh2FdhWECnikZalmOBaujeRRJFfjbd0f5buQfapmebvTT4FVRZTZLB2HQ=="; }; dependencies = [ sources."abstract-random-access-1.1.2" sources."ajv-5.5.2" - (sources."ansi-diff-stream-1.2.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."ansi-align-2.0.0" + sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" + sources."ansi-split-1.0.1" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."ap-0.1.0" @@ -32396,6 +32446,7 @@ in sources."blake2b-2.1.2" sources."blake2b-wasm-1.1.7" sources."body-0.1.0" + sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."buffer-alloc-1.2.0" @@ -32403,13 +32454,17 @@ in sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.0" - sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."chalk-2.4.1" + sources."ci-info-1.1.3" sources."circular-append-file-1.0.1" + sources."cli-boxes-1.0.0" + sources."cli-spinners-1.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" @@ -32420,10 +32475,14 @@ in sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" + sources."configstore-3.1.2" sources."connections-1.4.2" sources."content-types-0.1.0" sources."core-util-is-1.0.2" sources."corsify-2.1.0" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" (sources."dat-dns-3.0.1" // { @@ -32431,12 +32490,7 @@ in sources."debug-2.6.9" ]; }) - (sources."dat-doctor-1.4.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."pump-1.0.3" - ]; - }) + sources."dat-doctor-2.0.0" sources."dat-encoding-5.0.1" sources."dat-ignore-2.1.1" (sources."dat-json-1.0.2" // { @@ -32445,58 +32499,41 @@ in ]; }) sources."dat-link-resolve-2.2.0" - sources."dat-log-1.1.1" - (sources."dat-node-3.5.9" // { - dependencies = [ - (sources."discovery-swarm-5.1.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."pump-1.0.3" - sources."random-access-memory-3.0.0" - ]; - }) + sources."dat-log-1.2.0" + sources."dat-node-3.5.11" sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.0.4" sources."dat-swarm-defaults-1.0.1" sources."debug-3.1.0" sources."deep-equal-0.2.2" + sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" + sources."diffy-2.0.0" sources."directory-index-html-2.1.0" (sources."discovery-channel-5.5.1" // { dependencies = [ sources."debug-2.6.9" - sources."dns-discovery-6.1.0" - sources."lru-2.0.1" - sources."pump-3.0.0" sources."thunky-0.1.0" ]; }) - (sources."discovery-swarm-4.4.2" // { + sources."discovery-swarm-5.1.2" + (sources."dns-discovery-6.1.0" // { dependencies = [ sources."debug-2.6.9" - sources."pump-1.0.3" - ]; - }) - (sources."dns-discovery-5.6.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."dns-packet-1.3.1" - sources."dns-socket-1.6.3" sources."lru-2.0.1" - sources."multicast-dns-6.2.3" ]; }) sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" - sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" + sources."dot-prop-4.2.0" + sources."duplexer3-0.1.4" sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" + sources."execa-0.7.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" sources."extend-3.0.1" @@ -32506,6 +32543,7 @@ in sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-read-stream-1.1.0" + sources."figures-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."flat-tree-1.6.0" @@ -32516,17 +32554,21 @@ in sources."form-data-2.3.2" sources."from2-2.3.0" sources."fs.realpath-1.0.0" + sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."global-4.3.2" + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.17.1" // { + (sources."hypercore-6.17.3" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -32539,20 +32581,19 @@ in ]; }) sources."hyperdrive-9.14.0" - (sources."hyperdrive-http-4.2.2" // { - dependencies = [ - sources."pump-1.0.3" - ]; - }) + sources."hyperdrive-http-4.3.2" sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."inspect-custom-symbol-1.1.0" sources."ip-1.1.5" sources."is-buffer-1.1.6" - sources."is-callable-1.1.3" + sources."is-callable-1.1.4" + sources."is-ci-1.1.0" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -32560,13 +32601,21 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-function-1.0.1" sources."is-glob-2.0.1" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" sources."is-number-2.1.0" + sources."is-obj-1.0.1" sources."is-options-1.0.1" + sources."is-path-inside-1.0.1" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" sources."is-string-1.0.4" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" + sources."isexe-2.0.0" sources."isobject-2.1.0" sources."isstream-0.1.2" sources."iterators-0.1.0" @@ -32586,17 +32635,22 @@ in sources."bencode-2.0.0" ]; }) + sources."keypress-0.2.1" sources."kind-of-3.2.2" sources."last-one-wins-1.0.4" + sources."latest-version-3.1.0" sources."length-prefixed-message-3.0.3" - sources."lodash.flattendeep-4.4.0" sources."lodash.throttle-4.1.1" + sources."lowercase-keys-1.0.1" sources."lru-3.1.0" + sources."lru-cache-4.1.3" + sources."make-dir-1.3.0" sources."math-random-1.0.1" sources."memory-pager-1.1.0" + sources."menu-string-1.2.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-2.3.11" - sources."mime-1.6.0" + sources."mime-2.3.1" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."min-document-2.19.0" @@ -32617,23 +32671,34 @@ in sources."mutexify-1.2.0" sources."nan-2.10.0" sources."nanoassert-1.1.0" - sources."nanobus-3.3.0" - sources."nanotiming-1.0.1" + sources."nanobus-4.3.3" + sources."nanoscheduler-1.0.3" + sources."nanotiming-7.3.1" sources."ncp-1.0.1" - sources."neat-log-1.1.2" + sources."neat-input-1.7.0" + sources."neat-log-2.4.0" + sources."neat-spinner-1.0.0" + sources."neat-tasks-1.1.1" sources."nets-3.2.0" sources."network-address-1.1.2" sources."node-gyp-build-3.4.0" sources."normalize-path-2.1.1" + sources."npm-run-path-2.0.2" sources."oauth-sign-0.8.2" sources."object.omit-2.0.1" sources."once-1.4.0" sources."os-homedir-1.0.2" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" sources."parse-glob-3.0.4" sources."parse-headers-2.0.1" sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" sources."performance-now-2.1.0" + sources."pify-3.0.0" sources."pkginfo-0.4.1" + sources."prepend-http-1.0.4" sources."preserve-0.2.0" sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" @@ -32646,15 +32711,12 @@ in sources."varint-5.0.0" ]; }) - sources."pump-2.0.1" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" sources."punycode-1.4.1" sources."qs-6.5.2" sources."random-access-file-2.0.1" - (sources."random-access-memory-2.4.0" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - ]; - }) + sources."random-access-memory-3.0.0" sources."random-access-storage-1.3.0" (sources."randomatic-3.0.0" // { dependencies = [ @@ -32664,10 +32726,14 @@ in }) sources."randombytes-2.0.6" sources."range-parser-1.2.0" + sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" sources."regex-cache-0.4.4" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."remove-array-items-1.0.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" @@ -32677,6 +32743,11 @@ in sources."rusha-0.8.13" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" (sources."signed-varint-2.0.1" // { dependencies = [ sources."varint-5.0.0" @@ -32694,7 +32765,6 @@ in sources."speedometer-1.1.0" sources."sshpk-1.14.2" sources."stack-trace-0.0.10" - sources."status-logger-3.1.1" sources."stream-collector-1.0.1" sources."stream-each-1.2.2" (sources."stream-parser-0.3.1" // { @@ -32706,15 +32776,18 @@ in sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" (sources."subcommand-2.1.0" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."supports-color-5.4.0" + sources."term-size-1.2.0" sources."throttle-1.0.3" - sources."through2-2.0.3" sources."thunky-1.0.2" + sources."timed-out-4.0.1" sources."to-buffer-1.1.1" (sources."toiletdb-1.4.1" // { dependencies = [ @@ -32729,16 +32802,22 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uint64be-2.0.2" + sources."unique-string-1.0.0" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" sources."untildify-3.0.3" + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.7.1" + sources."utp-native-1.7.2" sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" + sources."which-1.3.1" + sources."widest-line-2.0.0" (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" @@ -32746,11 +32825,13 @@ in sources."pkginfo-0.3.1" ]; }) - sources."wrap-ansi-3.0.1" sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."xhr-2.5.0" sources."xsalsa20-1.0.2" sources."xtend-4.0.1" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -32764,10 +32845,10 @@ in dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; - version = "0.2.15"; + version = "0.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.15.tgz"; - sha512 = "oIuRtSWj6UEU6zNEddKyE4P+fFrbZOMIaTWF8VS76hqzAln1myOtaG5zvTwF0UiD+bCmlJVFh8kcWf/kq7pksg=="; + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.16.tgz"; + sha512 = "OEqRYUN/9WskTRRvOJyP3mTPa0HQecfUk+c9YgH1MUkGSDdArnIvoJcUvALBlgrezZvqyO2weQwFSBfORAU8Pw=="; }; dependencies = [ sources."minimist-1.2.0" @@ -32978,7 +33059,7 @@ in sources."level-0.18.0" sources."level-packager-0.18.0" sources."level-post-1.0.7" - (sources."level-sublevel-6.6.2" // { + (sources."level-sublevel-6.6.5" // { dependencies = [ (sources."levelup-0.19.1" // { dependencies = [ @@ -33105,7 +33186,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.266.1" + sources."aws-sdk-2.275.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.3.0" @@ -33170,8 +33251,8 @@ in sources."uuid-3.1.0" sources."verror-1.10.0" sources."wordwrap-0.0.3" - sources."xml2js-0.4.17" - sources."xmlbuilder-4.2.1" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" ]; buildInputs = globalBuildInputs; meta = { @@ -33501,7 +33582,7 @@ in sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."import-jsx-1.3.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" @@ -33540,7 +33621,7 @@ in sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" sources."log-update-2.3.0" - sources."loose-envify-1.3.1" + sources."loose-envify-1.4.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" @@ -33553,7 +33634,7 @@ in ]; }) sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -33661,10 +33742,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; - sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.1.0.tgz"; + sha512 = "DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw=="; }; dependencies = [ sources."acorn-5.7.1" @@ -33711,9 +33792,10 @@ in sources."es-to-primitive-1.1.1" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.0" + sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" sources."espree-4.0.0" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" @@ -33743,7 +33825,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inquirer-5.2.0" - sources."is-callable-1.1.3" + sources."is-callable-1.1.4" sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" @@ -33832,10 +33914,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-6.0.0.tgz"; - sha512 = "NRn6C7G0HzA2hEFlLzD+M/m1eIeTtmxxO45n7Pp+Nk/gBp8mfIXlE8wSLdePt/g0Sl7BhuU/hY/E+kD/8P5LeQ=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-6.0.1.tgz"; + sha512 = "27O0P4SaTm7RDrykMyLTIX964VhXxmyGEXur6Er1V3qZ1YL1kWvL74pzdPonWOb6N/ghYFZY4a23L7vZDRHjMg=="; }; dependencies = [ sources."acorn-5.7.1" @@ -33849,14 +33931,20 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" - sources."babel-code-frame-6.26.0" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-1.1.3" // { + (sources."chalk-2.4.1" // { dependencies = [ - sources."supports-color-2.0.0" + sources."ansi-styles-3.2.1" ]; }) sources."chardet-0.4.2" @@ -33875,19 +33963,12 @@ in sources."es-abstract-1.12.0" sources."es-to-primitive-1.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-5.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."strip-ansi-4.0.0" - sources."supports-color-5.4.0" - ]; - }) + sources."eslint-5.1.0" sources."eslint-scope-4.0.0" + sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" sources."espree-4.0.0" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" @@ -33916,16 +33997,8 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."inquirer-5.2.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."strip-ansi-4.0.0" - sources."supports-color-5.4.0" - ]; - }) - sources."is-callable-1.1.3" + sources."inquirer-5.2.0" + sources."is-callable-1.1.4" sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" @@ -33984,28 +34057,17 @@ in sources."signal-exit-3.0.2" sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" - (sources."string-width-2.1.1" // { + sources."string-width-2.1.1" + sources."string.prototype.matchall-2.0.0" + (sources."strip-ansi-4.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.matchall-2.0.0" - sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - (sources."supports-color-3.2.3" // { - dependencies = [ - sources."has-flag-1.0.0" - ]; - }) + sources."supports-color-5.4.0" sources."symbol-observable-1.0.1" - (sources."table-4.0.3" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."supports-color-5.4.0" - ]; - }) + sources."table-4.0.3" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -34028,10 +34090,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-3.1.6.tgz"; - sha1 = "ab09c530c3a5165986b7db1909f349a4a6106b50"; + url = "https://registry.npmjs.org/emojione/-/emojione-3.1.7.tgz"; + sha1 = "2d3c725c696f179c9dde3acb655c621ee9429b1e"; }; buildInputs = globalBuildInputs; meta = { @@ -34103,7 +34165,7 @@ in sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hasha-2.2.0" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-signature-1.2.0" sources."indent-string-2.1.0" sources."inherits-2.0.3" @@ -34946,7 +35008,7 @@ in ]; }) sources."urix-0.1.0" - sources."use-3.1.0" + sources."use-3.1.1" sources."user-home-1.1.1" sources."util-deprecate-1.0.2" sources."v8flags-2.1.1" @@ -35074,22 +35136,22 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.17"; + version = "3.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.17.tgz"; - sha512 = "O+StuKL0UWfwX5Zv4rFxd60DPcT5DVjGq1AlnP6VQ8wzudft/W4hx5Wl98aSYNwFBHY6XWJreRw/BehX4l+diQ=="; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.19.tgz"; + sha512 = "Qr2JC9nsjK8oCrEmuB430ZIA8YWbF3D5LSjywD75FTuXmeqacwHgIM8wp3vHYzzPbklSjp53RdmDuzR4ub2HzA=="; }; dependencies = [ sources."camel-case-3.0.0" sources."clean-css-4.1.11" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."he-1.1.1" sources."lower-case-1.1.4" sources."no-case-2.3.2" sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.4.2" // { + (sources."uglify-js-3.4.4" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -35099,7 +35161,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = http://kangax.github.io/html-minifier/; + homepage = https://kangax.github.io/html-minifier/; license = "MIT"; }; production = true; @@ -35133,6 +35195,7 @@ in sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" + sources."base64-js-1.3.0" sources."basic-auth-1.1.0" sources."binary-extensions-1.11.0" sources."bl-1.2.2" @@ -35150,6 +35213,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-1.8.5" + sources."buffer-5.1.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -35175,7 +35239,7 @@ in sources."cookie-signature-1.0.6" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."crc-3.5.0" + sources."crc-3.7.0" sources."crc32-stream-2.0.0" sources."cross-spawn-5.1.0" sources."dargs-5.1.0" @@ -35225,7 +35289,7 @@ in sources."statuses-1.4.0" ]; }) - sources."follow-redirects-1.5.0" + sources."follow-redirects-1.5.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."form-data-2.3.2" @@ -35251,6 +35315,7 @@ in ]; }) sources."iconv-lite-0.4.23" + sources."ieee754-1.1.12" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inquirer-3.3.0" @@ -35487,7 +35552,7 @@ in sources."isexe-2.0.0" (sources."js-yaml-3.12.0" // { dependencies = [ - sources."esprima-4.0.0" + sources."esprima-4.0.1" ]; }) sources."kind-of-3.2.2" @@ -35637,7 +35702,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."iterare-0.0.8" - (sources."jaeger-client-3.10.0" // { + (sources."jaeger-client-3.11.0" // { dependencies = [ sources."opentracing-0.13.0" ]; @@ -35664,10 +35729,11 @@ in sources."thriftrw-3.11.2" sources."type-detect-4.0.8" sources."typescript-2.8.3" + sources."uuid-3.3.2" sources."vscode-jsonrpc-3.6.2" - sources."vscode-languageserver-4.2.1" - sources."vscode-languageserver-protocol-3.8.1" - sources."vscode-languageserver-types-3.8.2" + sources."vscode-languageserver-4.3.0" + sources."vscode-languageserver-protocol-3.9.0" + sources."vscode-languageserver-types-3.9.0" sources."vscode-uri-1.0.5" sources."wrappy-1.0.2" sources."xorshift-0.2.1" @@ -35914,10 +35980,10 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.4.tgz"; - sha512 = "UFnB5j1C7XrUWQIlFGrjerFVuc04TZAyoEavfb0VofdjguWWN97aCtWsv1uX6pXylJiLw+agsyTPCnNjL6W4ag=="; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.5.tgz"; + sha512 = "PxRt8e2ktX3ktNSGqfH+6ghfwXUjQ9pS/asLBSS4CSf1Jl4811WCvZL2YPvmdaWzi7LBAd/Y6lVg1BMnph51nw=="; }; dependencies = [ sources."argparse-1.0.10" @@ -35929,7 +35995,7 @@ in sources."core-util-is-1.0.2" sources."debug-3.1.0" sources."delayed-stream-1.0.0" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."extend-3.0.1" sources."form-data-2.3.2" sources."formidable-1.2.1" @@ -36005,7 +36071,7 @@ in sources."combined-stream-1.0.6" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) sources."compression-1.7.2" @@ -36071,7 +36137,7 @@ in sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."global-dirs-0.1.1" @@ -36131,7 +36197,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.0" sources."ms-2.0.0" - sources."nanoid-1.0.4" + sources."nanoid-1.1.0" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -36152,7 +36218,7 @@ in sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."pify-3.0.0" - sources."please-upgrade-node-3.0.2" + sources."please-upgrade-node-3.1.1" sources."pluralize-7.0.0" sources."prepend-http-1.0.4" sources."proxy-addr-2.0.3" @@ -36244,7 +36310,7 @@ in }; dependencies = [ sources."argparse-1.0.10" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."sprintf-js-1.0.3" ]; buildInputs = globalBuildInputs; @@ -36268,7 +36334,7 @@ in sources."accepts-1.3.5" sources."addressparser-1.0.1" sources."after-0.8.2" - sources."agent-base-4.2.0" + sources."agent-base-4.2.1" sources."ajv-5.5.2" (sources."amqplib-0.5.2" // { dependencies = [ @@ -36341,7 +36407,7 @@ in sources."caseless-0.12.0" sources."chalk-1.1.3" sources."chokidar-2.0.4" - sources."circular-json-0.5.4" + sources."circular-json-0.5.5" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -36409,7 +36475,7 @@ in sources."es6-promisify-5.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.10.0" + sources."escodegen-1.11.0" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -36470,7 +36536,7 @@ in sources."statuses-1.3.1" ]; }) - (sources."follow-redirects-1.5.0" // { + (sources."follow-redirects-1.5.1" // { dependencies = [ sources."debug-3.1.0" ]; @@ -36580,7 +36646,7 @@ in sources."libqp-1.1.0" sources."lodash-4.17.10" sources."lodash.debounce-4.0.8" - (sources."log4js-2.10.0" // { + (sources."log4js-2.11.0" // { dependencies = [ sources."debug-3.1.0" ]; @@ -36663,6 +36729,7 @@ in (sources."pac-proxy-agent-2.0.2" // { dependencies = [ sources."debug-3.1.0" + sources."socks-proxy-agent-3.0.1" ]; }) sources."pac-resolver-3.0.0" @@ -36684,7 +36751,7 @@ in sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.0" sources."promisify-call-2.0.4" - (sources."proxy-agent-3.0.0" // { + (sources."proxy-agent-3.0.1" // { dependencies = [ sources."debug-3.1.0" ]; @@ -36767,7 +36834,12 @@ in ]; }) sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" + (sources."socks-proxy-agent-4.0.1" // { + dependencies = [ + sources."smart-buffer-4.0.1" + sources."socks-2.2.1" + ]; + }) sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -36839,7 +36911,7 @@ in }) sources."upath-1.1.0" sources."urix-0.1.0" - sources."use-3.1.0" + sources."use-3.1.1" (sources."useragent-2.2.1" // { dependencies = [ sources."lru-cache-2.2.4" @@ -36891,7 +36963,7 @@ in sources."commander-2.6.0" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) sources."compression-1.5.2" @@ -37036,10 +37108,10 @@ in lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.0.0.tgz"; - sha512 = "6Yb98XarLXKNjGvVX9LNdZNeE22VsTCUZixtAqrO5WLjM9Mtyybn6fSI2m3A4drSMvSh8WYALuT6S5c/XnBbqA=="; + url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.1.0.tgz"; + sha512 = "vGXaMNGZRr4cYvW+xMVg+rg7qd5DX9SbGXl+0S3k85+gRZVK4K7UvxPWzKb/qiMwe+4bx3EOrW2o4mbdb1WnsA=="; }; dependencies = [ sources."append-buffer-1.0.2" @@ -37182,7 +37254,7 @@ in }) sources."css-select-1.2.0" sources."css-what-2.1.0" - sources."cssom-0.3.3" + sources."cssom-0.3.4" sources."cssstyle-0.2.37" sources."cycle-1.0.3" sources."dashdash-1.14.1" @@ -37201,7 +37273,7 @@ in sources."ecc-jsbn-0.1.1" sources."entities-1.1.1" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.10.0" + sources."escodegen-1.11.0" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -37216,7 +37288,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."fs.realpath-1.0.0" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."glob-7.1.2" @@ -37502,7 +37574,7 @@ in sources."string-width-1.0.2" ]; }) - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" (sources."get-pkg-repo-1.4.0" // { dependencies = [ sources."meow-3.7.0" @@ -37524,7 +37596,7 @@ in sources."handlebars-4.0.11" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."iconv-lite-0.4.23" sources."imurmurhash-0.1.4" sources."indent-string-2.1.0" @@ -37796,10 +37868,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.0.4"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz"; - sha512 = "q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ=="; + url = "https://registry.npmjs.org/less/-/less-3.7.1.tgz"; + sha512 = "Cmf5XJlzNklkBC8eAa+Ef16AHUBAkApHNAw3x9Vmn84h2BvGrri5Id7kf6H1n6SN74Fc0WdHIRPlFMxsl0eJkA=="; }; dependencies = [ sources."ajv-5.5.2" @@ -38470,7 +38542,7 @@ in sources."collection-visit-1.0.0" sources."color-support-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" @@ -38505,7 +38577,7 @@ in sources."deprecated-0.0.1" sources."detect-file-1.0.0" sources."detect-newline-2.1.0" - sources."dom4-2.1.0" + sources."dom4-2.1.3" (sources."duplexer2-0.0.2" // { dependencies = [ sources."isarray-0.0.1" @@ -39013,7 +39085,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typescript-2.7.2" - (sources."uglify-js-3.4.2" // { + (sources."uglify-js-3.4.4" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -39038,7 +39110,7 @@ in ]; }) sources."urix-0.1.0" - sources."use-3.1.0" + sources."use-3.1.1" sources."user-home-1.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" @@ -39142,7 +39214,7 @@ in sources."core-util-is-1.0.2" sources."debug-3.1.0" sources."delayed-stream-1.0.0" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."extend-3.0.1" sources."form-data-2.3.2" sources."formidable-1.2.1" @@ -39260,7 +39332,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -39339,7 +39411,7 @@ in sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" - sources."walk-2.3.13" + sources."walk-2.3.14" sources."wide-align-1.1.3" sources."wrappy-1.0.2" sources."yallist-3.0.2" @@ -39608,7 +39680,7 @@ in sources."hawk-3.1.3" sources."headless-0.1.7" sources."hoek-2.16.3" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-errors-1.6.3" sources."http-signature-1.1.1" sources."iconv-lite-0.4.19" @@ -39809,10 +39881,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz"; - sha512 = "16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug=="; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz"; + sha512 = "d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -39896,10 +39968,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.17.5"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.5.tgz"; - sha512 = "FG2mWJU1Y58a9ktgMJ/RZpsiPz3b7ge77t/okZHEa4NbrlXGKZ8s1A6Q+C7+JPXohAfcPALRwvxcAn8S874pmw=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.2.tgz"; + sha512 = "FKuvzVurERMgX231T9KexWWWopjd93vapFY8rLn2JlPZ58uCW2s7U8utKElpGUEAqU5Y33///KFza5O9ndVRHQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -40233,7 +40305,7 @@ in sources."update-notifier-2.5.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - sources."use-3.1.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."which-1.3.1" sources."widest-line-2.0.0" @@ -40356,7 +40428,7 @@ in sources."entities-1.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."etag-1.8.1" (sources."express-4.16.3" // { dependencies = [ @@ -40798,10 +40870,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; - sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w=="; + url = "https://registry.npmjs.org/npm/-/npm-6.2.0.tgz"; + sha512 = "GnlNsOnxwVJX4WSfyQY0gY3LnUX2cc46XU0eu1g+WSuZgDRUGmw8tuptitJu6byp0RWGT8ZEAKajblwdhQHN8A=="; }; buildInputs = globalBuildInputs; meta = { @@ -40963,7 +41035,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" - sources."walk-2.3.13" + sources."walk-2.3.14" sources."wide-align-1.1.3" sources."wrappy-1.0.2" ]; @@ -41016,7 +41088,7 @@ in sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."execa-0.7.0" sources."fast-diff-1.1.2" sources."find-up-1.1.2" @@ -41131,7 +41203,7 @@ in sha512 = "dLmGi7IGixJEHKetErIH460MYiYIzAoxuVsloZFu9e1p9U8K0yULx7YQ1+VzrjZbB+wqq67ES1SfOvKVb/qMDQ=="; }; dependencies = [ - sources."agent-base-4.2.0" + sources."agent-base-4.2.1" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -41160,12 +41232,12 @@ in sources."external-editor-2.2.0" sources."figures-2.0.0" sources."find-up-2.1.0" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" sources."hoek-4.2.1" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."https-proxy-agent-2.2.1" sources."iconv-lite-0.4.23" (sources."inquirer-3.3.0" // { @@ -41289,7 +41361,7 @@ in sources."vscode-languageclient-4.0.1" sources."vscode-languageserver-4.0.0" sources."vscode-languageserver-protocol-3.6.0" - sources."vscode-languageserver-types-3.8.2" + sources."vscode-languageserver-types-3.9.0" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; @@ -41363,7 +41435,7 @@ in sources."combined-stream-1.0.6" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) sources."compression-1.7.2" @@ -41394,7 +41466,7 @@ in sources."entities-1.1.1" sources."error-ex-1.3.2" sources."escape-html-1.0.3" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."etag-1.8.1" (sources."express-4.16.3" // { dependencies = [ @@ -41431,7 +41503,7 @@ in sources."function-bind-1.1.1" sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."getpass-0.1.7" sources."glob-6.0.4" sources."graceful-fs-4.1.11" @@ -41444,7 +41516,7 @@ in sources."har-validator-5.0.3" sources."has-symbols-1.0.0" sources."hat-0.0.3" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."hot-shots-4.8.0" sources."http-errors-1.6.3" sources."http-signature-1.2.0" @@ -41745,7 +41817,7 @@ in sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hat-0.0.3" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-headers-3.0.2" sources."iconv-lite-0.4.23" sources."immediate-chunk-store-1.0.8" @@ -41768,7 +41840,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.7.0" + sources."ipaddr.js-1.8.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -41793,7 +41865,7 @@ in sources."meow-3.7.0" sources."mime-2.3.1" sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.3.5" @@ -42004,7 +42076,7 @@ in sources."component-inherit-0.0.3" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) sources."compression-1.5.2" @@ -42133,7 +42205,7 @@ in sources."mime-1.3.4" sources."mime-db-1.33.0" sources."mime-types-2.1.18" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -42542,7 +42614,7 @@ in sources."browserify-aes-1.2.0" sources."browserify-cache-api-3.0.1" sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.1" + sources."browserify-des-1.0.2" (sources."browserify-incremental-3.1.1" // { dependencies = [ sources."JSONStream-0.10.0" @@ -42663,7 +42735,7 @@ in ]; }) sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.5" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" @@ -42919,7 +42991,7 @@ in sources."punycode-1.3.2" ]; }) - sources."use-3.1.0" + sources."use-3.1.1" sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" @@ -43527,14 +43599,14 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "9.1.0"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-9.1.0.tgz"; - sha512 = "6PXXiYbBz4IN0JZUY6GsEmOfb5EA64vXkldffYf9O4xbL+oRVQN4Gdhqpi5Kjpw5tlQP9z1mKhGh4Ysk4y2TUw=="; + url = "https://registry.npmjs.org/serve/-/serve-9.2.0.tgz"; + sha512 = "Of6n6QupoV+ybolrWS1e18Truux7VeYUa52XAo8no2dYKDAT+pWZZmrxf4RdCqoVTMfNWhvv8pjDnf8y1m3HkQ=="; }; dependencies = [ - sources."@zeit/schemas-1.2.0" - sources."ajv-6.5.1" + sources."@zeit/schemas-1.6.0" + sources."ajv-6.5.2" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -43595,7 +43667,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" - sources."serve-handler-3.2.1" + sources."serve-handler-3.3.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -43889,7 +43961,7 @@ in sources."commander-2.16.0" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) (sources."compression-1.7.2" // { @@ -43926,7 +43998,7 @@ in sources."es6-shim-0.21.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."etag-1.8.1" sources."express-5.0.0-alpha.6" sources."express-json5-0.1.0" @@ -44038,7 +44110,7 @@ in ]; }) sources."rimraf-2.4.5" - (sources."router-1.3.2" // { + (sources."router-1.3.3" // { dependencies = [ sources."setprototypeof-1.1.0" sources."utils-merge-1.0.1" @@ -44487,11 +44559,11 @@ in sources."entities-1.1.1" sources."es-abstract-1.12.0" sources."es-to-primitive-1.1.1" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."foreach-2.0.5" sources."function-bind-1.1.1" sources."has-1.0.3" - sources."is-callable-1.1.3" + sources."is-callable-1.1.4" sources."is-date-object-1.0.1" sources."is-regex-1.0.4" sources."is-symbol-1.0.1" @@ -44866,13 +44938,13 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."js-tokens-3.0.2" + sources."js-tokens-4.0.0" sources."jspm-config-0.3.4" sources."latest-version-3.1.0" sources."listify-1.0.0" sources."lockfile-1.0.4" sources."log-update-1.0.2" - sources."loose-envify-1.3.1" + sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" sources."make-dir-1.3.0" @@ -44986,13 +45058,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.2"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; - sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.4.tgz"; + sha512 = "RiB1kNcC9RMyqwRrjXC+EjgLoXULoDnCaOnEDzUCHkBN0bHwmtF5rzDMiDWU29gu0kXCRRWwtcTAVFWRECmU2Q=="; }; dependencies = [ - sources."commander-2.15.1" + sources."commander-2.16.0" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -45007,10 +45079,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.28"; + version = "1.4.29"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.28.tgz"; - sha512 = "rXb0l9jqiIWeKvrlUnK0/SYOmOKHe3nw1AV/VWqJERMkaoI5XJ1Pfu4pDnqWEtbSLVLE9dvffeleqISO6qK4BQ=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.29.tgz"; + sha512 = "0aahbSMJj2FX4rpU6Rkp0eeW7SGKvWA8zGECRCJdfZ5wMAxFRzwddincC/8FOAIReM2jng6d75XeNrNsQdMB7w=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -45164,7 +45236,7 @@ in sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."getmac-1.4.3" sources."getpass-0.1.7" @@ -45185,7 +45257,7 @@ in sources."mkdirp-0.3.0" ]; }) - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" @@ -45535,7 +45607,7 @@ in sources."enable-1.3.2" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."extend-3.0.1" sources."extend-shallow-2.0.1" sources."external-editor-3.0.0" @@ -45668,7 +45740,7 @@ in sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.2.1" + sources."rxjs-6.2.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -45728,7 +45800,7 @@ in sources."xtend-4.0.1" sources."yaml-js-0.0.8" sources."yargs-3.10.0" - sources."yauzl-2.9.2" + sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -45906,30 +45978,34 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.14.0"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.14.0.tgz"; - sha512 = "CgZPUwobJbQlZqpylDNtEazZLfNnGuyFmpk1dHIP2kFchtyMWB+W2wBKPImSnSQ2rbX/WZMKiQax+SZmlUXuQQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.16.0.tgz"; + sha512 = "oNx9djAd6uAcccyfqN3hyXLNMjZHiRySZmBQ4c8FNmf1SNJGhx7n9TSvHNyXxgToRdH65g/Q97s94Ip9N6F7xg=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.5.12" - sources."@webassemblyjs/floating-point-hex-parser-1.5.12" - sources."@webassemblyjs/helper-api-error-1.5.12" - sources."@webassemblyjs/helper-buffer-1.5.12" - sources."@webassemblyjs/helper-code-frame-1.5.12" - sources."@webassemblyjs/helper-fsm-1.5.12" - sources."@webassemblyjs/helper-module-context-1.5.12" - sources."@webassemblyjs/helper-wasm-bytecode-1.5.12" - sources."@webassemblyjs/helper-wasm-section-1.5.12" - sources."@webassemblyjs/ieee754-1.5.12" - sources."@webassemblyjs/leb128-1.5.12" - sources."@webassemblyjs/utf8-1.5.12" - sources."@webassemblyjs/wasm-edit-1.5.12" - sources."@webassemblyjs/wasm-gen-1.5.12" - sources."@webassemblyjs/wasm-opt-1.5.12" - sources."@webassemblyjs/wasm-parser-1.5.12" - sources."@webassemblyjs/wast-parser-1.5.12" - sources."@webassemblyjs/wast-printer-1.5.12" + sources."@webassemblyjs/ast-1.5.13" + sources."@webassemblyjs/floating-point-hex-parser-1.5.13" + sources."@webassemblyjs/helper-api-error-1.5.13" + sources."@webassemblyjs/helper-buffer-1.5.13" + sources."@webassemblyjs/helper-code-frame-1.5.13" + sources."@webassemblyjs/helper-fsm-1.5.13" + sources."@webassemblyjs/helper-module-context-1.5.13" + sources."@webassemblyjs/helper-wasm-bytecode-1.5.13" + sources."@webassemblyjs/helper-wasm-section-1.5.13" + sources."@webassemblyjs/ieee754-1.5.13" + (sources."@webassemblyjs/leb128-1.5.13" // { + dependencies = [ + sources."long-4.0.0" + ]; + }) + sources."@webassemblyjs/utf8-1.5.13" + sources."@webassemblyjs/wasm-edit-1.5.13" + sources."@webassemblyjs/wasm-gen-1.5.13" + sources."@webassemblyjs/wasm-opt-1.5.13" + sources."@webassemblyjs/wasm-parser-1.5.13" + sources."@webassemblyjs/wast-parser-1.5.13" + sources."@webassemblyjs/wast-printer-1.5.13" sources."acorn-5.7.1" sources."acorn-dynamic-import-3.0.0" sources."ajv-6.5.2" @@ -45970,7 +46046,7 @@ in sources."brorand-1.1.0" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.1" + sources."browserify-des-1.0.2" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" @@ -46030,7 +46106,7 @@ in sources."end-of-stream-1.4.1" sources."enhanced-resolve-4.1.0" sources."errno-0.1.7" - sources."eslint-scope-3.7.1" + sources."eslint-scope-3.7.3" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."events-1.1.1" @@ -46096,7 +46172,7 @@ in ]; }) sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.5" sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" sources."ieee754-1.1.12" @@ -46126,7 +46202,6 @@ in sources."json-schema-traverse-0.4.1" sources."json5-0.5.1" sources."kind-of-6.0.2" - sources."leb-0.3.0" sources."loader-runner-2.3.0" sources."loader-utils-1.1.0" sources."locate-path-2.0.0" @@ -46338,7 +46413,7 @@ in sources."punycode-1.3.2" ]; }) - sources."use-3.1.0" + sources."use-3.1.1" sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" @@ -46448,7 +46523,7 @@ in }) sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" - (sources."ecstatic-3.2.0" // { + (sources."ecstatic-3.2.1" // { dependencies = [ sources."mime-1.6.0" ]; @@ -46479,7 +46554,7 @@ in sources."ini-1.3.5" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.7.0" + sources."ipaddr.js-1.8.0" sources."is-ascii-1.0.0" sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" @@ -46503,7 +46578,7 @@ in sources."mediasource-2.2.1" sources."memory-chunk-store-1.3.0" sources."mime-2.3.1" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -46658,7 +46733,7 @@ in sources."wide-align-1.1.3" sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-5.2.1" + sources."ws-5.2.2" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -46685,7 +46760,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.5.1" + sources."@types/node-10.5.2" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.1" @@ -46706,7 +46781,7 @@ in ]; }) sources."adm-zip-0.4.11" - sources."agent-base-4.2.0" + sources."agent-base-4.2.1" sources."ajv-6.5.0" sources."ajv-keywords-2.1.1" sources."ajv-merge-patch-3.0.0" @@ -46795,6 +46870,11 @@ in sources."extend-shallow-2.0.1" ]; }) + (sources."buffer-5.1.0" // { + dependencies = [ + sources."base64-js-1.3.0" + ]; + }) sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -46873,7 +46953,7 @@ in sources."copy-descriptor-0.1.1" sources."core-js-2.5.7" sources."core-util-is-1.0.2" - sources."crc-3.5.0" + sources."crc-3.7.0" sources."crc32-stream-2.0.0" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -46953,7 +47033,7 @@ in sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" - (sources."escodegen-1.10.0" // { + (sources."escodegen-1.11.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -46998,7 +47078,7 @@ in }) ]; }) - sources."eslint-scope-3.7.1" + sources."eslint-scope-3.7.3" sources."eslint-visitor-keys-1.0.0" sources."espree-3.5.4" sources."esprima-3.1.3" @@ -47095,7 +47175,7 @@ in }) sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."get-uri-2.0.2" sources."get-value-2.0.6" @@ -47145,7 +47225,7 @@ in sources."hawk-6.0.2" sources."hoek-4.2.1" sources."home-or-tmp-2.0.0" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."htmlparser2-3.9.2" sources."http-errors-1.6.3" (sources."http-proxy-agent-2.1.0" // { @@ -47160,6 +47240,7 @@ in ]; }) sources."iconv-lite-0.4.23" + sources."ieee754-1.1.12" sources."ignore-3.3.10" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -47237,7 +47318,7 @@ in sources."js-tokens-3.0.2" (sources."js-yaml-3.12.0" // { dependencies = [ - sources."esprima-4.0.0" + sources."esprima-4.0.1" ]; }) sources."jsbn-0.1.1" @@ -47292,7 +47373,7 @@ in sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" sources."longest-streak-1.0.0" - sources."loose-envify-1.3.1" + sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" sources."macos-release-1.1.0" @@ -47416,6 +47497,7 @@ in (sources."pac-proxy-agent-2.0.2" // { dependencies = [ sources."debug-3.1.0" + sources."socks-proxy-agent-3.0.1" ]; }) sources."pac-resolver-3.0.0" @@ -47458,7 +47540,7 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."promise-7.3.1" - (sources."proxy-agent-3.0.0" // { + (sources."proxy-agent-3.0.1" // { dependencies = [ sources."debug-3.1.0" ]; @@ -47587,7 +47669,7 @@ in }) sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" - (sources."snyk-1.88.0" // { + (sources."snyk-1.88.2" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.1" @@ -47649,7 +47731,12 @@ in ]; }) sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" + (sources."socks-proxy-agent-4.0.1" // { + dependencies = [ + sources."smart-buffer-4.0.1" + sources."socks-2.2.1" + ]; + }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" (sources."source-map-support-0.5.3" // { @@ -47787,11 +47874,7 @@ in sources."uri-js-4.2.2" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - (sources."use-3.1.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."use-3.1.1" sources."user-home-2.0.0" sources."util-0.10.4" sources."util-deprecate-1.0.2" @@ -47895,10 +47978,10 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-2.0.3.tgz"; - sha512 = "v1z5HW9oZF82ntIx9janKzn/6KS+YXe+dYwCtA/TVCWafr+bTVE914uDkmcJTMbqS1enzoZ3Dy7mveRYQUZ3dg=="; + url = "https://registry.npmjs.org/yo/-/yo-2.0.4.tgz"; + sha512 = "IFqP6MBVbyN/EG1jPqBdzV9HNmnOFyC6u/CVN7KcQpxejulspdvY1IdxX0Aj0fMSFkoZGO3HX94e8rcxLHZN7A=="; }; dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -48005,6 +48088,7 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."conf-1.4.0" + sources."config-chain-1.1.11" sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" @@ -48114,9 +48198,9 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - sources."global-tunnel-ng-2.1.1" + sources."global-tunnel-ng-2.4.0" sources."globby-8.0.1" - sources."got-8.3.1" + sources."got-8.3.2" sources."graceful-fs-4.1.11" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" @@ -48136,7 +48220,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" sources."humanize-string-1.0.2" @@ -48252,7 +48336,7 @@ in sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mixin-deep-1.3.1" // { @@ -48271,6 +48355,7 @@ in sources."nice-try-1.0.4" sources."normalize-package-data-2.4.0" sources."normalize-url-2.0.1" + sources."npm-conf-1.1.3" (sources."npm-keyword-5.0.0" // { dependencies = [ sources."got-7.1.0" @@ -48348,6 +48433,7 @@ in sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.0" + sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."psl-1.1.28" sources."punycode-1.4.1" @@ -48394,7 +48480,7 @@ in sources."root-check-1.0.0" sources."run-async-2.3.0" sources."rx-4.1.0" - sources."rxjs-6.2.1" + sources."rxjs-6.2.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -48534,7 +48620,7 @@ in sources."tough-cookie-2.4.3" sources."trim-newlines-1.0.0" sources."tslib-1.9.3" - sources."tunnel-0.0.4" + sources."tunnel-0.0.5" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."twig-1.12.0" @@ -48562,7 +48648,7 @@ in sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" - sources."use-3.1.0" + sources."use-3.1.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" @@ -48574,7 +48660,7 @@ in sources."pify-2.3.0" ]; }) - sources."walk-2.3.13" + sources."walk-2.3.14" sources."which-1.3.1" sources."widest-line-2.0.0" sources."win-release-1.1.1" @@ -48597,7 +48683,7 @@ in sources."supports-color-3.2.3" ]; }) - sources."yeoman-doctor-3.0.1" + sources."yeoman-doctor-3.0.2" (sources."yeoman-environment-2.3.0" // { dependencies = [ sources."chardet-0.4.2" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index bcd5d2fa86e71..241679e0b3bce 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,13 +49,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@types/node-10.5.1" = { + "@types/node-10.5.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.1"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz"; - sha512 = "AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz"; + sha512 = "m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q=="; }; }; "@types/superagent-3.5.6" = { @@ -148,13 +148,13 @@ let sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; }; }; - "ansi-diff-stream-1.2.1" = { - name = "ansi-diff-stream"; - packageName = "ansi-diff-stream"; - version = "1.2.1"; + "ansi-diff-1.1.1" = { + name = "ansi-diff"; + packageName = "ansi-diff"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; - sha512 = "PaKs34INoKpTzcjyKd2GM/CCEeTyDgWKuHSgF0z7ywjpbBFj/pzQf/30v+TR6VBBLia6Mso+W2ygU22ljqbi6A=="; + url = "https://registry.npmjs.org/ansi-diff/-/ansi-diff-1.1.1.tgz"; + sha512 = "XnTdFDQzbEewrDx8epWXdw7oqHMvv315vEtfqDiEhhWghIf4++h26c3/FMz7iTLhNrnj56DNIXpbxHZq+3s6qw=="; }; }; "ansi-escapes-1.4.0" = { @@ -202,6 +202,15 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; + "ansi-split-1.0.1" = { + name = "ansi-split"; + packageName = "ansi-split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-split/-/ansi-split-1.0.1.tgz"; + sha512 = "RRxQym4DFtDNmHIkW6aeFVvrXURb11lGAEPXNiryjCe8bK8RsANjzJ0M2aGOkvBYwP4Bl/xZ8ijtr6D3j1x/eg=="; + }; + }; "ansi-styles-2.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -805,15 +814,6 @@ let sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; }; }; - "buffer-indexof-1.1.1" = { - name = "buffer-indexof"; - packageName = "buffer-indexof"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; - }; - }; "builtins-1.0.3" = { name = "builtins"; packageName = "builtins"; @@ -1588,13 +1588,13 @@ let sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA=="; }; }; - "dat-doctor-1.4.0" = { + "dat-doctor-2.0.0" = { name = "dat-doctor"; packageName = "dat-doctor"; - version = "1.4.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz"; - sha512 = "1A3npklzv62UErw/rBaSkKDiiYnPNl7yNOtg1QeuJ1AtOEnyfH1iY9QiaVqPj6mFF2CIT4/pCSapueQFX7Cn/Q=="; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-2.0.0.tgz"; + sha512 = "plNNUnBklePVTE5xsQA8gdYZKveT+2VnZ7Us/zY2kw+JF0mLAK+zVl0jEtl7px3jvEEQD+seVMs42uOg59dmAg=="; }; }; "dat-encoding-4.0.2" = { @@ -1642,22 +1642,22 @@ let sha512 = "cu6Fwapm34myc5um6jdQBrtDkjx28oVkOVHbaV4YNLdxrRqUm+FlWuIqFk7zaCZDoZg5TMlCG1SF0j3AFbiOYA=="; }; }; - "dat-log-1.1.1" = { + "dat-log-1.2.0" = { name = "dat-log"; packageName = "dat-log"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-log/-/dat-log-1.1.1.tgz"; - sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; + url = "https://registry.npmjs.org/dat-log/-/dat-log-1.2.0.tgz"; + sha512 = "oK6R74WV8TdhGR9VCLym7D/vlN8lXND5AyhJhrjtm1WNDrg/6Clx1Tk7k3Dt8quy2AmmGO7vbIk7iwFtzTAJfA=="; }; }; - "dat-node-3.5.9" = { + "dat-node-3.5.11" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.9"; + version = "3.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.9.tgz"; - sha512 = "JGZPtreK8YDFUG5JHBJSKIpSTAkqlRS0WlS6WnlJd6ap4GtQOdPYNvQyt/1AcL1ja4zM8GLnbOWGj37a6ExKQA=="; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.11.tgz"; + sha512 = "8vDc4XwOtOdZgtw/YSb5k/8KIu0+jByaZCsWv5gY5RbrnCouh0Qa7CvIWezZyl0FFke5LIvHuzme2iRiEYIdOw=="; }; }; "dat-registry-4.0.0" = { @@ -1912,6 +1912,15 @@ let sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; }; }; + "diffy-2.0.0" = { + name = "diffy"; + packageName = "diffy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diffy/-/diffy-2.0.0.tgz"; + sha512 = "T1+MF7chaOtNaBeV59td6lYlci6dCTUraySH8LDltafhd+FLTsYpJJbLVpl6S4ih6kPFMaHSIqQ92bRVvoE+3Q=="; + }; + }; "directory-index-html-2.1.0" = { name = "directory-index-html"; packageName = "directory-index-html"; @@ -1930,31 +1939,13 @@ let sha512 = "EEmZQFE0PiOsJj7G3KVCwFGbYs4QchUvzA91iHtZ6HfkIqfBEDSTGLygJrUlY1Tr77WDV+qZVrZuNghHxSL/vw=="; }; }; - "discovery-swarm-4.4.2" = { - name = "discovery-swarm"; - packageName = "discovery-swarm"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-4.4.2.tgz"; - sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; - }; - }; - "discovery-swarm-5.1.1" = { + "discovery-swarm-5.1.2" = { name = "discovery-swarm"; packageName = "discovery-swarm"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.1.tgz"; - sha512 = "r38993qP/fcuAlNLSOwGZUps1inzNA4wXkIkv/piwFDseyIWNjYyk/4DHGxyf/bWMB86gPWIUdA6AhydkWmgdA=="; - }; - }; - "dns-discovery-5.6.1" = { - name = "dns-discovery"; - packageName = "dns-discovery"; - version = "5.6.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz"; - sha512 = "r27fv3lDuZXCqmb5b04tV2aDxVbwVJaSyPzwPlOYCUbk9F7JvsY+n7EBfY2Z952bGx5TZt3SLQ+ELFjfqyLVoA=="; + url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.2.tgz"; + sha512 = "aqNdl4l76PFb301I1hXkHZSakQTOXR0yRbfDtF7XrZKk+9V5gMQBbQ2xPgnQPfDVG0IeErxkQkoWqp4f9EJe5w=="; }; }; "dns-discovery-6.1.0" = { @@ -1966,15 +1957,6 @@ let sha512 = "Kl2tL2zuNR1w6SnsoRaqrOFm7gGP3/i/HzRXtyVBqaOq/5L1D2TUdViUAZ8e/NDbt+jQCJFWoaKCnmDC343usQ=="; }; }; - "dns-packet-1.3.1" = { - name = "dns-packet"; - packageName = "dns-packet"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; - sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; - }; - }; "dns-packet-4.2.0" = { name = "dns-packet"; packageName = "dns-packet"; @@ -1984,15 +1966,6 @@ let sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw=="; }; }; - "dns-socket-1.6.3" = { - name = "dns-socket"; - packageName = "dns-socket"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz"; - sha512 = "/mUy3VGqIP69dAZjh2xxHXcpK9wk2Len1Dxz8mWAdrIgFC8tnR/aQAyU4a+UTXzOcTvEvGBdp1zFiwnpWKaXng=="; - }; - }; "dns-socket-3.0.0" = { name = "dns-socket"; packageName = "dns-socket"; @@ -2002,15 +1975,6 @@ let sha512 = "M0WkByoJ/mTm+HtwBQLsRJPe5uGIC/lYVOp+s6ZzhbZ5iq4GxjFyxYPQhB85dgCLvVb43aJQXHDC9aUgyKGc/Q=="; }; }; - "dns-txt-2.0.2" = { - name = "dns-txt"; - packageName = "dns-txt"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; - sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; - }; - }; "dom-walk-0.1.1" = { name = "dom-walk"; packageName = "dom-walk"; @@ -2200,13 +2164,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "esprima-4.0.0" = { + "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "etag-1.8.1" = { @@ -3109,13 +3073,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "hypercore-6.17.1" = { + "hypercore-6.17.3" = { name = "hypercore"; packageName = "hypercore"; - version = "6.17.1"; + version = "6.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.1.tgz"; - sha512 = "fwBwdx3oaUsaKIRI3e1M78GikrH4EmS/lpbOmRlTnELdYUTIHAAt4qg8YtSbB8PtwiPujT9DjSU+VMj8jAQArQ=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.3.tgz"; + sha512 = "BJwZ4bRV3tYG3R+iE3ydW3GWpZrPLbi86I75qUg9bQ5jMWgwdh+llKgYFvSJhJtoT/MVxrcuXFDkuHiJ0GYMvw=="; }; }; "hypercore-crypto-1.0.0" = { @@ -3145,13 +3109,13 @@ let sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww=="; }; }; - "hyperdrive-http-4.2.2" = { + "hyperdrive-http-4.3.2" = { name = "hyperdrive-http"; packageName = "hyperdrive-http"; - version = "4.2.2"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz"; - sha512 = "NgfZGxfQoYIEIuYat+dki/GAWpjmM/X+5YL5faTrX3VgXdGObVOhKEHQISk855T8C+R4aPP8QpF1YR8adUVBNw=="; + url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.3.2.tgz"; + sha512 = "dVEtiPiaoR0BNtO8SBvBqRJQMVMV1zzXLIWBBGjVefhISfybfyOBuGi7xzhGnHj+4oK7E8Wwt2Bo5W/J5ecpIg=="; }; }; "hyperdrive-network-speed-2.1.0" = { @@ -3352,13 +3316,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.1.3" = { + "is-callable-1.1.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; - sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; }; }; "is-ci-1.1.0" = { @@ -3937,6 +3901,15 @@ let sha512 = "f/9TynsO8YYjZ6JjNNtSSH7CJcIHcio1buy3zqByGxb/GX8AWLdL6FZEWTrN8V3/J7W4/E0ZTQQ+Jt2rVq7ELg=="; }; }; + "keypress-0.2.1" = { + name = "keypress"; + packageName = "keypress"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; + sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; + }; + }; "kind-of-3.2.2" = { name = "kind-of"; packageName = "kind-of"; @@ -4270,15 +4243,6 @@ let sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; }; }; - "lodash.flattendeep-4.4.0" = { - name = "lodash.flattendeep"; - packageName = "lodash.flattendeep"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; - sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; - }; - }; "lodash.foreach-2.4.1" = { name = "lodash.foreach"; packageName = "lodash.foreach"; @@ -4540,6 +4504,15 @@ let sha512 = "Mf9OHV/Y7h6YWDxTzX/b4ZZ4oh9NSXblQL8dtPCOomOtZciEHxePR78+uHFLLlsk01A6jVHhHsQZZ/WcIPpnzg=="; }; }; + "menu-string-1.2.0" = { + name = "menu-string"; + packageName = "menu-string"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/menu-string/-/menu-string-1.2.0.tgz"; + sha512 = "b6RTFmSlLjs20Qninl0Wq6dOstjpaPM2pQ63li06pLVTGIIoxjuMRbOmYbGW8l73/AiGNoCK9yXfdfIpLIURPQ=="; + }; + }; "merkle-tree-stream-3.0.3" = { name = "merkle-tree-stream"; packageName = "merkle-tree-stream"; @@ -4612,6 +4585,15 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; + "mime-2.3.1" = { + name = "mime"; + packageName = "mime"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz"; + sha512 = "OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="; + }; + }; "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; @@ -4792,15 +4774,6 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "multicast-dns-6.2.3" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "6.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; - sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; - }; - }; "multicast-dns-7.0.0" = { name = "multicast-dns"; packageName = "multicast-dns"; @@ -4882,13 +4855,13 @@ let sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; }; }; - "nanobus-3.3.0" = { + "nanobus-4.3.3" = { name = "nanobus"; packageName = "nanobus"; - version = "3.3.0"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/nanobus/-/nanobus-3.3.0.tgz"; - sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; + url = "https://registry.npmjs.org/nanobus/-/nanobus-4.3.3.tgz"; + sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw=="; }; }; "nanomatch-1.2.13" = { @@ -4900,13 +4873,22 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; - "nanotiming-1.0.1" = { + "nanoscheduler-1.0.3" = { + name = "nanoscheduler"; + packageName = "nanoscheduler"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoscheduler/-/nanoscheduler-1.0.3.tgz"; + sha512 = "jBbrF3qdU9321r8n9X7yu18DjP31Do2ItJm3mWrt90wJTrnDO+HXpoV7ftaUglAtjgj9s+OaCxGufbvx6pvbEQ=="; + }; + }; + "nanotiming-7.3.1" = { name = "nanotiming"; packageName = "nanotiming"; - version = "1.0.1"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanotiming/-/nanotiming-1.0.1.tgz"; - sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3"; + url = "https://registry.npmjs.org/nanotiming/-/nanotiming-7.3.1.tgz"; + sha512 = "l3lC7v/PfOuRWQa8vV29Jo6TG10wHtnthLElFXs4Te4Aas57Fo4n1Q8LH9n+NDh9riOzTVvb2QNBhTS4JUKNjw=="; }; }; "native-promise-only-0.8.1" = { @@ -4927,13 +4909,40 @@ let sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; }; }; - "neat-log-1.1.2" = { + "neat-input-1.7.0" = { + name = "neat-input"; + packageName = "neat-input"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-input/-/neat-input-1.7.0.tgz"; + sha512 = "oPAF9Js5IVPL6eYxn4vE4mwSuqEKTODnlcWHyv7/BW5RXaRs7QOmjp2eOp2KQ/vLuo3UoEsFcezrfHwSrec+2g=="; + }; + }; + "neat-log-2.4.0" = { name = "neat-log"; packageName = "neat-log"; - version = "1.1.2"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-log/-/neat-log-2.4.0.tgz"; + sha512 = "5Gb0J17bqRxKBfgetrYCZav7kpFgunDhFq0i+kEq5Kn36Cuw4IskIl3yd+/P8jCcAzaKrQ7mrb+p6r/NP5esWA=="; + }; + }; + "neat-spinner-1.0.0" = { + name = "neat-spinner"; + packageName = "neat-spinner"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz"; - sha512 = "LUk9cZY/FakJlQ7OcZaHakNV0AzBwfx9iqU4hwYx7NhVYBjZBeykmcHJD5y+cfVWpyaHdjIYnb+gKTVkS+DlSg=="; + url = "https://registry.npmjs.org/neat-spinner/-/neat-spinner-1.0.0.tgz"; + sha512 = "+T6UtYItDTE1L30g/nLRjP55dFlvldrzCRsn4CrcNHIbhg5JUe0hnOx1DHFViysUC7I1cevBQVjdGJ9ZftY9DA=="; + }; + }; + "neat-tasks-1.1.1" = { + name = "neat-tasks"; + packageName = "neat-tasks"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-tasks/-/neat-tasks-1.1.1.tgz"; + sha512 = "U8HkIv90/lrdNlHVp63PoF3FeuQUvJ6toMX6InqRqpBmQq9iukZRAnq/yCE4Ii6WHZRYa6DEiTH/EGFTZ0rIGg=="; }; }; "needle-2.2.1" = { @@ -4981,13 +4990,13 @@ let sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; }; }; - "nodemon-1.17.5" = { + "nodemon-1.18.2" = { name = "nodemon"; packageName = "nodemon"; - version = "1.17.5"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.5.tgz"; - sha512 = "FG2mWJU1Y58a9ktgMJ/RZpsiPz3b7ge77t/okZHEa4NbrlXGKZ8s1A6Q+C7+JPXohAfcPALRwvxcAn8S874pmw=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.2.tgz"; + sha512 = "FKuvzVurERMgX231T9KexWWWopjd93vapFY8rLn2JlPZ58uCW2s7U8utKElpGUEAqU5Y33///KFza5O9ndVRHQ=="; }; }; "nopt-1.0.10" = { @@ -5575,24 +5584,6 @@ let sha512 = "q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q=="; }; }; - "pump-1.0.3" = { - name = "pump"; - packageName = "pump"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"; - sha512 = "8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw=="; - }; - }; - "pump-2.0.1" = { - name = "pump"; - packageName = "pump"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; - sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; - }; - }; "pump-3.0.0" = { name = "pump"; packageName = "pump"; @@ -5683,15 +5674,6 @@ let sha512 = "nb4fClpzoUY+v1SHrro+9yykN90eMA1rc+xM39tnZ5R3BgFY+J/NxPZ0KuUpishEsvnwou9Fvm2wa3cjeuG7vg=="; }; }; - "random-access-memory-2.4.0" = { - name = "random-access-memory"; - packageName = "random-access-memory"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz"; - sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; - }; - }; "random-access-memory-3.0.0" = { name = "random-access-memory"; packageName = "random-access-memory"; @@ -5881,6 +5863,15 @@ let sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; + "remove-array-items-1.0.0" = { + name = "remove-array-items"; + packageName = "remove-array-items"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-array-items/-/remove-array-items-1.0.0.tgz"; + sha1 = "07bf42cb332f4cf6e85ead83b5e4e896d2326b21"; + }; + }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -6052,13 +6043,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "rxjs-6.2.1" = { + "rxjs-6.2.2" = { name = "rxjs"; packageName = "rxjs"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz"; - sha512 = "OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz"; + sha512 = "0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ=="; }; }; "safe-buffer-5.1.2" = { @@ -6538,15 +6529,6 @@ let sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; }; }; - "status-logger-3.1.1" = { - name = "status-logger"; - packageName = "status-logger"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz"; - sha512 = "dNYazf7T9aD9XMvvP/ZZTL8nzhS1piUfFq7HVDOHFdO2LBnPMqdkS5kaoXjK7gvH/0mT6ZcafuDTSSd7DIVYAA=="; - }; - }; "statuses-1.3.1" = { name = "statuses"; packageName = "statuses"; @@ -6907,15 +6889,6 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; - }; - }; "thunkify-2.1.2" = { name = "thunkify"; packageName = "thunkify"; @@ -7366,13 +7339,13 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "use-3.1.0" = { + "use-3.1.1" = { name = "use"; packageName = "use"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; - sha512 = "6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw=="; + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; "user-home-2.0.0" = { @@ -7420,13 +7393,13 @@ let sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; }; }; - "utp-native-1.7.1" = { + "utp-native-1.7.2" = { name = "utp-native"; packageName = "utp-native"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz"; - sha512 = "FSs76hQZsSsdI4YeePxb5SQoWmHxDRznImGiAN905O1svyHvcoQ3hYptu3Y9hPxRHeB3lHzJR5KRZy0Byj7qqg=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.2.tgz"; + sha512 = "jxNZIa49OXRCFbbqlp0SWsTCasvD9QjumUW85++KMaT21PKMDn6dLl2GsSsf1OsWRI8yKdzXg1OxhNsifPjyEA=="; }; }; "uuid-3.3.2" = { @@ -7591,15 +7564,6 @@ let sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; }; }; - "wrap-ansi-3.0.1" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; - }; - }; "wrap-fn-0.1.5" = { name = "wrap-fn"; packageName = "wrap-fn"; @@ -7708,13 +7672,13 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; - "yauzl-2.9.2" = { + "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; - version = "2.9.2"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"; + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; }; }; "z-schema-3.22.0" = { @@ -7777,7 +7741,7 @@ in sources."@cycle/isolate-3.3.0" sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" - sources."@types/node-10.5.1" + sources."@types/node-10.5.2" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -7907,20 +7871,18 @@ in dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; - version = "13.10.0"; + version = "13.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz"; - sha512 = "H8H6erdvvLjwI6bYu4mgEz5KCaHNmwwzKvBvv+bhX93VEf1J3v0L/6T9IQPCico/veFxNcUSqaDAV9FuZguhCw=="; + url = "https://registry.npmjs.org/dat/-/dat-13.11.3.tgz"; + sha512 = "YOp0II25xNPlD06/RGB5q1x244em2Sh2FdhWECnikZalmOBaujeRRJFfjbd0f5buQfapmebvTT4FVRZTZLB2HQ=="; }; dependencies = [ sources."abstract-random-access-1.1.2" sources."ajv-5.5.2" - (sources."ansi-diff-stream-1.2.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."ansi-align-2.0.0" + sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" + sources."ansi-split-1.0.1" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."ap-0.1.0" @@ -7953,6 +7915,7 @@ in sources."blake2b-2.1.2" sources."blake2b-wasm-1.1.7" sources."body-0.1.0" + sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."buffer-alloc-1.2.0" @@ -7960,13 +7923,17 @@ in sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.0" - sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."chalk-2.4.1" + sources."ci-info-1.1.3" sources."circular-append-file-1.0.1" + sources."cli-boxes-1.0.0" + sources."cli-spinners-1.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" @@ -7977,10 +7944,14 @@ in sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" + sources."configstore-3.1.2" sources."connections-1.4.2" sources."content-types-0.1.0" sources."core-util-is-1.0.2" sources."corsify-2.1.0" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" (sources."dat-dns-3.0.1" // { @@ -7988,12 +7959,7 @@ in sources."debug-2.6.9" ]; }) - (sources."dat-doctor-1.4.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."pump-1.0.3" - ]; - }) + sources."dat-doctor-2.0.0" sources."dat-encoding-5.0.1" sources."dat-ignore-2.1.1" (sources."dat-json-1.0.2" // { @@ -8002,58 +7968,41 @@ in ]; }) sources."dat-link-resolve-2.2.0" - sources."dat-log-1.1.1" - (sources."dat-node-3.5.9" // { - dependencies = [ - (sources."discovery-swarm-5.1.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."pump-1.0.3" - sources."random-access-memory-3.0.0" - ]; - }) + sources."dat-log-1.2.0" + sources."dat-node-3.5.11" sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.0.4" sources."dat-swarm-defaults-1.0.1" sources."debug-3.1.0" sources."deep-equal-0.2.2" + sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" + sources."diffy-2.0.0" sources."directory-index-html-2.1.0" (sources."discovery-channel-5.5.1" // { dependencies = [ sources."debug-2.6.9" - sources."dns-discovery-6.1.0" - sources."lru-2.0.1" - sources."pump-3.0.0" sources."thunky-0.1.0" ]; }) - (sources."discovery-swarm-4.4.2" // { + sources."discovery-swarm-5.1.2" + (sources."dns-discovery-6.1.0" // { dependencies = [ sources."debug-2.6.9" - sources."pump-1.0.3" - ]; - }) - (sources."dns-discovery-5.6.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."dns-packet-1.3.1" - sources."dns-socket-1.6.3" sources."lru-2.0.1" - sources."multicast-dns-6.2.3" ]; }) sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" - sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" + sources."dot-prop-4.2.0" + sources."duplexer3-0.1.4" sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" + sources."execa-0.7.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" sources."extend-3.0.1" @@ -8063,6 +8012,7 @@ in sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-read-stream-1.1.0" + sources."figures-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."flat-tree-1.6.0" @@ -8073,17 +8023,21 @@ in sources."form-data-2.3.2" sources."from2-2.3.0" sources."fs.realpath-1.0.0" + sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."global-4.3.2" + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.17.1" // { + (sources."hypercore-6.17.3" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -8096,20 +8050,19 @@ in ]; }) sources."hyperdrive-9.14.0" - (sources."hyperdrive-http-4.2.2" // { - dependencies = [ - sources."pump-1.0.3" - ]; - }) + sources."hyperdrive-http-4.3.2" sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."inspect-custom-symbol-1.1.0" sources."ip-1.1.5" sources."is-buffer-1.1.6" - sources."is-callable-1.1.3" + sources."is-callable-1.1.4" + sources."is-ci-1.1.0" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -8117,13 +8070,21 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-function-1.0.1" sources."is-glob-2.0.1" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" sources."is-number-2.1.0" + sources."is-obj-1.0.1" sources."is-options-1.0.1" + sources."is-path-inside-1.0.1" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" sources."is-string-1.0.4" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" + sources."isexe-2.0.0" sources."isobject-2.1.0" sources."isstream-0.1.2" sources."iterators-0.1.0" @@ -8143,17 +8104,22 @@ in sources."bencode-2.0.0" ]; }) + sources."keypress-0.2.1" sources."kind-of-3.2.2" sources."last-one-wins-1.0.4" + sources."latest-version-3.1.0" sources."length-prefixed-message-3.0.3" - sources."lodash.flattendeep-4.4.0" sources."lodash.throttle-4.1.1" + sources."lowercase-keys-1.0.1" sources."lru-3.1.0" + sources."lru-cache-4.1.3" + sources."make-dir-1.3.0" sources."math-random-1.0.1" sources."memory-pager-1.1.0" + sources."menu-string-1.2.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-2.3.11" - sources."mime-1.6.0" + sources."mime-2.3.1" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."min-document-2.19.0" @@ -8174,23 +8140,34 @@ in sources."mutexify-1.2.0" sources."nan-2.10.0" sources."nanoassert-1.1.0" - sources."nanobus-3.3.0" - sources."nanotiming-1.0.1" + sources."nanobus-4.3.3" + sources."nanoscheduler-1.0.3" + sources."nanotiming-7.3.1" sources."ncp-1.0.1" - sources."neat-log-1.1.2" + sources."neat-input-1.7.0" + sources."neat-log-2.4.0" + sources."neat-spinner-1.0.0" + sources."neat-tasks-1.1.1" sources."nets-3.2.0" sources."network-address-1.1.2" sources."node-gyp-build-3.4.0" sources."normalize-path-2.1.1" + sources."npm-run-path-2.0.2" sources."oauth-sign-0.8.2" sources."object.omit-2.0.1" sources."once-1.4.0" sources."os-homedir-1.0.2" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" sources."parse-glob-3.0.4" sources."parse-headers-2.0.1" sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" sources."performance-now-2.1.0" + sources."pify-3.0.0" sources."pkginfo-0.4.1" + sources."prepend-http-1.0.4" sources."preserve-0.2.0" sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" @@ -8203,15 +8180,12 @@ in sources."varint-5.0.0" ]; }) - sources."pump-2.0.1" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" sources."punycode-1.4.1" sources."qs-6.5.2" sources."random-access-file-2.0.1" - (sources."random-access-memory-2.4.0" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - ]; - }) + sources."random-access-memory-3.0.0" sources."random-access-storage-1.3.0" (sources."randomatic-3.0.0" // { dependencies = [ @@ -8221,10 +8195,14 @@ in }) sources."randombytes-2.0.6" sources."range-parser-1.2.0" + sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" sources."regex-cache-0.4.4" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."remove-array-items-1.0.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" @@ -8234,6 +8212,11 @@ in sources."rusha-0.8.13" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" (sources."signed-varint-2.0.1" // { dependencies = [ sources."varint-5.0.0" @@ -8251,7 +8234,6 @@ in sources."speedometer-1.1.0" sources."sshpk-1.14.2" sources."stack-trace-0.0.10" - sources."status-logger-3.1.1" sources."stream-collector-1.0.1" sources."stream-each-1.2.2" (sources."stream-parser-0.3.1" // { @@ -8263,15 +8245,18 @@ in sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" (sources."subcommand-2.1.0" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."supports-color-5.4.0" + sources."term-size-1.2.0" sources."throttle-1.0.3" - sources."through2-2.0.3" sources."thunky-1.0.2" + sources."timed-out-4.0.1" sources."to-buffer-1.1.1" (sources."toiletdb-1.4.1" // { dependencies = [ @@ -8286,16 +8271,22 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uint64be-2.0.2" + sources."unique-string-1.0.0" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" sources."untildify-3.0.3" + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.7.1" + sources."utp-native-1.7.2" sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" + sources."which-1.3.1" + sources."widest-line-2.0.0" (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" @@ -8303,11 +8294,13 @@ in sources."pkginfo-0.3.1" ]; }) - sources."wrap-ansi-3.0.1" sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."xhr-2.5.0" sources."xsalsa20-1.0.2" sources."xtend-4.0.1" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -8573,10 +8566,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz"; - sha512 = "16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug=="; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz"; + sha512 = "d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -8660,10 +8653,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.9.0"; + version = "2.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.9.0.tgz"; - sha1 = "1c2f5ade46b87cc3b1f3b7c66eeb7b0f4df4d968"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.11.2.tgz"; + sha1 = "fc7235c2ec82a6ede6caf47485a68a2c6fa2e1f5"; }; buildInputs = globalBuildInputs; meta = { @@ -8830,7 +8823,7 @@ in sources."enable-1.3.2" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."extend-3.0.1" sources."extend-shallow-2.0.1" sources."external-editor-3.0.0" @@ -8963,7 +8956,7 @@ in sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.2.1" + sources."rxjs-6.2.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -9023,7 +9016,7 @@ in sources."xtend-4.0.1" sources."yaml-js-0.0.8" sources."yargs-3.10.0" - sources."yauzl-2.9.2" + sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -9188,7 +9181,7 @@ in sources."encodeurl-1.0.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-stream-3.3.4" sources."execa-0.7.0" @@ -9405,7 +9398,7 @@ in sources."nan-2.10.0" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" - (sources."nodemon-1.17.5" // { + (sources."nodemon-1.18.2" // { dependencies = [ sources."debug-3.1.0" sources."supports-color-5.4.0" @@ -9657,7 +9650,7 @@ in sources."uri-js-3.0.2" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - sources."use-3.1.0" + sources."use-3.1.1" sources."utf8-byte-length-1.0.4" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -9691,10 +9684,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; - sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w=="; + url = "https://registry.npmjs.org/npm/-/npm-6.2.0.tgz"; + sha512 = "GnlNsOnxwVJX4WSfyQY0gY3LnUX2cc46XU0eu1g+WSuZgDRUGmw8tuptitJu6byp0RWGT8ZEAKajblwdhQHN8A=="; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index 7421e2fa0b1af..46453f30d3bf3 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -2,12 +2,7 @@ # This is the original pycaml version with patches from debian. -let debian = fetchurl { - url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82-14.debian.tar.gz"; - sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1"; - }; - -in stdenv.mkDerivation { +stdenv.mkDerivation { name = "pycaml-0.82-14"; srcs = [ diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 50e70d87f9f59..204f7bfc0dfb9 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, isPy33, isPy26, isPy27, isPyPy, python, pycares, asyncio, trollius }: +, isPy33, isPy27, isPyPy, python, pycares, asyncio, trollius }: buildPythonPackage rec { pname = "aiodns"; @@ -10,9 +10,9 @@ buildPythonPackage rec { sha256 = "d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea"; }; - propagatedBuildInputs = with stdenv.lib; [ pycares ] - ++ optional isPy33 asyncio - ++ optional (isPy26 || isPy27 || isPyPy) trollius; + propagatedBuildInputs = with stdenv.lib; [ pycares ] + ++ optional isPy33 asyncio + ++ optional (isPy27 || isPyPy) trollius; checkPhase = '' ${python.interpreter} tests.py diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 274fa0fbbf273..8e75f1f3d8deb 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,5 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest, glibcLocales, vega, pandas, ipython, traitlets }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +, pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales +, entrypoints, jsonschema, numpy, pandas, six, toolz, typing }: buildPythonPackage rec { pname = "altair"; @@ -10,18 +11,19 @@ buildPythonPackage rec { sha256 = "e8b222588dde98ec614e6808357fde7fa321118db44cc909df2bf30158d931c0"; }; - postPatch = '' - sed -i "s/vega==/vega>=/g" setup.py - ''; + patches = fetchpatch { + url = https://github.com/altair-viz/altair/commit/bfca8aecce9593c48aa5834e3f8f841deb58391c.patch; + sha256 = "01izc5d8c6ry3mh0k0hfasb6jc4720g75yw2qdlp9ja8mnjsp4k3"; + }; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales ]; checkPhase = '' export LANG=en_US.UTF-8 py.test altair --doctest-modules ''; - propagatedBuildInputs = [ vega pandas ipython traitlets ]; + propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz typing ]; meta = with stdenv.lib; { description = "A declarative statistical visualization library for Python."; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix new file mode 100644 index 0000000000000..c42ad6f1d6c90 --- /dev/null +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi +, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: + +buildPythonPackage rec { + version = "0.12.0"; + pname = "aws-adfs"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cjrm61k6905dmhgrqyc5caxx5hbhj3sr6cx4r6sbdyz453i7pc6"; + }; + + # Relax version constraint + patchPhase = '' + sed -i 's/coverage < 4/coverage/' setup.py + ''; + + # Test suite writes files to $HOME/.aws/, or /homeless-shelter if unset + HOME = "."; + + # Required for python3 tests, along with glibcLocales + LC_ALL = "en_US.UTF-8"; + + checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; + propagatedBuildInputs = [ lxml boto3 requests click configparser ]; + + meta = { + description = "Command line tool to ease aws cli authentication against ADFS"; + homepage = https://github.com/venth/aws-adfs; + license = lib.licenses.psfl; + maintainers = [ lib.maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 5ffa51def0d27..e83fd4163e4a7 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchPypi, buildPythonPackage, pythonOlder -, pyperclip, six, pyparsing, vim +{ stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k +, pyperclip, six, pyparsing, vim, wcwidth, colorama , contextlib2 ? null, subprocess32 ? null , pytest, mock, which, fetchFromGitHub, glibcLocales }: buildPythonPackage rec { pname = "cmd2"; - version = "0.8.0"; + version = "0.9.1"; - src = fetchFromGitHub { - owner = "python-cmd2"; - repo = "cmd2"; - rev = version; - sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z"; + src = fetchPypi { + inherit pname version; + sha256 = "1wpw4f9zix30hfncm0hwxjjdx78zq26x3r8s9nvsq9vnxf41xb49"; }; LC_ALL="en_US.UTF-8"; @@ -31,14 +29,16 @@ buildPythonPackage rec { py.test -k 'not test_path_completion_user_expansion' ''; doCheck = !stdenv.isDarwin; + disabled = !isPy3k; propagatedBuildInputs = [ + colorama pyperclip six pyparsing + wcwidth ] ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 - ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32 ; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix new file mode 100644 index 0000000000000..5ffa51def0d27 --- /dev/null +++ b/pkgs/development/python-modules/cmd2/old.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchPypi, buildPythonPackage, pythonOlder +, pyperclip, six, pyparsing, vim +, contextlib2 ? null, subprocess32 ? null +, pytest, mock, which, fetchFromGitHub, glibcLocales +}: +buildPythonPackage rec { + pname = "cmd2"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "python-cmd2"; + repo = "cmd2"; + rev = version; + sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z"; + }; + + LC_ALL="en_US.UTF-8"; + + postPatch = stdenv.lib.optional stdenv.isDarwin '' + # Fake the impure dependencies pbpaste and pbcopy + mkdir bin + echo '#/bin/sh' > bin/pbpaste + echo '#/bin/sh' > bin/pbcopy + chmod +x bin/{pbcopy,pbpaste} + export PATH=$(realpath bin):$PATH + ''; + + checkInputs= [ pytest mock which vim glibcLocales ]; + checkPhase = '' + # test_path_completion_user_expansion might be fixed in the next release + py.test -k 'not test_path_completion_user_expansion' + ''; + doCheck = !stdenv.isDarwin; + + propagatedBuildInputs = [ + pyperclip + six + pyparsing + ] + ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 + ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32 + ; + + meta = with stdenv.lib; { + description = "Enhancements for standard library's cmd module"; + homepage = https://github.com/python-cmd2/cmd2; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index e17bd38da02b5..906e2c0bbe4a7 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include ''; + # https://github.com/cvxopt/cvxopt/issues/122 + # This is fixed on staging (by #43234, status 2018-07-15), but until that + # lands we should disable the tests. Otherwise the 99% of use cases that + # should be unaffected by that failure are affected. + doCheck = false; checkPhase = '' ${python.interpreter} -m unittest discover -s tests ''; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index f207683d2b0b0..8f3f331fd5097 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy +{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy , ncurses, pygobject3 }: if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { @@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus dbus-glib ] - ++ lib.optionals doCheck [ dbus_tools pygobject3 ] + ++ lib.optionals doCheck [ dbus.out pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. ++ lib.optional (! python ? modules) ncurses; diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index ba84d80dd0bef..535fe05b43880 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -1,9 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy26 -, importlib -, argparse }: buildPythonPackage rec { @@ -15,7 +12,6 @@ buildPythonPackage rec { sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; }; - propagatedBuildInputs = lib.optionals isPy26 [ importlib argparse ]; doCheck = false; meta = { diff --git a/pkgs/development/python-modules/graphite-api/default.nix b/pkgs/development/python-modules/graphite-api/default.nix new file mode 100644 index 0000000000000..7f1726a2c4b9e --- /dev/null +++ b/pkgs/development/python-modules/graphite-api/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage, fetchFromGitHub, lib, flask, flask-caching, cairocffi, pyparsing, pytz, pyyaml +, raven, six, structlog, tzlocal, nose, mock, cairo, isPyPy +}: + +buildPythonPackage rec { + pname = "graphite-api"; + version = "1.1.3"; + + disabled = isPyPy; + + src = fetchFromGitHub { + owner = "brutasse"; + repo = "graphite-api"; + rev = version; + sha256 = "0sz3kav2024ms2z4q03pigcf080gsr5v774z9bp3zw29k2p47ass"; + }; + + # https://github.com/brutasse/graphite-api/pull/239 rebased onto 1.1.3 + patches = [ ./flask-caching-rebased.patch ]; + + checkPhase = "nosetests"; + + propagatedBuildInputs = [ + flask + flask-caching + cairocffi + pyparsing + pytz + pyyaml + raven + six + structlog + tzlocal + ]; + + checkInputs = [ nose mock ]; + + LD_LIBRARY_PATH = "${cairo.out}/lib"; + + meta = with lib; { + description = "Graphite-web, without the interface. Just the rendering HTTP API"; + homepage = https://github.com/brutasse/graphite-api; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch new file mode 100644 index 0000000000000..2d4a2f29bc438 --- /dev/null +++ b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch @@ -0,0 +1,132 @@ +diff --git a/graphite_api/config.py b/graphite_api/config.py +index 5e1e382..dc033a8 100644 +--- a/graphite_api/config.py ++++ b/graphite_api/config.py +@@ -112,11 +112,11 @@ def configure(app): + app.cache = None + if 'cache' in config: + try: +- from flask.ext.cache import Cache ++ from flask_caching import Cache + except ImportError: + warnings.warn("'cache' is provided in the configuration but " +- "Flask-Cache is not installed. Please `pip install " +- "Flask-Cache`.") ++ "flask-caching is not installed. Please `pip " ++ "install flask-caching`.") + else: + cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60, + 'CACHE_KEY_PREFIX': 'graphite-api:'} +diff --git a/requirements.txt b/requirements.txt +index c68b446..7826b0c 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,5 +1,5 @@ + Flask +-Flask-Cache ++Flask-Caching + cairocffi + pyparsing>=1.5.7 + pytz +diff --git a/setup.py b/setup.py +index 0337cbe..df07989 100644 +--- a/setup.py ++++ b/setup.py +@@ -38,7 +38,7 @@ setup( + extras_require={ + 'sentry': ['raven[flask]'], + 'cyanite': ['cyanite'], +- 'cache': ['Flask-Cache'], ++ 'cache': ['Flask-Caching'], + 'statsd': ['statsd'], + }, + zip_safe=False, +diff --git a/tests/test_render.py b/tests/test_render.py +index be5609d..a0e7190 100644 +--- a/tests/test_render.py ++++ b/tests/test_render.py +@@ -8,7 +8,7 @@ from graphite_api._vendor import whisper + from . import TestCase, WHISPER_DIR + + try: +- from flask.ext.cache import Cache ++ from flask_caching import Cache + except ImportError: + Cache = None + +diff --git a/tox.ini b/tox.ini +index 85a0abb..c820393 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -47,7 +47,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + mock + +@@ -56,7 +56,7 @@ basepython = python3.3 + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + + [testenv:py34] +@@ -66,7 +66,7 @@ commands = + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + + [testenv:py35] +@@ -76,7 +76,7 @@ commands = + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + + [testenv:pyparsing1] +@@ -84,7 +84,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing==1.5.7 + mock + +@@ -93,7 +93,7 @@ basepython = pypy + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + mock + +@@ -102,7 +102,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask<0.9 +- Flask-Cache ++ Flask-Caching + pyparsing + mock + +@@ -111,7 +111,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask<0.10 +- Flask-Cache ++ Flask-Caching + pyparsing + mock + diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index e53989bcbcfd1..1846c7bcd8967 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, lib -, six, protobuf, enum34, futures, isPy26, isPy27, isPy34 }: +, six, protobuf, enum34, futures, isPy27, isPy34 }: buildPythonPackage rec { pname = "grpcio"; @@ -11,8 +11,8 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six protobuf ] - ++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ] - ++ lib.optionals (isPy26 || isPy27) [ futures ]; + ++ lib.optionals (isPy27 || isPy34) [ enum34 ] + ++ lib.optionals (isPy27) [ futures ]; meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix index 8afe6379dc7c8..d572b10fd625a 100644 --- a/pkgs/development/python-modules/gurobipy/linux.nix +++ b/pkgs/development/python-modules/gurobipy/linux.nix @@ -1,10 +1,7 @@ { fetchurl, python }: assert python.pkgs.isPy27; -let utf = - if python.ucsEncoding == 2 then "16" - else if python.ucsEncoding == 4 then "32" - else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}"; -in python.pkgs.buildPythonPackage + +python.pkgs.buildPythonPackage { pname = "gurobipy"; version = "7.5.2"; src = fetchurl diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix new file mode 100644 index 0000000000000..25c3c901a4efa --- /dev/null +++ b/pkgs/development/python-modules/image-match/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, dask, scikitimage, six }: + +buildPythonPackage { + pname = "image-match"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "ascribe"; + repo = "image-match"; + rev = "1c5f3170555540bdf43ff8b8189c4e8c13a8b950"; + sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5"; + }; + + buildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ + scikitimage + ]; + + # remove elasticsearch requirement due to version incompatibility + postPatch = '' + substituteInPlace setup.py --replace "'elasticsearch>=5.0.0,<6.0.0'," "" + ''; + + # tests cannot work without elasticsearch + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ascribe/image-match; + description = "Quickly search over billions of images"; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 4a937ac94f098..2fc66e810d061 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,7 +3,8 @@ buildPythonPackage rec { pname = "libarcus"; - version = "3.3.0"; + version = "3.4.1"; + format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 0be0f892d731b..9aabd6d94e2ca 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, libmysql }: +{ stdenv, buildPythonPackage, fetchPypi, mysql }: buildPythonPackage rec { pname = "mysqlclient"; version = "1.3.12"; buildInputs = [ - libmysql + mysql.connector-c ]; # Tests need a MySQL database diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix new file mode 100644 index 0000000000000..4183f30caad94 --- /dev/null +++ b/pkgs/development/python-modules/parsy/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest }: + +buildPythonPackage rec { + pname = "parsy"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mdqg07x5ybmbmj55x75gyhfcjrn7ml0cf3z0jwbskx845j31m6x"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test test/ + ''; + + disabled = pythonOlder "3.4"; + + meta = with lib; { + homepage = https://github.com/python-parsy/parsy; + description = "Easy-to-use parser combinators, for parsing in pure Python"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ aepsil0n ]; + }; +} diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 3b15e7a30279f..2d1f707a8ebd8 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy26 +{ stdenv, buildPythonPackage, fetchFromGitHub , glibcLocales, pandoc, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "pelican"; version = "3.7.1"; - disabled = isPy26; src = fetchFromGitHub { owner = "getpelican"; diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix new file mode 100644 index 0000000000000..845630e514fac --- /dev/null +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchpatch +, buildPythonPackage, fetchPypi, isPy3k, pythonOlder +, beautifulsoup4, lxml, cssutils, future, enum34, six +}: + +buildPythonPackage rec { + pname = "pycaption"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f2hx9ky65c4niws3x5yx59yi8mqqrw9b2cghd220g4hj9yl800h"; + }; + + disabled = !isPy3k; + + prePatch = '' + substituteInPlace setup.py \ + --replace 'beautifulsoup4>=4.2.1,<4.5.0' \ + 'beautifulsoup4>=4.2.1,<=4.6.0' + ''; + + # don't require enum34 on python >= 3.4 + patches = [ + (fetchpatch { + url = "https://github.com/pbs/pycaption/pull/161.patch"; + sha256 = "0p58awpsqx1qc3x9zfl1gd85h1nk7204lzn4kglsgh1bka0j237j"; + }) + ]; + + propagatedBuildInputs = [ beautifulsoup4 lxml cssutils future enum34 six ]; + + # Tests not included in pypi (?) + doCheck = false; + + meta = with lib; { + description = "Closed caption converter"; + homepage = https://github.com/pbs/pycaption; + license = with licenses; [ asl20 ]; + }; +} diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 0efb77d27b3ea..a747d42e418aa 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: +{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus, makeWrapper }: let pname = "PyQt-x11-gpl"; @@ -42,7 +42,7 @@ in buildPythonPackage { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper qt4 lndir dbus_libs ]; + buildInputs = [ makeWrapper qt4 lndir dbus ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index b669c14564160..ebad81f809b58 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,5 +1,5 @@ { lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper -, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs +, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus , withWebSockets ? false, qtwebsockets , withConnectivity ? false, qtconnectivity }: @@ -32,7 +32,7 @@ in buildPythonPackage { nativeBuildInputs = [ pkgconfig qmake lndir ]; - buildInputs = [ dbus_libs ]; + buildInputs = [ dbus ]; propagatedBuildInputs = [ sip qtbase qtsvg qtwebkit qtwebengine @@ -53,7 +53,7 @@ in buildPythonPackage { ${python.executable} configure.py -w \ --confirm-license \ - --dbus=${dbus_libs.dev}/include/dbus-1.0 \ + --dbus=${dbus.dev}/include/dbus-1.0 \ --no-qml-plugin \ --bindir=$out/bin \ --destdir=$out/${python.sitePackages} \ diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 3290fb74fa182..4784e46ffb21a 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { }; postPatch = '' - sed -e 's!"libpcsclite\.so\.1"!"${pcsclite}/lib/libpcsclite.so.1"!' \ + sed -e 's!"libpcsclite\.so\.1"!"${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1"!' \ -i smartcard/scard/winscarddll.c ''; - NIX_CFLAGS_COMPILE = "-isystem ${pcsclite}/include/PCSC/"; + NIX_CFLAGS_COMPILE = "-isystem ${stdenv.lib.getDev pcsclite}/include/PCSC/"; propagatedBuildInputs = [ pcsclite ]; buildInputs = [ swig ] ++ stdenv.lib.optional stdenv.isDarwin PCSC; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index d8d22ced974ec..b5a8cc252b975 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py +{ stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock }: @@ -19,8 +19,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] - ++ (stdenv.lib.optional (!isPy3k) funcsigs) - ++ (stdenv.lib.optional isPy26 argparse); + ++ (stdenv.lib.optional (!isPy3k) funcsigs); checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix new file mode 100644 index 0000000000000..c072b661cc42a --- /dev/null +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, nose +, pytest +, numpy +}: + +buildPythonPackage rec { + pname = "PyWavelets"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce36e2f0648ea1781490b09515363f1f64446b0eac524603e5db5e180113bed9"; + }; + + checkInputs = [ nose pytest ]; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy ]; + + # Somehow nosetests doesn't run the tests, so let's use pytest instead + checkPhase = '' + py.test pywt/tests + ''; + + meta = { + description = "Wavelet transform module"; + homepage = https://github.com/PyWavelets/pywt; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix new file mode 100644 index 0000000000000..6ac3ab5ddb9de --- /dev/null +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchPypi +, buildPythonPackage +, cython +, numpy +, scipy +, matplotlib +, networkx +, six +, pillow +, pywavelets +, dask +, cloudpickle +, nose +, pytest +}: + +buildPythonPackage rec { + pname = "scikit-image"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "325f75eb80fbc5371136e37f323445309ca9f65b6c6f718d0d0e2189e5de1224"; + }; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy scipy matplotlib networkx six pillow pywavelets dask cloudpickle ]; + + checkInputs = [ pytest ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "Image processing routines for SciPy"; + homepage = http://scikit-image.org; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix new file mode 100644 index 0000000000000..981b6693f7d47 --- /dev/null +++ b/pkgs/development/python-modules/simpy/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchPypi, lib }: + +buildPythonPackage rec { + pname = "simpy"; + version = "3.0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hqgxk3lggf21jq9lh8838cdl24mdkdnpzh0w4m28d0zn2wjb5nh"; + }; + + meta = with lib; { + homepage = https://simpy.readthedocs.io/en/latest/; + description = "A process-based discrete-event simulation framework based on standard Python."; + license = [ licenses.mit ]; + maintainers = with maintainers; [ shlevy ]; + }; +} diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 9a6a3c39eec1f..0f96b100435a9 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,11 +1,13 @@ { lib, fetchPypi, buildPythonPackage, - protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp + protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp, isPy3k }: buildPythonPackage rec { pname = "trezor"; version = "0.9.1"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4"; diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index 7b61633a7fc78..6d43aa8da8698 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -1,17 +1,14 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, isPy26, isPyPy, mock, futures }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, isPyPy, mock, futures }: buildPythonPackage rec { pname = "trollius"; version = "1.0.4"; - name = "${pname}-${version}"; - - disabled = isPy26; src = fetchPypi { inherit pname version; sha256 = "0xny8y12x3wrflmyn6xi8a7n3m3ac80fgmgzphx5jbbaxkjcm148"; }; - buildInputs = [ mock ]; + checkInputs = [ mock ]; propagatedBuildInputs = lib.optionals (isPy27 || isPyPy) [ futures ]; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 7be8f01f23c86..276ed481601c1 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "3.3.0"; + version = "3.4.1"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1rg0l2blndnbdfcgkjc2r29cnjdm009rz8lnc225ilh9d7w1srbb"; + sha256 = "1r6d65c9xfkn608k6wv3dprpks5h8g2v9mi4a67ifpzyw4y3f0rk"; }; disabled = pythonOlder "3.5.0"; diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix new file mode 100644 index 0000000000000..a7b6c6865cca0 --- /dev/null +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pandas, pytest }: + +buildPythonPackage rec { + pname = "vega_datasets"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fa672ba89ded093b30c6d59fce10aca3ac7c927df254e588da7b6d14f695181"; + }; + + propagatedBuildInputs = [ pandas ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test vega_datasets --doctest-modules + ''; + + meta = with lib; { + description = "A Python package for offline access to vega datasets"; + homepage = https://github.com/altair-viz/vega_datasets; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix new file mode 100644 index 0000000000000..fa993c593e1ad --- /dev/null +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, buildPythonPackage }: + +buildPythonPackage rec { + name = "wcwidth-${version}"; + version = "0.1.7"; + + src = fetchurl { + url = "mirror://pypi/w/wcwidth/${name}.tar.gz"; + sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx"; + }; + + # Checks fail due to missing tox.ini file: + doCheck = false; + + meta = with stdenv.lib; { + description = "Measures number of Terminal column cells of wide-character codes"; + longDescription = '' + This API is mainly for Terminal Emulator implementors -- any Python + program that attempts to determine the printable width of a string on + a Terminal. It is implemented in python (no C library calls) and has + no 3rd-party dependencies. + ''; + homepage = https://github.com/jquast/wcwidth; + license = licenses.mit; + }; + } diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index f8f933b96abb1..79f6ddca5434f 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -15,7 +15,8 @@ buildPythonPackage rec { sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19"; }; - patches = [ ./skip-broken-test.patch ]; + patches = [ ./skip-broken-test.patch ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; diff --git a/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch new file mode 100644 index 0000000000000..6b3d3266b21b3 --- /dev/null +++ b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch @@ -0,0 +1,24 @@ +From 43fd87037be1c98b6afa20f179f2e2d8ef5491ba Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Fri, 20 Jul 2018 10:07:22 -0500 +Subject: [PATCH] remove test that fails w/musl (setlocale() always succeeds) + +--- + ZConfig/tests/test_datatypes.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/ZConfig/tests/test_datatypes.py b/ZConfig/tests/test_datatypes.py +index 7c8d80c..addecd2 100644 +--- a/ZConfig/tests/test_datatypes.py ++++ b/ZConfig/tests/test_datatypes.py +@@ -229,7 +229,6 @@ class DatatypeTestCase(unittest.TestCase): + convert = self.types.get("locale") + # Python supports "C" even when the _locale module is not available + self.assertEqual(convert("C"), "C") +- self.assertRaises(ValueError, convert, "locale-does-not-exist") + + def test_datatype_port(self): + convert = self.types.get("port-number") +-- +2.18.0 + diff --git a/pkgs/development/ruby-modules/testing/stubs.nix b/pkgs/development/ruby-modules/testing/stubs.nix index 3585681478c86..7e6d1102f6669 100644 --- a/pkgs/development/ruby-modules/testing/stubs.nix +++ b/pkgs/development/ruby-modules/testing/stubs.nix @@ -1,8 +1,5 @@ { stdenv, lib, ruby, callPackage, ... }: let - real = { - inherit (stdenv) mkDerivation; - }; mkDerivation = {name, ...}@argSet: derivation { inherit name; diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index bf1d1357f5e75..d2c27b9f4853e 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = http://www.clarkware.com/software/JDepend.html; license = licenses.bsd3; platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index e35b000504199..ff2b4d3b54f54 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -7,16 +7,26 @@ , radare2 , python3 }: - +let + r2 = radare2.overrideDerivation (o: { + name = "radare2-for-cutter-${version}"; + src = fetchFromGitHub { + owner = "radare"; + repo = "radare2"; + rev = "a98557bfbfa96e9f677a8c779ee78085ee5a23bb"; + sha256 = "04jl1lq3dqljb6vagzlym4wc867ayhx1v52f75rkfz0iybsh249r"; + }; + }); + version = "1.6"; +in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.5"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0xwls8jhhigdkwyq3nf9xwcz4inm5smwinkyliwmfzvfflbbci5c"; + sha256 = "1ps52yf94yfnws3nn1iiwch2jy33dyvi7j47xkmh0m5fpdqi5xk7"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; @@ -31,7 +41,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ qmake pkgconfig ]; - buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; + buildInputs = [ qtbase qtsvg qtwebengine r2 python3 ]; qmakeFlags = [ "CONFIG+=link_pkgconfig" diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 1da6c6a1e8648..1ecdd9f32ce5c 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -8,14 +8,23 @@ stdenv.mkDerivation rec { sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7"; }; + patchPhase = '' + sed -i '1s;^;#include <unistd.h>\n;' src/objects/tool_object.cpp + sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_config.cpp + sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_config.cpp + sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_utils.cpp + sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_utils.cpp + ''; + buildInputs = [ qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.valgrind.org/; description = "Qt4-based GUI for the Valgrind 3.6.x series"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - broken = true; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 9b18bcb25616b..953a10ca47ab7 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,14 +1,14 @@ { stdenv, binutils, cmake, zlib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2018-05-22"; + version = "2018-06-15"; name = "bloaty-${version}"; src = fetchFromGitHub { owner = "google"; repo = "bloaty"; - rev = "054788b091ccfd43b05b9817062139145096d440"; - sha256 = "0pmv66137ipzsjjdz004n61pz3aipjhh3b0w0y1406clqpwkvpjm"; + rev = "bdbb3ce196c86d2154f5fba99b5ff73ca43446a9"; + sha256 = "1r7di2p8bi12jpgl6cm4ygi1s0chv767mdcavc7pb45874vl02fx"; fetchSubmodules = true; }; @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = "ctest"; - installPhase = '' install -Dm755 {.,$out/bin}/bloaty ''; diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index 7fa39ef216278..69f467f577c86 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -65,8 +65,9 @@ stdenv.mkDerivation rec { ]; buildPhase = '' + export TMPDIR=/tmp/.bazel-$UID ./compile.sh - ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ + ./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \ --spawn_strategy=standalone \ --genrule_strategy=standalone cp bazel-bin/scripts/bazel-complete.bash output/ diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index a98c2b4e04bde..52fec3f131b9b 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "bazel-buildtools"; + name = "bazel-buildtools-unstable-${version}"; version = "2018-05-24"; goPackagePath = "github.com/bazelbuild/buildtools"; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 28214e94c7aa0..b59a93d373248 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused +{ stdenv, lib, fetchurl, runCommand, makeWrapper +, jdk, zip, unzip, bash, writeCBin, coreutils +, which, python, gnused, gnugrep, findutils # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -6,9 +8,25 @@ , libcxx, CoreFoundation, CoreServices, Foundation }: +let + srcDeps = stdenv.lib.singleton ( + fetchurl { + url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"; + sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b"; + } + ); + + distDir = runCommand "bazel-deps" {} '' + mkdir -p $out + for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done + ''; + + defaultShellPath = lib.makeBinPath [ bash coreutils findutils gnugrep gnused which ]; + +in stdenv.mkDerivation rec { - version = "0.13.0"; + version = "0.15.1"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -22,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "143nd9dmw2x88azf8spinl2qnvw9m8lqlqc765l9q2v6hi807sc2"; + sha256 = "0v7wdwbxy4bcx488lm1glf4iv3wfdwbkg8fh6kmmmfn1lhgkaay6"; }; sourceRoot = "."; @@ -41,7 +59,7 @@ stdenv.mkDerivation rec { int main(int argc, char *argv[]) { char *path = getenv("PATH"); - char *pathToAppend = "${lib.makeBinPath [ coreutils gnused ]}"; + char *pathToAppend = "${defaultShellPath}"; char *newPath; if (path != NULL) { int length = strlen(path) + 1 + strlen(pathToAppend) + 1; @@ -67,6 +85,9 @@ stdenv.mkDerivation rec { # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ --replace /bin/sh ${customBash}/bin/bash + + echo "build --experimental_distdir=${distDir}" >> .bazelrc + echo "fetch --experimental_distdir=${distDir}" >> .bazelrc echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc @@ -75,6 +96,15 @@ stdenv.mkDerivation rec { sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + + # --experimental_strict_action_env (which will soon become the + # default, see bazelbuild/bazel#2574) hardcodes the default + # action environment to a value that on NixOS at least is bogus. + # So we hardcode it to something useful. + substituteInPlace \ + src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \ + --replace /bin:/usr/bin ${defaultShellPath} + patchShebangs . ''; @@ -96,9 +126,9 @@ stdenv.mkDerivation rec { # Change this to $(mktemp -d) as soon as we figure out why. buildPhase = '' - export TMPDIR=/tmp + export TMPDIR=/tmp/.bazel-$UID ./compile.sh - ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ + ./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \ --spawn_strategy=standalone \ --genrule_strategy=standalone cp bazel-bin/scripts/bazel-complete.bash output/ @@ -126,7 +156,7 @@ stdenv.mkDerivation rec { # Save paths to hardcoded dependencies so Nix can detect them. postFixup = '' mkdir -p $out/nix-support - echo "${customBash} ${gnused} ${coreutils}" > $out/nix-support/depends + echo "${customBash} ${defaultShellPath}" > $out/nix-support/depends ''; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 5d486f47844eb..9fdecaabfd8ee 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "buck-${version}"; - version = "v2017.10.01.01"; + name = "buck-unstable-${version}"; + version = "2017-10-01"; src = fetchFromGitHub { owner = "facebook"; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 438aa81a9d0a3..ed0928febe296 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, fetchpatch, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , majorVersion ? "3.11" # darwin attributes @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { # Don't search in non-Nix locations such as /usr, but do search in our libc. patches = [ ./search-path-3.9.patch ] + ++ optional (versionOlder version "3.12") (fetchpatch { + name = "cmake-3.11-libuv-1.21.patch"; + url = https://gitlab.kitware.com/cmake/cmake/commit/889033b5c6847cf1f7bd789384405d59dc333bf6.patch; + sha256 = "0683zbyb3bicaxqzrj4wgdan6x08k30m20kkmpjvw30nr6a8r6xq"; + }) # Don't depend on frameworks. ++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch # TODO: remove conditional ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix index e6ec8c2a80ce3..c6ed406840d29 100644 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -22,10 +22,10 @@ in python3Packages.buildPythonApplication { doCheck = false; checkPhase = "py.test"; - meta = { + meta = with stdenv.lib; { homepage = http://pydoit.org/; description = "A task management & automation tool"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; longDescription = '' doit is a modern open-source build-tool written in python designed to be simple to use and flexible to deal with complex @@ -33,6 +33,7 @@ in python3Packages.buildPythonApplication { custom work-flows where there is no out-of-the-box solution available. ''; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f810f97ef4979..f5ca69e59c840 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.8.1"; + name = "gradle-4.9"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0wgdf1iv0izi957hay1xfsk5xnl6s2vx5dammcwy8say9fclscxg"; + sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6"; }; }; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 04555f58884ba..ff6dc07ea9e96 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,19 +3,19 @@ tree, fetchFromGitHub, hexRegistrySnapshot }: let - version = "3.4.3"; + version = "3.6.1"; bootstrapper = ./rebar3-nix-bootstrap; erlware_commons = fetchHex { pkg = "erlware_commons"; - version = "1.0.0"; - sha256 = "0wkphbrjk19lxdwndy92v058qwcaz13bcgdzp33h21aa7vminzx7"; + version = "1.2.0"; + sha256 = "149kkn9gc9cjgvlmakygq475r63q2rry31s29ax0s425dh37sfl7"; }; ssl_verify_fun = fetchHex { pkg = "ssl_verify_fun"; - version = "1.1.2"; - sha256 = "0qdyx70v09fydv4wzz1djnkixqj62ny40yjjhv2q6mh47lns2arj"; + version = "1.1.3"; + sha256 = "1zljxashfhqmiscmf298vhr880ppwbgi2rl3nbnyvsfn0mjhw4if"; }; certifi = fetchHex { pkg = "certifi"; @@ -24,23 +24,23 @@ let }; providers = fetchHex { pkg = "providers"; - version = "1.6.0"; - sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g"; + version = "1.7.0"; + sha256 = "19p4rbsdx9lm2ihgvlhxyld1q76kxpd7qwyqxxsgmhl5r8ln3rlb"; }; getopt = fetchHex { pkg = "getopt"; - version = "0.8.2"; - sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk"; + version = "1.0.1"; + sha256 = "174mb46c2qd1f4a7507fng4vvscjh1ds7rykfab5rdnfp61spqak"; }; bbmustache = fetchHex { pkg = "bbmustache"; - version = "1.3.0"; - sha256 = "042pfgss8kscq6ssg8gix8ccmdsrx0anjczsbrn2a6c36ljrx2p6"; + version = "1.5.0"; + sha256 = "0xg3r4lxhqifrv32nm55b4zmkflacc1s964g15p6y6jfx6v4y1zd"; }; relx = fetchHex { pkg = "relx"; - version = "3.23.1"; - sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d"; + version = "3.26.0"; + sha256 = "1f810rb01kdidpa985s321ycg3y4hvqpzbk263n6i1bfnqykkvv9"; }; cf = fetchHex { pkg = "cf"; @@ -49,13 +49,13 @@ let }; cth_readable = fetchHex { pkg = "cth_readable"; - version = "1.3.0"; - sha256 = "1s7bqj6f2zpbyjmbfq2mm6vcz1jrxjr2nd0531wshsx6fnshqhvs"; + version = "1.4.2"; + sha256 = "1pjid4f60pp81ds01rqa6ybksrnzqriw3aibilld1asn9iabxkav"; }; eunit_formatters = fetchHex { pkg = "eunit_formatters"; - version = "0.3.1"; - sha256 = "0cg9dasv60v09q3q4wja76pld0546mhmlpb0khagyylv890hg934"; + version = "0.5.0"; + sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n"; }; rebar3_hex = fetchHex { pkg = "rebar3_hex"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "1a05gpxxc3mx5v33kzpb5xnq5vglmjl0q8hrcvpinjlazcwbg531"; + sha256 = "0cqhqymzh10pfyxqiy4hcg3d2myz3chx0y4m2ixmq8zk81acics0"; }; inherit bootstrapper; @@ -121,6 +121,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.gleber ]; + maintainers = with stdenv.lib.maintainers; [ gleber tazjin ]; }; } diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch index db45827f58318..59004561126c1 100644 --- a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch +++ b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch @@ -1,5 +1,5 @@ diff --git a/bootstrap b/bootstrap -index 7c56bab..16c1be5 100755 +index 5dedd713..864056c4 100755 --- a/bootstrap +++ b/bootstrap @@ -101,7 +101,7 @@ extract(Binary) -> @@ -12,9 +12,8 @@ index 7c56bab..16c1be5 100755 [{body_format, binary}], rebar) of diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl -new file mode 100644 -index 0000000..8f6cc7d ---- /dev/null +index e69de29b..8f6cc7d0 100644 +--- a/src/rebar_hermeticity.erl +++ b/src/rebar_hermeticity.erl @@ -0,0 +1,42 @@ +%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- @@ -60,20 +59,20 @@ index 0000000..8f6cc7d + ?ERROR("Request: ~p ~s", [Method, Url]), + erlang:halt(1). diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl -index d588f24..9ac8ad4 100644 +index 2cf167ee..6080aaca 100644 --- a/src/rebar_pkg_resource.erl +++ b/src/rebar_pkg_resource.erl -@@ -109,7 +109,7 @@ make_vsn(_) -> +@@ -127,7 +127,7 @@ make_vsn(_) -> request(Url, ETag) -> - HttpOptions = [{ssl, ssl_opts(Url)}, {relaxed, true} | rebar_utils:get_proxy_auth()], - -- case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]}, -+ case rebar_hermeticity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]}, - HttpOptions, - [{body_format, binary}], - rebar) of + HttpOptions = [{ssl, ssl_opts(Url)}, + {relaxed, true} | rebar_utils:get_proxy_auth()], +- case httpc:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""} ++ case rebar_hermeticity:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""} + || ETag =/= false] ++ + [{"User-Agent", rebar_utils:user_agent()}]}, + HttpOptions, [{body_format, binary}], rebar) of diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl -index a019c5a..697cbab 100644 +index 17446311..4d44d794 100644 --- a/src/rebar_prv_update.erl +++ b/src/rebar_prv_update.erl @@ -38,6 +38,8 @@ init(State) -> @@ -85,17 +84,17 @@ index a019c5a..697cbab 100644 do(State) -> try case rebar_packages:registry_dir(State) of -@@ -52,7 +54,7 @@ do(State) -> - case rebar_utils:url_append_path(CDN, ?REMOTE_REGISTRY_FILE) of +@@ -53,7 +55,7 @@ do(State) -> {ok, Url} -> + HttpOptions = [{relaxed, true} | rebar_utils:get_proxy_auth()], ?DEBUG("Fetching registry from ~p", [Url]), - case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, + case rebar_hermeticity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, - [], [{stream, TmpFile}, {sync, true}], + HttpOptions, [{stream, TmpFile}, {sync, true}], rebar) of {ok, saved_to_file} -> -@@ -76,6 +78,7 @@ do(State) -> - ?DEBUG("Error creating package index: ~p ~p", [C, erlang:get_stacktrace()]), +@@ -77,6 +79,7 @@ do(State) -> + ?DEBUG("Error creating package index: ~p ~p", [C, S]), throw(?PRV_ERROR(package_index_write)) end. +-endif. diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index b820dc997e443..2dca2b6cd423e 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp +, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp , go-md2man }: let @@ -26,7 +26,7 @@ in buildGoPackage rec { hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ pkgconfig go-md2man.bin ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux libseccomp ]; + buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ]; # Copied from the skopeo package, doesn’t seem to make a difference? # If something related to these libs failed, uncomment these lines. diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index f2b9348103ab2..38432e58d0d90 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: +{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }: let version = "1.8.2"; @@ -47,7 +47,7 @@ let patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$out/lib/electron" \ + --set-rpath "${atomEnv.libPath}:${gtk2}/lib:$out/lib/electron" \ $out/lib/electron/electron wrapProgram $out/lib/electron/electron \ diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix index 01d54c01bc78c..082edb37a4f3d 100644 --- a/pkgs/development/tools/erlang/hex2nix/default.nix +++ b/pkgs/development/tools/erlang/hex2nix/default.nix @@ -1,32 +1,23 @@ -{ stdenv, fetchFromGitHub, buildRebar3, buildHex +{ stdenv, fetchFromGitHub, buildRebar3, buildHex, -, getopt_0_8_2, erlware_commons_1_0_0 }: + # Erlang dependencies: + ibrowse_4_2_2, + getopt_0_8_2, + erlware_commons_1_0_0, + jsx_2_8_0 }: -let - ibrowse_4_4_0 = buildHex { - name = "ibrowse"; - version = "4.4.0"; - sha256 = "1hpic1xgksfm00mbl1kwmszca6jmjca32s7gdd8g11i0hy45k3ka"; - }; - jsx_2_8_2 = buildHex { - name = "jsx"; - version = "2.8.2"; - sha256 = "0k7lnmwqbgpmh90wy30kc0qlddkbh9r3sjlyayaqsz1r1cix7idl"; - }; - -in buildRebar3 rec { name = "hex2nix"; - version = "0.0.6"; + version = "0.0.6-a31eadd7"; src = fetchFromGitHub { - owner = "erlang-nix"; - repo = "hex2nix"; - rev = "${version}"; - sha256 = "17rkzg836v7z2xf0i5m8zqfvr23dbmw1bi3c83km92f9glwa1dbf"; + owner = "erlang-nix"; + repo = "hex2nix"; + rev = "a31eadd7af2cbdac1b87991b378e98ea4fb40ae0"; + sha256 = "1hnkrksyrbpq2gq25rfsrnm86n0g3biab88gswm3zj88ddrz6dyk"; }; - beamDeps = [ ibrowse_4_4_0 jsx_2_8_2 erlware_commons_1_0_0 getopt_0_8_2 ]; + beamDeps = [ ibrowse_4_2_2 jsx_2_8_0 erlware_commons_1_0_0 getopt_0_8_2 ]; enableDebugInfo = true; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 5552bdcc5e6c2..b4a35b3a21c03 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -25,7 +25,7 @@ , gitMinimal , glib , gnutar -, json_glib +, json-glib , libcap , libdwarf , libsoup @@ -36,7 +36,7 @@ }: let - version = "0.99.1"; + version = "0.99.3"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0xgywl4qsxq7lw1v7hmvczzv3pl12bzz3jv59y8s5gbk54rzbyi5"; + sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk"; }; nativeBuildInputs = [ @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { elfutils flatpak glib - json_glib + json-glib libcap libdwarf libsoup diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch index 001ddd6456833..6b82e623a02c4 100644 --- a/pkgs/development/tools/flatpak-builder/fix-paths.patch +++ b/pkgs/development/tools/flatpak-builder/fix-paths.patch @@ -1,6 +1,6 @@ --- a/src/builder-context.c +++ b/src/builder-context.c -@@ -711,7 +711,7 @@ +@@ -763,7 +763,7 @@ g_autoptr(GFile) rofiles_base = NULL; g_autoptr(GFile) rofiles_dir = NULL; g_autofree char *tmpdir_name = NULL; @@ -31,7 +31,7 @@ return res; --- a/src/builder-source-archive.c +++ b/src/builder-source-archive.c -@@ -401,7 +401,7 @@ +@@ -430,7 +430,7 @@ va_list ap; va_start (ap, error); @@ -40,7 +40,7 @@ va_end (ap); return res; -@@ -416,7 +416,7 @@ +@@ -445,7 +445,7 @@ va_list ap; va_start (ap, error); @@ -49,7 +49,7 @@ va_end (ap); return res; -@@ -428,7 +428,7 @@ +@@ -457,7 +457,7 @@ GError **error) { gboolean res; @@ -58,6 +58,15 @@ "sh", /* shell's $0 */ rpm_path, /* shell's $1 */ NULL }; +@@ -604,7 +604,7 @@ + va_list ap; + + va_start (ap, error); +- res = flatpak_spawn (dir, NULL, 0, error, "git", ap); ++ res = flatpak_spawn (dir, NULL, 0, error, "@git@", ap); + va_end (ap); + + return res; --- a/src/builder-source-bzr.c +++ b/src/builder-source-bzr.c @@ -124,7 +124,7 @@ @@ -71,7 +80,7 @@ return res; --- a/src/builder-source-patch.c +++ b/src/builder-source-patch.c -@@ -204,11 +204,11 @@ +@@ -215,15 +215,15 @@ args = g_ptr_array_new (); if (use_git) { @@ -79,6 +88,11 @@ + g_ptr_array_add (args, "@git@"); g_ptr_array_add (args, "apply"); g_ptr_array_add (args, "-v"); + } else if (use_git_am) { +- g_ptr_array_add (args, "git"); ++ g_ptr_array_add (args, "@git@"); + g_ptr_array_add (args, "am"); + g_ptr_array_add (args, "--keep-cr"); } else { - g_ptr_array_add (args, "patch"); + g_ptr_array_add (args, "@patch@"); @@ -87,7 +101,7 @@ g_ptr_array_add (args, (gchar *) extra_options[i]); --- a/src/builder-utils.c +++ b/src/builder-utils.c -@@ -139,7 +139,7 @@ +@@ -149,7 +149,7 @@ va_list ap; va_start (ap, error); @@ -96,7 +110,7 @@ va_end (ap); return res; -@@ -153,7 +153,7 @@ +@@ -163,7 +163,7 @@ va_list ap; va_start (ap, error); @@ -105,7 +119,7 @@ va_end (ap); return res; -@@ -167,7 +167,7 @@ +@@ -177,7 +177,7 @@ va_list ap; va_start (ap, error); diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix index ff82127f0c4b8..47a9c550fa8bc 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/server.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix @@ -3,7 +3,7 @@ let hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self); in stdenv.mkDerivation { - name = "hyper-haskell-server-with-packages"; + name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix index fb91015e10c8f..f1c754ddff96a 100644 --- a/pkgs/development/tools/haskell/leksah/default.nix +++ b/pkgs/development/tools/haskell/leksah/default.nix @@ -3,7 +3,7 @@ let leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]); in stdenv.mkDerivation { - name = "leksah"; + name = "leksah-${leksahEnv.version}"; buildInputs = [ gtk3 ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix index 7078e2a372713..6511bdd20102f 100644 --- a/pkgs/development/tools/hexio/default.nix +++ b/pkgs/development/tools/hexio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace Makefile \ - --replace '-I/usr/local/include/PCSC/' '-I${pcsclite}/include/PCSC/' \ + --replace '-I/usr/local/include/PCSC/' '-I${stdenv.lib.getDev pcsclite}/include/PCSC/' \ --replace '-L/usr/local/lib/pth' '-I${pth}/lib/' ''; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 9b4864e92fe59..0a33160052362 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1ffbc6cc41f0ea6c864fbe9485b981679dc5e350f6c4bc6c3512f5a4226936b5"; }; - patches = [ ./fix-test-autoconf-2.69.patch ]; + patches = [ ./fix-test-autoconf-2.69.patch ./fix-perl-5.26.patch ]; buildInputs = [perl autoconf makeWrapper]; diff --git a/pkgs/development/tools/misc/automake/fix-perl-5.26.patch b/pkgs/development/tools/misc/automake/fix-perl-5.26.patch new file mode 100644 index 0000000000000..fb2d08de6d81e --- /dev/null +++ b/pkgs/development/tools/misc/automake/fix-perl-5.26.patch @@ -0,0 +1,10 @@ +--- automake-1.11.2/automake.in ++++ automake-1.11.2/automake.in +@@ -4156,7 +4156,7 @@ sub substitute_ac_subst_variables_worker($) + sub substitute_ac_subst_variables ($) + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index a3c5fd7f009c3..5c6b8cfd9605b 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -8,18 +8,18 @@ stdenv.mkDerivation rec { name = "creduce-${version}"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz"; - sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n"; + sha256 = "1vqx73ymfscvlyig03972a5m7ar3gx2yv6m8c6h2mibz792j5xkp"; }; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ # Ensure stdenv's CC is on PATH before clang-unwrapped stdenv.cc # Actual deps: - cmake makeWrapper llvm clang-unwrapped flex zlib perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 82b224b37f42d..09d1276ed42ff 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -3,8 +3,7 @@ , unicodeSupport ? true }: -let optional = stdenv.lib.optional; - optStr = stdenv.lib.optionalString; +let optStr = stdenv.lib.optionalString; buildShared = !stdenv.isDarwin; in diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 04a300c56f448..2ee573e4ba18b 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -3,11 +3,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { name = "elfutils-${version}"; - version = "0.172"; + version = "0.173"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2"; - sha256 = "090fmbnvd9jblkwhb2bm3hanim63rrvd5f30mfxq4jac6kk9k73p"; + sha256 = "1zq0l12k64hrbjmdjc4llrad96c25i427hpma1id9nk87w9qqvdp"; }; patches = ./debug-info-from-env.patch; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 12d3f97dfc41f..29bf92d2b6e5f 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -4,14 +4,14 @@ let in python27Packages.buildPythonApplication rec { pname = "gdbgui"; - version = "0.11.1.2"; + version = "0.13.0.0"; buildInputs = [ gdb ]; propagatedBuildInputs = builtins.attrValues deps.packages; src = python27Packages.fetchPypi { inherit pname version; - sha256 = "15502fg90df183mcg6nic8fakf111pgrlp7f044g3136wpwgfln7"; + sha256 = "16a46kabhfqsgsks5l25kpgrvrkdah3h5f5m6ams2z9nzbrxl8bz"; }; postPatch = '' diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix new file mode 100644 index 0000000000000..aaaee20b81a8f --- /dev/null +++ b/pkgs/development/tools/misc/gputils/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "gputils-${version}"; + version = "1.5.0-1"; + + src = fetchurl { + url = "mirror://sourceforge/gputils/${name}.tar.bz2"; + sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g"; + }; + + meta = with stdenv.lib; { + homepage = https://gputils.sourceforge.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ yorickvp ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index d760cec62a04f..071ad93329143 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, m4, perl }: +{ stdenv, lib, fetchurl, m4, perl }: stdenv.mkDerivation rec { - name = "bison-2.7"; + name = "bison-2.7.1"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "0cd8s2g7zjshya7kwjc9rh3drsssl4hiq4sccnkgf0nn9wvygfqr"; + sha256 = "0c9li3iaslzzr3zig6m3zlmb4r8i0wfvkcrvdyiqxasb09mjkqh8"; }; nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; propagatedBuildInputs = [ m4 ]; + patches = lib.optional stdenv.isDarwin ./darwin-vasnprintf.patch; + doCheck = true; # M4 = "${m4}/bin/m4"; diff --git a/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch b/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch new file mode 100644 index 0000000000000..84b0e6d39d876 --- /dev/null +++ b/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch @@ -0,0 +1,12 @@ +diff -ur bison-2.7-pristine/lib/vasnprintf.c bison-2.7/lib/vasnprintf.c +--- bison-2.7-pristine/lib/vasnprintf.c 2012-11-30 20:48:23.000000000 +0900 ++++ bison-2.7/lib/vasnprintf.c 2018-06-28 16:55:31.000000000 +0900 +@@ -4870,7 +4870,7 @@ + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) ++# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) || (defined __APPLE__ && defined __MACH__)) + fbp[1] = '%'; + fbp[2] = 'n'; + fbp[3] = '\0'; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 3c062dbe1ab4a..949d798f7e88f 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -5,24 +5,6 @@ }: let - fakeXcrun = writeScriptBin "xcrun" '' - #!${stdenv.shell} - echo >&2 "Fake xcrun: ''$@" - args=() - while (("$#")); do - case "$1" in - -sdk*) shift;; - -find*) shift;; - *) args+=("$1");; - esac - shift - done - - if [ "''${#args[@]}" -gt "0" ]; then - echo >&2 "Fake xcrun: ''${args[@]}" - exec "''${args[@]}" - fi - ''; fakeClang = writeScriptBin "clang" '' #!${stdenv.shell} if [[ "$@" == *.c ]]; then diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index de94b7a8eff34..38d385d1d5532 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -6,8 +6,8 @@ with stdenv.lib; let - baseVersion = "4.5"; - revision = "0"; + baseVersion = "4.6"; + revision = "2"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "1yfrfma23xxzz8hl43g7pk7ay5lg25l9lscjlih617lyv6jmc0hl"; + sha256 = "1k23i1qsw6d06sy7g0vd699rbvwv6vbw211fy0nn0705a5zndbxv"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 5e88384c58dbf..775b744f83988 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib -, freetype, dbus, nss, nspr, alsaLib, cups, expat, libudev, makeDesktopItem +, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: let @@ -19,7 +19,7 @@ let alsaLib cups expat - libudev + udev gnome2.GConf diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 3b1e8c2c8a75d..c3d71e2b2a3a3 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -6,9 +6,6 @@ with stdenv.lib; let minorVersion = "3.6"; patchVersion = "0"; - arch = if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "i686-linux" then "i386" - else ""; in stdenv.mkDerivation rec { name = "selenium-server-standalone-${version}"; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 0535a11e0ceb2..dc157b6725303 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux +, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux , go-md2man }: with stdenv.lib; @@ -28,7 +28,7 @@ buildGoPackage rec { excludedPackages = "integration"; nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; + buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux ]; buildFlagsArray = '' -ldflags= @@ -37,8 +37,8 @@ buildGoPackage rec { ''; preBuild = '' - export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" - export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" + export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev lvm2}/include -I${getDev btrfs-progs}/include" + export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib lvm2}/lib" ''; postBuild = '' diff --git a/pkgs/development/tools/vagrant/Gemfile.lock b/pkgs/development/tools/vagrant/Gemfile.lock index 8991bd9eb54f6..2a1515fd14384 100644 --- a/pkgs/development/tools/vagrant/Gemfile.lock +++ b/pkgs/development/tools/vagrant/Gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: . specs: - vagrant (2.1.1) + vagrant (2.1.2) childprocess (~> 0.6.0) erubis (~> 2.7.0) hashicorp-checkpoint (~> 0.1.5) @@ -25,8 +25,6 @@ PATH rest-client (>= 1.6.0, < 3.0) ruby_dep (<= 1.3.1) wdm (~> 0.1.0) - win32-file (~> 0.8.1) - win32-file-security (~> 1.0.10) winrm (~> 2.1) winrm-elevated (~> 1.1) winrm-fs (~> 1.0) @@ -47,8 +45,6 @@ GEM erubis (2.7.0) fake_ftp (0.1.1) ffi (1.9.23) - ffi-win32-extensions (1.0.3) - ffi gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) @@ -119,16 +115,6 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - win32-file (0.8.1) - ffi - ffi-win32-extensions - win32-file-stat (>= 1.4.0) - win32-file-security (1.0.10) - ffi - ffi-win32-extensions - win32-file-stat (1.5.5) - ffi - ffi-win32-extensions winrm (2.2.3) builder (>= 2.1.2) erubis (~> 2.7) @@ -160,4 +146,4 @@ DEPENDENCIES webmock (~> 2.3.1) BUNDLED WITH - 1.14.6 + 1.16.2 diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 886706ed30bd9..fe75c9fd20851 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,6 +1,10 @@ { lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }: let + # NOTE: bumping the version and updating the hash is insufficient; + # you must copy a fresh Gemfile.lock from the vagrant source, + # and use bundix to generate a new gemset.nix. + # Do not change the existing Gemfile. version = "2.1.2"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; sha256 = "0fb90v43d30whhyjlgb9mmy93ccbpr01pz97kp5hrg3wfd7703b1"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 867927cdc2487..598f5cc67235a 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -75,15 +75,6 @@ }; version = "1.9.23"; }; - ffi-win32-extensions = { - dependencies = ["ffi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ywkkbr3bpi2ais2jr8yrsqwwrm48jg262anmdkcb9if95vajx7l"; - type = "gem"; - }; - version = "1.0.3"; - }; gssapi = { dependencies = ["ffi"]; source = { @@ -406,7 +397,7 @@ version = "0.0.7.5"; }; vagrant = { - dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "win32-file" "win32-file-security" "winrm" "winrm-elevated" "winrm-fs"]; + dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; }; vagrant-spec = { dependencies = ["childprocess" "log4r" "rspec" "thor"]; @@ -436,33 +427,6 @@ }; version = "2.3.2"; }; - win32-file = { - dependencies = ["ffi" "ffi-win32-extensions" "win32-file-stat"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mjylzv4bbnxyjqf7hnd9ghcs5xr2sv8chnmkqdi2cc6pya2xax0"; - type = "gem"; - }; - version = "0.8.1"; - }; - win32-file-security = { - dependencies = ["ffi" "ffi-win32-extensions"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lpq821a1hrxmm0ki5c34wijzhn77g4ny76v698ixwg853y2ir9r"; - type = "gem"; - }; - version = "1.0.10"; - }; - win32-file-stat = { - dependencies = ["ffi" "ffi-win32-extensions"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lc3yajcb8xxabvj9qian938k60ixydvs3ixl5fldi0nlvnvk468"; - type = "gem"; - }; - version = "1.5.5"; - }; winrm = { dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; source = { diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 8951f16e43c44..d6d5d6d3ea662 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, vulkan-loader, - glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { name = "vulkan-validation-layers-${version}"; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 vulkan-headers vulkan-loader x11 libxcb libXrandr wayland ]; + buildInputs = [ cmake python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ]; meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index fbf76842c20e0..1487ed4e1ddc5 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype +, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk_pixbuf, glib, gnome2, gtk2-x11, nspr, nss , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 @@ -8,8 +8,8 @@ let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups dbus_daemon.lib expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango - gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes + alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango + gtk2-x11 nspr nss stdenv.cc.cc libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libxcb ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 8997dbda72840..979b64ae23b2e 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.5.0"; - sha256 = "1g1kdcrhahdsrkazfl9wj25abgjvkncgwwcm2ppgj3avfi1wam3v"; + version = "10.6.0"; + sha256 = "13vyzh53j2c4mv3q3yb0hkdpl1mag5705k7kmb8nmcvdhcm78q0r"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } |