about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVlad M <dywedir@gra.red>2024-02-05 11:33:01 +0200
committerGitHub <noreply@github.com>2024-02-05 11:33:01 +0200
commit277953fea274aa8cff77e0ad6283bb1c0d6e7d92 (patch)
tree8ff1b009ef9977f370fc5aab0db9d45ca346fa43
parentd7200dfbd9ffe63a90f28d954cef52cf4bd7fc86 (diff)
parentcef94ff0e7632226c9622217bc2c7c3623a5fc64 (diff)
downloadnixlib-277953fea274aa8cff77e0ad6283bb1c0d6e7d92.tar
nixlib-277953fea274aa8cff77e0ad6283bb1c0d6e7d92.tar.gz
nixlib-277953fea274aa8cff77e0ad6283bb1c0d6e7d92.tar.bz2
nixlib-277953fea274aa8cff77e0ad6283bb1c0d6e7d92.tar.lz
nixlib-277953fea274aa8cff77e0ad6283bb1c0d6e7d92.tar.xz
nixlib-277953fea274aa8cff77e0ad6283bb1c0d6e7d92.tar.zst
nixlib-277953fea274aa8cff77e0ad6283bb1c0d6e7d92.zip
Merge pull request #286463 from kirillrdy/revert-cloudflare
cloudflared: 2024.1.5 -> 2023.10.0
-rw-r--r--pkgs/applications/networking/cloudflared/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix5
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 97515d4ead7a..8ef403599688 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2024.1.5";
+  version = "2023.10.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
     rev = "refs/tags/${version}";
-    hash = "sha256-g7FUwEs/wEcX1vRgfoQZw+uMzx6ng3j4vFwhlHs6WKg=";
+    hash = "sha256-T+hxNvsckL8PAVb4GjXhnkVi3rXMErTjRgGxCUypwVA=";
   };
 
   vendorHash = null;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4c173ccab16..b329f985318b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4694,7 +4694,10 @@ with pkgs;
 
   cloudbrute = callPackage ../tools/security/cloudbrute { };
 
-  cloudflared = callPackage ../applications/networking/cloudflared { };
+  cloudflared = callPackage ../applications/networking/cloudflared {
+    # https://github.com/cloudflare/cloudflared/issues/1054
+    buildGoModule = buildGo120Module;
+  };
 
   cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { };