Merge master into staging-next

pkgs/development/tools/continuous-integration/jenkins/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.138.2";
+  version = "2.138.3";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "10qyr8izngnhlr1b03a9vdnbmwprbqsjnd55hjdalmxy6dq5mvfq";
+    sha256 = "0z8yfnqg43vqhhnp27wb28686zq9kqkyicqn0162hr9h5pd4sglm";
   };
 
   buildCommand = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";
-    homepage = http://jenkins-ci.org;
+    homepage = https://jenkins-ci.org;
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = with maintainers; [ coconnor fpletz earldouglas ];

pkgs/development/tools/golint/default.nix

@@ -2,17 +2,29 @@
 
 buildGoPackage rec {
   name = "lint-${version}";
-  version = "20180208-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d";
+  version = "20181026-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "c67002cb31c3a748b7688c27f20d8358b4193582";
   
-  goPackagePath = "github.com/golang/lint";
+  goPackagePath = "golang.org/x/lint";
   excludedPackages = "testdata";
 
+  # we must allow references to the original `go` package, as golint uses
+  # compiler go/build package to load the packages it's linting.
+  allowGoReference = true;
+
   src = fetchgit {
     inherit rev;
-    url = "https://github.com/golang/lint";
-    sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p";
+    url = "https://go.googlesource.com/lint";
+    sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765";
   };
 
   goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://golang.org;
+    description = "Linter for Go source code";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jhillyerd ];
+    platforms = platforms.all;
+  };
 }

pkgs/development/tools/golint/deps.nix

@@ -1,11 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
 [
   {
     goPackagePath = "golang.org/x/tools";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/tools";
-      rev = "66487607e2081c7c2af2281c62c14ee000d5024b";
-      sha256 = "03wiraqkms4jb5gi7vmp52mpmp4av08yw4gr2nk31c2rnhyd3jv4";
+      rev = "91f80e683c10fea00e7f965a1a7cac482ce52541";
+      sha256 = "16a2vppy5hnp663f28yak6592l8p968ihsc91pigamxx3vk1qh5d";
     };
   }
 ]

pkgs/development/tools/minizinc/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, flex, bison }:
 let
-  version = "2.2.1";
+  version = "2.2.3";
 in
 stdenv.mkDerivation {
   name = "minizinc-${version}";
@@ -8,13 +8,12 @@ stdenv.mkDerivation {
   buildInputs = [ cmake flex bison ];
 
   src = fetchFromGitHub {
-    rev = "${version}";
     owner = "MiniZinc";
     repo = "libminizinc";
-    sha256 = "1i11lan7fqs3lg0s6jfr8sflzwn5nk1ln5j6afjrkrdb08291dr7";
+    rev = "3d66971a0cad6edbe796f4dd940229d38e5bfe3d"; # tags on the repo are disappearing: See https://github.com/MiniZinc/libminizinc/issues/257
+    sha256 = "1q31y9131aj2lsm34srm8i1s0271qcaaknzvym3r8awynm14saq5";
   };
 
-  # meta is all the information about the package..
   meta = with stdenv.lib; {
     homepage = http://www.minizinc.org/;
     description = "MiniZinc is a medium-level constraint modelling language.";

pkgs/development/tools/misc/hound/default.nix

@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "hound-unstable-${version}";
-  version = "20170324";
-  rev = "effbe5873f329fcdf982e906b756b535e2804ebc";
+  version = "2018-11-02";
+  rev = "74ec7448a234d8d09e800b92e52c92e378c07742";
 
   goPackagePath = "github.com/etsy/hound";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "etsy";
     repo = "hound";
-    sha256 = "0zc769lygad5an63z5mivaggbmm07d9ynngi2jx3f7651wpji4aw";
+    sha256 = "0g6nvgqjabprcl9z5ci5frhbam1dzq978h1d6aanf8vvzslfgdpq";
   };
 
   goDeps = ./deps.nix;

pkgs/development/tools/skaffold/default.nix

@@ -2,9 +2,9 @@
 
 buildGoPackage rec {
   name = "skaffold-${version}";
-  version = "0.16.0";
-  # rev is the 0.16.0 commit, mainly for skaffold version command output
-  rev = "78e443973ee7475ee66d227431596351cf5e2caf";
+  version = "0.18.0";
+  # rev is the 0.18.0 commit, mainly for skaffold version command output
+  rev = "34651689be78b2c6bcfbace5072b00b93661f895";
 
   goPackagePath = "github.com/GoogleContainerTools/skaffold";
   subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "0vpjxyqppyj4zs02n8b0k0qd8zidrrcks60x6qd5a4bbqa0c1zld";
+    sha256 = "0an3g4jqch7a6ckh8yhia7lykpvb5lvz4kd5kqfmw9479kygv9sa";
   };
 
   meta = {