From a2570d040d7caf341ff2dc3737f9eafa67948c6d Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 10 Nov 2023 00:10:04 +0100
Subject: [PATCH] gnulib: 20210702 -> 20231109

---
 pkgs/development/tools/gnulib/default.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix           | 12 +-----------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index a55589c5a634..5a69915c161c 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -1,13 +1,13 @@
-{ lib, stdenv, fetchgit, python3 }:
+{ lib, stdenv, fetchFromSavannah, python3 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "gnulib";
-  version = "20210702";
+  version = "20231109";
 
-  src = fetchgit {
-    url = "https://git.savannah.gnu.org/r/gnulib.git";
-    rev = "901694b904cd861adc2529b2e05a3fb33f9b534f";
-    sha256 = "1f5znlv2wjziglw9vlygdgm4jfbsz34h2dz6w4h90bl4hm0ycb1w";
+  src = fetchFromSavannah {
+    repo = "gnulib";
+    rev = "2dd1a7984c6b3e6056cef7e3f9933e0039c21634";
+    hash = "sha256-QtWf3mljEnr0TTogkoKN63Y5HTm14A2e/sIXX3xe2SE=";
   };
 
   postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67b62f9e2e1f..7ca188fd43b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14942,17 +14942,7 @@ with pkgs;
 
   wget = callPackage ../tools/networking/wget { };
 
-  wget2 = callPackage ../tools/networking/wget2 {
-    # update breaks grub2
-    gnulib = pkgs.gnulib.overrideAttrs {
-      version = "20210208";
-      src = fetchgit {
-        url = "https://git.savannah.gnu.org/r/gnulib.git";
-        rev = "0b38e1d69f03d3977d7ae7926c1efeb461a8a971";
-        hash = "sha256-9z/Vg3/g5WRWHH9I0QR6BZ5JCJBo+lEMLAM6xpFPchk=";
-      };
-    };
-  };
+  wget2 = callPackage ../tools/networking/wget2 { };
 
   wgpu-utils = callPackage ../tools/graphics/wgpu-utils {
     inherit (darwin.apple_sdk.frameworks) QuartzCore;