From 6fd4a4bba731bad848cacb076c369502e5116853 Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Thu, 16 Jan 2025 23:17:39 +0530 Subject: [PATCH] nix: upgrade go to 1.22 --- nix/overlay.nix | 4 ++-- nix/pkgs/go/bootstrap121.nix | 22 ---------------------- nix/pkgs/go/bootstrap122.nix | 22 ++++++++++++++++++++++ nix/pkgs/mockgen/default.nix | 4 ++-- nix/pkgs/protoc-gen-go/default.nix | 6 +++--- shell.nix | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 nix/pkgs/go/bootstrap121.nix create mode 100644 nix/pkgs/go/bootstrap122.nix diff --git a/nix/overlay.nix b/nix/overlay.nix index e7a251c1d7c..6ff0a5779ef 100644 --- 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 deleted file mode 100644 index 625eb8b8306..00000000000 --- a/nix/pkgs/go/bootstrap121.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ callPackage }: -callPackage ./binary.nix { - version = "1.21.11"; - hashes = { - # Use `print-hashes.sh ${version}` to generate the list below - darwin-amd64 = "a3efff72f7aba31c85b53ebfd3985d0e3157a87b0e69e178161ba7097c197885"; - darwin-arm64 = "0142f5ac9f9a1bf19b826ee08a8c7955a745f7a2e62d36e0566d29fcac4d88e0"; - linux-386 = "8b00cbc2519c2d052177bf2c8472bf06578d3b0182eeb3406a1d7d4e5d4c59ef"; - linux-amd64 = "54a87a9325155b98c85bc04dc50298ddd682489eb47f486f2e6cb0707554abf0"; - linux-arm64 = "715d9a7ff72e4e0e3378c48318c52c6e4dd32a47c4136f3c08846f89b2ee2241"; - linux-armv6l = "a62bff8297816a387a36bbda2889dd0dbcf0f8ce03bc62162ecd6918d6acecb5"; - linux-loong64 = "19c738e3670efb6581a91d7d93e719080ccf710684938d015ab3e7ca044715be"; - linux-mips = "4240bd1a4ca8ab664ead554b418bd1b1f319b063258763ade44f81a4dd018e61"; - linux-mips64 = "6245001da9e2c39698f97543019f9faf4813f0564e471ec654f4698e0b9f19eb"; - linux-mips64le = "d10166bb6ea6538e24f01ac9bcbbbaee5657d07b9edc11a82cbf569355a36534"; - linux-mipsle = "8ab7e1af86845aa39bc93e1ae7e58f79a0b8df59783129c3b73aa0379f693c4a"; - linux-ppc64 = "2939e56894877c51eb9c579f55588b80c77f38481240042512307ad1db5b3dd8"; - linux-ppc64le = "6f5e18187abc4ff1c3173afbe38ef29f84b6d1ee7173f40075a4134863b209a5"; - linux-riscv64 = "3ee5f9aac2f252838d88bb4cf93560c567814889c74d87ad8a04be16aa5e1b21"; - linux-s390x = "489c363d5da2d3d5709419bda61856582c5ebdc7874ca7ecdebf67d736d329e6"; - }; -} diff --git a/nix/pkgs/go/bootstrap122.nix b/nix/pkgs/go/bootstrap122.nix new file mode 100644 index 00000000000..bd1a415d82a --- /dev/null +++ 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 index 5d2ac2bdcb9..39606aa6f62 100644 --- 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 index ecb283b18b6..55718b9a9ef 100644 --- a/nix/pkgs/protoc-gen-go/default.nix +++ b/nix/pkgs/protoc-gen-go/default.nix @@ -1,8 +1,8 @@ { pkgs ? import { } }: -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 index d93290803b2..80d07519644 100644 --- 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; [