Merge remote-tracking branch 'upstream/master' into staging

pkgs/development/tools/fac/default.nix

@@ -1,8 +1,14 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }:
 
-buildGoPackage rec {
+let
+  # TODO: Remove this on next update, should be included
+  fac_1 = fetchurl {
+    url = https://raw.githubusercontent.com/mkchoi212/fac/0a500c2a2dba9017fe7c2a45f15c328755f561a6/doc/fac.1;
+    sha256 = "1fsyx9i20ryhpihdpvs2z7vccl13b9bnh5hcdxn7bvqjz78mbqhw";
+  };
+in buildGoPackage rec {
   name = "fac-${version}";
-  version = "1.0.1";
+  version = "1.0.4";
 
   goPackagePath = "github.com/mkchoi212/fac";
 
@@ -10,7 +16,7 @@ buildGoPackage rec {
     owner = "mkchoi212";
     repo = "fac";
     rev = "v${version}";
-    sha256 = "1j5kip3l3p9qlly03pih905sdz3ncvpj7135jpnfhckbk1s5x9dc";
+    sha256 = "0jhx80jbkxfxj95hmdpb9wwwya064xpfkaa218l1lwm3qwfbpk95";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -18,6 +24,8 @@ buildGoPackage rec {
   postInstall = ''
     wrapProgram $bin/bin/fac \
       --prefix PATH : ${git}/bin
+
+    install -D ${fac_1} $out/share/man/man1/fac.1
   '';
 
   meta = with stdenv.lib; {

pkgs/development/tools/packer/default.nix

@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   name = "packer-${version}";
-  version = "1.1.0";
+  version = "1.1.3";
 
   goPackagePath = "github.com/hashicorp/packer";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "packer";
     rev = "v${version}";
-    sha256 = "09hwq6dxyzhpl97akwbb02bjrisz9rf296avg5zj2p5qdsf4y777";
+    sha256 = "0bfjv4sqci10jzy11qg6q1xyik36v98vd6ck91sarawvgbaprsp2";
   };
 
   meta = with stdenv.lib; {

pkgs/development/tools/yq/default.nix

@@ -2,9 +2,8 @@
 
 buildPythonApplication rec {
 
-  name = "${pname}-${version}";
   pname = "yq";
-  version = "2.3.3";
+  version = "2.3.4";
 
   propagatedBuildInputs = [ pyyaml jq ];
 
@@ -13,7 +12,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14ywdi464z68qclsqzb8r50rzmypknaz74zmpppkahjigfcfppm3";
+    sha256 = "04ckrlmin8m176iicyfhddp4r0yry5hx306vhfglf8mcp1jkga78";
   };
 
   meta = with lib; {