nix: upgrade go to 1.22

status-im · Jan 17, 2025 · 6fd4a4b · 6fd4a4b
1 parent 1732ddd
commit 6fd4a4b
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -37,8 +37,8 @@ in {
   # - development/compilers/go/print-hashes.sh 1.21.11
   # TODO: compile, not binary
   # Binary is used because of initial complexity of both package override and copy from newer nixpkgs
-  go_1_21 = callPackage ./pkgs/go/bootstrap121.nix { };
-  buildGo121Module = callPackage ./pkgs/go-module { go = final.go_1_21; };
+  go_1_22 = callPackage ./pkgs/go/bootstrap122.nix { };
+  buildGo122Module = callPackage ./pkgs/go-module { go = final.go_1_22; };
 
   # Fix for linuxdeployqt running ldd from nix with system shell
   # ERROR: findDependencyInfo: "/bin/sh: /nix/store/HASH-glibc-2.31-74/lib/libc.so.6: version `GLIBC_2.33' not found (required by /bin/sh)\n/bin/sh: /nix/store/0c7c96gikmzv87i7lv3vq5s1cmfjd6zf-glibc-2.31-74/lib/libc.so.6: version `GLIBC_2.34' not found (required by /bin/sh)"

diff --git a/nix/pkgs/go/bootstrap121.nix b/nix/pkgs/go/bootstrap121.nix
diff --git a/nix/pkgs/go/bootstrap122.nix b/nix/pkgs/go/bootstrap122.nix
@@ -0,0 +1,22 @@
+{ callPackage }:
+callPackage ./binary.nix {
+  version = "1.22.3";
+  hashes = {
+    # Use `print-hashes.sh ${version}` to generate the list below
+    darwin-amd64 = "610e48c1df4d2f852de8bc2e7fd2dc1521aac216f0c0026625db12f67f192024";
+    darwin-arm64 = "02abeab3f4b8981232237ebd88f0a9bad933bc9621791cd7720a9ca29eacbe9d";
+    linux-386 = "fefba30bb0d3dd1909823ee38c9f1930c3dc5337a2ac4701c2277a329a386b57";
+    linux-amd64 = "8920ea521bad8f6b7bc377b4824982e011c19af27df88a815e3586ea895f1b36";
+    linux-arm64 = "6c33e52a5b26e7aa021b94475587fce80043a727a54ceb0eee2f9fc160646434";
+    linux-armv6l = "f2bacad20cd2b96f23a86d4826525d42b229fd431cc6d0dec61ff3bc448ef46e";
+    linux-loong64 = "41e9328340544893482b2928ae18a9a88ba18b2fdd29ac77f4d33cf1815bbdc2";
+    linux-mips = "cf4d5faff52e642492729eaf396968f43af179518be769075b90bc1bf650abf6";
+    linux-mips64 = "3bd009fe2e3d2bfd52433a11cb210d1dfa50b11b4c347a293951efd9e36de945";
+    linux-mips64le = "5913b82a042188ef698f7f2dfd0cd0c71f0508a4739de9e41fceff3f4dc769b4";
+    linux-mipsle = "441afebca555be5313867b4577f237c7b5c0fff4386e22e47875b9f805abbec5";
+    linux-ppc64 = "f3b53190a76f4a35283501ba6d94cbb72093be0c62ff735c6f9e586a1c983381";
+    linux-ppc64le = "04b7b05283de30dd2da20bf3114b2e22cc727938aed3148babaf35cc951051ac";
+    linux-riscv64 = "d4992d4a85696e3f1de06cefbfc2fd840c9c6695d77a0f35cfdc4e28b2121c20";
+    linux-s390x = "2aba796417a69be5f3ed489076bac79c1c02b36e29422712f9f3bf51da9cf2d4";
+  };
+}
diff --git a/nix/pkgs/mockgen/default.nix b/nix/pkgs/mockgen/default.nix
@@ -1,6 +1,6 @@
-{ buildGo121Module, fetchFromGitHub, lib }:
+{ buildGo122Module, fetchFromGitHub, lib }:
 
-buildGo121Module rec {
+buildGo122Module rec {
   pname = "mockgen";
   version = "0.4.0";
 

diff --git a/nix/pkgs/protoc-gen-go/default.nix b/nix/pkgs/protoc-gen-go/default.nix
@@ -1,8 +1,8 @@
 { pkgs ? import <nixpkgs> { } }:
 
-let 
-  inherit (pkgs) lib buildGo121Module fetchFromGitHub;
-in buildGo121Module rec {
+let
+  inherit (pkgs) lib buildGo122Module fetchFromGitHub;
+in buildGo122Module rec {
   pname = "protoc-gen-go";
   version = "1.34.1";
 

diff --git a/shell.nix b/shell.nix
@@ -29,7 +29,7 @@ in pkgs.mkShell {
     linuxdeployqt appimagekit
     libglvnd # TODO: Qt 5.15.2 fix, review after upgrade
     cmake_3_19 gnumake pkg-config gnugrep qtCustom
-    go_1_21 go-bindata mockgen protobuf3_20 protoc-gen-go
+    go_1_22 go-bindata mockgen protobuf3_20 protoc-gen-go
     pcre nss pcsclite extra-cmake-modules
     xorg.libxcb xorg.libX11 libxkbcommon
   ] ++ (with gst_all_1; [