public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-12-08 12:40:13 +01:00
parent 12e8ec041a 85d9f63975
commit e0950ae9ad
28 changed files with 716 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/elfinfo/default.nix
View File

@@ -2,14 +2,14 @@
buildGoPackage rec {
name = "elfinfo-${version}";
version = "0.7.4";
version = "0.7.5";
goPackagePath = "github.com/xyproto/elfinfo";
src = fetchFromGitHub {
rev = version;
owner = "xyproto";
repo = "elfinfo";
sha256 = "12n86psri9077v7s6b4j7djg5kijf9gybd80f9sfs0xmgkbly3gv";
sha256 = "0b6zyfq0yhpbf03h52q2lgf6ff086gcsbnhm6chx18h0q1g17m96";
};
meta = with stdenv.lib; {

8
pkgs/development/tools/skaffold/default.nix
View File

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