Merge master into staging-next

6 files changed, 14 insertions, 34 deletions

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 48b0631c64aa..47db8c9fea63 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -3,13 +3,13 @@
 , go-md2man }:
 
 let
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "containers";
     repo = "buildah";
-    sha256 = "19rp5kgdgyjfvg23m8dqlv6g1cs2c57nnw64ifjv24hqhy1xc0qk";
+    sha256 = "154zjkccinf6nvbz5a8rdlkgy7fi6yz11wi100jn9cmsjydspax8";
   };
   goPackagePath = "github.com/containers/buildah";
 
@@ -46,7 +46,7 @@ in buildGoPackage rec {
   meta = {
     description = "A tool which facilitates building OCI images";
     homepage = https://github.com/containers/buildah;
-    maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
+    maintainers = with stdenv.lib.maintainers; [ Profpatsch vdemeester ];
     license = stdenv.lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix
index 6c8270f85986..8eb65281b3fe 100644
--- a/pkgs/development/tools/gotests/default.nix
+++ b/pkgs/development/tools/gotests/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gotests-${version}";
-  version = "1.5.2";
+  version = "1.5.3";
   rev = "v${version}";
 
   goPackagePath = "github.com/cweill/gotests";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "cweill";
     repo = "gotests";
-    sha256 = "0ff2jvpc1xb5jr6dv9izlpfavxaivzirqmdmicpznrqjz0d56pri";
+    sha256 = "1c0hly31ax0wk01zdx0l0yl40xybaizjfb3gjxia2z0mgx330dq9";
   };
 
   meta = {
diff --git a/pkgs/development/tools/gotests/deps.nix b/pkgs/development/tools/gotests/deps.nix
index 6a333b58bec6..df411303d944 100644
--- a/pkgs/development/tools/gotests/deps.nix
+++ b/pkgs/development/tools/gotests/deps.nix
@@ -1,11 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
 [
   {
     goPackagePath = "golang.org/x/tools";
     fetch = {
       type = "git";
-      url = "https://github.com/golang/tools";
-      rev = "96b5a5404f303f074e6117d832a9873c439508f0";
-      sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42";
+      url = "https://go.googlesource.com/tools";
+      rev = "23463209683dad3f2b9cc7f7c2663e1847c59017";
+      sha256 = "1shzfl4zixhj78v4f6y04bcmfl705yr5q8hp72ndbbma0mh09g8f";
     };
   }
 ]
diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix
deleted file mode 100644
index ec2fb334a3b3..000000000000
--- a/pkgs/development/tools/haskell/leksah/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, ghcWithPackages, gtk3, makeWrapper }:
-
-let
-leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]);
-in stdenv.mkDerivation {
-  name = "leksah-${leksahEnv.version}";
-
-  buildInputs = [ gtk3 ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    mkdir -p $out/bin
-    makeWrapper ${leksahEnv}/bin/leksah $out/bin/leksah \
-      --prefix PATH : "${leksahEnv}/bin" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = {
-    broken = true; # 2018-09-13, no successful hydra build since 2017-08-19
-  };
-}
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 7e73a64e1a99..bce1e273cc41 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "08zlnk1k1nddjciccfdcplxqngsnz6ml3zxm57mijabzybry8zz1";
   };
 
-  cargoSha256 = "00j5nm491zil6kpjns31qyd6z7iqd77b5qp4h7149s70qjwfq2cb";
+  cargoSha256 = "1nig4891p7ii4z4f4j4d4pxx39f501g7yrsygqbpkr1nrgjip547";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index 3d08a6b787d8..417f0a749c98 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,9 +2,9 @@
 
 buildGoPackage rec {
   name = "skaffold-${version}";
-  version = "0.26.0";
-  # rev is the 0.25.0 commit, mainly for skaffold version command output
-  rev = "d88680e9ede62da65500702670ef72fc9272a06f";
+  version = "0.28.0";
+  # rev is the 0.28.0 commit, mainly for skaffold version command output
+  rev = "2b6143bb6d185de9b9fbf2eaa981c8e7acff7339";
 
   goPackagePath = "github.com/GoogleContainerTools/skaffold";
   subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "151x7hs1876ij5kc1xlm1m7pyff6i22ddhfvjsgwb8sjl4h1ays5";
+    sha256 = "1j7wf2a5xmrk944nc0b9634qa9al3cln3lrij8383avylbx68prw";
   };
 
   meta = {