Merge commit '373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c'

11 files changed, 29 insertions, 96 deletions

diff --git a/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix
index 9c850c7606c5..90eeffd58da1 100644
--- a/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "brakeman";
-  version = "4.4.0";
-  source.sha256 = "1fg37qknz1f10v4fgbn1s98gks0iimsgs1c8xra2jy16kpz4q86k";
+  version = "4.5.0";
+  source.sha256 = "0c11i01yw87fssmwbybaqf5rdxsjp44hvxdw54c3iqb8fvj76b68";
 
   meta = with lib; {
     description = "Static analysis security scanner for Ruby on Rails";
diff --git a/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix b/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
index 000e5e3393bf..06c712588f8f 100644
--- a/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
@@ -1,18 +1,18 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "lcov-1.13";
+  name = "lcov-1.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/ltp/${name}.tar.gz";
-    sha256 = "08wabnb0gcjqk0qc65a6cgbbmz6b8lvam3p7byh0dk42hj3jr5s4";
+    sha256 = "06h7ixyznf6vz1qvksjgy5f3q2nw9akf6zx59npf0h3l32cmd68l";
   };
 
   buildInputs = [ perl ];
 
   preBuild = ''
     patchShebangs bin/
-    makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man)
+    makeFlagsArray=(PREFIX=$out LCOV_PERL_PATH=$(command -v perl))
   '';
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/development/tools/cachix/cachix-api.nix b/nixpkgs/pkgs/development/tools/cachix/cachix-api.nix
deleted file mode 100644
index de8184308b27..000000000000
--- a/nixpkgs/pkgs/development/tools/cachix/cachix-api.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, aeson, base, base16-bytestring, bytestring, conduit
-, cookie, cryptonite, deepseq, exceptions, hspec, hspec-discover
-, http-api-data, http-media, lens, memory, protolude, resourcet
-, servant, servant-auth, servant-auth-server, servant-auth-swagger
-, servant-client, servant-swagger, servant-swagger-ui-core, stdenv
-, string-conv, swagger2, text, transformers
-}:
-mkDerivation {
-  pname = "cachix-api";
-  version = "0.2.0";
-  sha256 = "73f27484d3748fe02ce834549dd3a04c92110390f7d9adb4c391bad2ececbef2";
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson base base16-bytestring bytestring conduit cookie cryptonite
-    deepseq exceptions http-api-data http-media lens memory resourcet
-    servant servant-auth servant-auth-server servant-auth-swagger
-    servant-client servant-swagger string-conv swagger2 text
-    transformers
-  ];
-  executableHaskellDepends = [ aeson base ];
-  testHaskellDepends = [
-    aeson base base16-bytestring bytestring conduit cookie cryptonite
-    hspec http-api-data http-media lens memory protolude servant
-    servant-auth servant-auth-server servant-auth-swagger
-    servant-swagger servant-swagger-ui-core string-conv swagger2 text
-    transformers
-  ];
-  testToolDepends = [ hspec-discover ];
-  homepage = "https://github.com/cachix/cachix#readme";
-  description = "Servant HTTP API specification for https://cachix.org";
-  license = stdenv.lib.licenses.asl20;
-}
diff --git a/nixpkgs/pkgs/development/tools/cachix/cachix.nix b/nixpkgs/pkgs/development/tools/cachix/cachix.nix
deleted file mode 100644
index 0f5a354ec94e..000000000000
--- a/nixpkgs/pkgs/development/tools/cachix/cachix.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ mkDerivation, async, base, base16-bytestring, base64-bytestring
-, bytestring, cachix-api, conduit, conduit-extra, cookie
-, cryptonite, data-default, dhall, directory, ed25519, filepath
-, fsnotify, here, hspec, hspec-discover, http-client
-, http-client-tls, http-conduit, http-types, lzma-conduit
-, megaparsec, memory, mmorph, netrc, optparse-applicative, process
-, protolude, retry, safe-exceptions, servant, servant-auth
-, servant-auth-client, servant-client, servant-client-core
-, servant-conduit, stdenv, temporary, text, unix, uri-bytestring
-, versions
-}:
-mkDerivation {
-  pname = "cachix";
-  version = "0.2.0";
-  sha256 = "16ba70af7f2ba4bc147ba84c34c9884bee589237a1d935f932c5e0b68157665a";
-  revision = "1";
-  editedCabalFile = "103ypqp0kclc1814q2ci5fi2jpfbxwmjqfsnkvwf3c1vr8cqplmh";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    async base base16-bytestring base64-bytestring bytestring
-    cachix-api conduit conduit-extra cookie cryptonite data-default
-    dhall directory ed25519 filepath fsnotify here http-client
-    http-client-tls http-conduit http-types lzma-conduit megaparsec
-    memory mmorph netrc optparse-applicative process protolude retry
-    safe-exceptions servant servant-auth servant-auth-client
-    servant-client servant-client-core servant-conduit text unix
-    uri-bytestring versions
-  ];
-  executableHaskellDepends = [ base cachix-api ];
-  executableToolDepends = [ hspec-discover ];
-  testHaskellDepends = [
-    base cachix-api directory here hspec protolude temporary
-  ];
-  homepage = "https://github.com/cachix/cachix#readme";
-  description = "Command line client for Nix binary cache hosting https://cachix.org";
-  license = stdenv.lib.licenses.asl20;
-}
diff --git a/nixpkgs/pkgs/development/tools/cachix/default.nix b/nixpkgs/pkgs/development/tools/cachix/default.nix
index 94527c8a4b50..895d6e4bec62 100644
--- a/nixpkgs/pkgs/development/tools/cachix/default.nix
+++ b/nixpkgs/pkgs/development/tools/cachix/default.nix
@@ -1,8 +1,3 @@
 { haskellPackages, haskell }:
 
