about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkirillrdy <kirillrdy@gmail.com>2024-02-04 22:19:46 +1100
committerGitHub <noreply@github.com>2024-02-04 22:19:46 +1100
commite1c51589201f5574ae6b3feb70a33fec4b94cfd5 (patch)
tree5791ed1b22b5be663f6041451445e990c8fc0e26
parentf821bdecf38e10826cdeafe0fe8056dceb2f5ab6 (diff)
parentb9f8734b861d1460c611f4600987c4e043b727c3 (diff)
downloadnixlib-e1c51589201f5574ae6b3feb70a33fec4b94cfd5.tar
nixlib-e1c51589201f5574ae6b3feb70a33fec4b94cfd5.tar.gz
nixlib-e1c51589201f5574ae6b3feb70a33fec4b94cfd5.tar.bz2
nixlib-e1c51589201f5574ae6b3feb70a33fec4b94cfd5.tar.lz
nixlib-e1c51589201f5574ae6b3feb70a33fec4b94cfd5.tar.xz
nixlib-e1c51589201f5574ae6b3feb70a33fec4b94cfd5.tar.zst
nixlib-e1c51589201f5574ae6b3feb70a33fec4b94cfd5.zip
Merge pull request #285727 from sefidel/cloudflared-2024.1.5
cloudflared: 2023.10.0 -> 2024.1.5
-rw-r--r--pkgs/applications/networking/cloudflared/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix5
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 8ef403599688..97515d4ead7a 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2023.10.0";
+  version = "2024.1.5";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
     rev = "refs/tags/${version}";
-    hash = "sha256-T+hxNvsckL8PAVb4GjXhnkVi3rXMErTjRgGxCUypwVA=";
+    hash = "sha256-g7FUwEs/wEcX1vRgfoQZw+uMzx6ng3j4vFwhlHs6WKg=";
   };
 
   vendorHash = null;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 345689bd17ce..afdc8ec9e00d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4698,10 +4698,7 @@ with pkgs;
 
   cloudbrute = callPackage ../tools/security/cloudbrute { };
 
-  cloudflared = callPackage ../applications/networking/cloudflared {
-    # https://github.com/cloudflare/cloudflared/issues/1054
-    buildGoModule = buildGo120Module;
-  };
+  cloudflared = callPackage ../applications/networking/cloudflared { };
 
   cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { };