diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:42:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:42:36 +0200 |
| commit | 16024fcaecf63efb99aac191ee04af18762570cf (patch) | |
| tree | e9d3f924f1b66be624460d6887e35c3a4e2007a2 /pkgs/applications/networking | |
| parent | a038553c8b8cb108ecba63f77ac0f04917d29672 (diff) | |
| parent | 6e9bb30566a617613e607a3641fe12d040de3afb (diff) | |
| download | nixlib-16024fcaecf63efb99aac191ee04af18762570cf.tar nixlib-16024fcaecf63efb99aac191ee04af18762570cf.tar.gz nixlib-16024fcaecf63efb99aac191ee04af18762570cf.tar.bz2 nixlib-16024fcaecf63efb99aac191ee04af18762570cf.tar.lz nixlib-16024fcaecf63efb99aac191ee04af18762570cf.tar.xz nixlib-16024fcaecf63efb99aac191ee04af18762570cf.tar.zst nixlib-16024fcaecf63efb99aac191ee04af18762570cf.zip | |
Merge branch 'staging-next' into staging
In particular, this fixes ISO evaluation.
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/cloudflared/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/helm/default.nix | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 31bb18f20a82..aca523545adb 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,18 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, runCommand }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cloudflared"; - version = "2020.3.2"; + version = "2020.5.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "1vbxm5z72y9zfg4carmja3fc1vhkanmc25pgnlw550p1l14y6404"; + sha256 = "0r1n3a8h8gyww4p2amb24jmp8zkyxy1ava3nbqgwlfjr3zagga00"; }; - vendorSha256 = "14w2iz3ycbzfvlr8a6qn86aaa8687cm203d73wpfkfskp277hwz0"; - deleteVendor = true; + vendorSha256 = null; buildFlagsArray = "-ldflags=-X main.Version=${version}"; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 2e4f68d6bfa7..5e51fe4267d4 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1453qkd9s4z4r0xzmv8ym7qfg33szf6gizfkb5zxj590fcbsgnd7"; }; - vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl"; + vendorSha256 = null; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; |