-(haskellPackages.override {
-  overrides = self: super: {
-    cachix = haskell.lib.justStaticExecutables (super.callPackage ./cachix.nix {});
-    cachix-api = super.callPackage ./cachix-api.nix {};
-  };
-}).cachix
+haskell.lib.justStaticExecutables haskellPackages.cachix
diff --git a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
index 6bf5e9be7bf2..1eb8bf75cdfb 100644
--- a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -33,4 +33,6 @@ mkDerivation rec {
   description = "Runs processes with secrets from HashiCorp Vault";
   license = stdenv.lib.licenses.bsd3;
   maintainers = with stdenv.lib.maintainers; [ lnl7 ];
+  hydraPlatforms = [];
+  broken = true;  # does not compile any longer
 }
diff --git a/nixpkgs/pkgs/development/tools/jl/default.nix b/nixpkgs/pkgs/development/tools/jl/default.nix
index 6ffe5ef80bf8..0d9ce143a834 100644
--- a/nixpkgs/pkgs/development/tools/jl/default.nix
+++ b/nixpkgs/pkgs/development/tools/jl/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchFromGitHub
+{ mkDerivation, fetchFromGitHub, fetchpatch
 , aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra
 , containers, exceptions, mtl, optparse-simple, parsec, scientific, stdenv
 , text, unordered-containers, vector
@@ -12,6 +12,14 @@ mkDerivation rec {
     rev = "v${version}";
     sha256 = "1hlnwsl4cj0l4x8dxwda2fcnk789cwlphl9gv9cfrivl43mgkgar";
   };
+  patches = [
+    # MonadFail compatibility patch. Should be removed with the next release
+    (fetchpatch {
+      url = https://github.com/chrisdone/jl/commit/6d40308811cbc22a96b47ebe69ec308b4e9fd356.patch;
+      sha256 = "1pg92ffkg8kim5r8rz8js6fjqyjisg1266sf7p9jyxjgsskwpa4g";
+    })
+  ];
+
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
index 85fa76bb28e4..be7a488e96e8 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "dune-${version}";
-  version = "1.6.2";
+  version = "1.8.2";
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "1k675mfywmsj4v4z2f5a4vqinl1jbzzb7v5k6rzyfgvxzd7gil40";
+    sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a";
   };
 
   buildInputs = with ocamlPackages; [ ocaml findlib ];
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix
index 6bc397cffcbe..79be6a8170ca 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
 
-  version = "1.1.8";
+  version = "1.1.9";
   name = "ocaml${ocaml.version}-ocp-index-${version}";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocp-index";
     rev = version;
-    sha256 = "0hfiwqi60xnwsmj7fmv1sk2gzr6wxdzbgd5zli2xnfrjvb4ydv12";
+    sha256 = "0dq1kap16xfajc6gg9hbiadax782winpvxnr3dkm2ncznnxds37p";
   };
 
   buildInputs = [ ocaml findlib dune ocp-build cmdliner re ];
diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
index 6b14f49716f2..20105f362cf0 100644
--- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rust-cbindgen-${version}";
-  version = "0.6.7";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "eqrion";
     repo = "cbindgen";
     rev = "v${version}";
-    sha256 = "0sgkgvkqrc6l46fvk6d9hsy0xrjpl2ix47f3cv5bi74dv8i4y2b4";
+    sha256 = "07cizbhr02x3rh07xhs10hzzs3lmmpf61g08sa62b98cgadvs9fq";
   };
 
-  cargoSha256 = "137dqj1sp02dh0dz9psf8i8q57gmz3rfgmwk073k7x5zzkgvj21c";
+  cargoSha256 = "00j5nm491zil6kpjns31qyd6z7iqd77b5qp4h7149s70qjwfq2cb";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
@@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
     description = "A project for generating C bindings from Rust code";
     homepage = https://github.com/eqrion/cbindgen;
     license = licenses.mpl20;
-    maintainers = with maintainers; [ jtojnar ];
+    maintainers = with maintainers; [ jtojnar andir ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/yarn/default.nix b/nixpkgs/pkgs/development/tools/yarn/default.nix
index 5dcc9e2ec208..a3756d27e46e 100644
--- a/nixpkgs/pkgs/development/tools/yarn/default.nix
+++ b/nixpkgs/pkgs/development/tools/yarn/default.nix
@@ -1,12 +1,12 @@
 { stdenv, nodejs, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "yarn-${version}";
-  version = "1.14.0";
+  pname = "yarn";
+  version = "1.15.2";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "167lpw4bnw8845ip6cvdk827lwdbprisd7ygl7vqv4p1wgdcrkqq";
+    sha256 = "0gvg6m0mdppgjp5lg3mz1w19c1zsflhgldzx4hgm3rlrbx3rzmvr";
   };
 
   buildInputs = [ nodejs ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = https://yarnpkg.com/;
     description = "Fast, reliable, and secure dependency management for javascript";
     license = licenses.bsd2;
-    maintainers = [ maintainers.offline maintainers.screendriver ];
+    maintainers = with maintainers; [ offline screendriver ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }