From 1ab69d0c19dd07c94a0ffc6a6366fa2e6e142e47 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 31 Mar 2025 15:27:25 +0200 Subject: [PATCH 01/17] cinny-unwrapped: 4.5.1 -> 4.6.0 Release notes: https://github.com/cinnyapp/cinny/releases/tag/v4.6.0 Full changelog: https://github.com/cinnyapp/cinny/compare/v4.5.1...v4.6.0 (cherry picked from commit a4d5782d9a0fd897914d8934db7df5eb80bde225) --- pkgs/by-name/ci/cinny-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index c9a15df54063..5756aa776940 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-uwazJSd9I80ExKv22Ycg/fBDGZ1GuW4pcBo83lUwhoc="; + hash = "sha256-MyVKRWhLXxz4h2/2OtpmYrLYiZeNOMEetHwl4NklkOA="; }; - npmDepsHash = "sha256-o5txGbuNl+ZMk5acu/0/5CTNTvdP+Tqyw7heFRaZ4lM="; + npmDepsHash = "sha256-WNK1ke5NEbt2Gb92hEItnwu65rI/5VsbZDfTSp6aKvg="; # Fix error: no member named 'aligned_alloc' in the global namespace env.NIX_CFLAGS_COMPILE = lib.optionalString ( From 33943c19c2e2cb9f876314673742fe8d3993080d Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 31 Mar 2025 15:30:06 +0200 Subject: [PATCH 02/17] cinny-desktop: 4.5.1 -> 4.6.0 Release notes: https://github.com/cinnyapp/cinny-desktop/releases/tag/v4.6.0 Full changelog: https://github.com/cinnyapp/cinny-desktop/compare/v4.5.1...v4.6.0 (cherry picked from commit d5a0d93d537b6a0c393f53ece0935824b80b9ab4) --- pkgs/by-name/ci/cinny-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 8ead510ba928..64ec86289554 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -19,19 +19,19 @@ rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${version}"; - hash = "sha256-xWHR0lg/3w2K+hExKCD84hdQ7UCZRrOnH2dNybaYMFE="; + hash = "sha256-tSZ7qSEoLNUnMICT1oVccMY9J6uVZu8QJGJA9NK8JwU="; }; sourceRoot = "${src.name}/src-tauri"; useFetchCargoVendor = true; - cargoHash = "sha256-iI0oWuETVVPuoKlWplsgocF7DEvwTVSp5r1WmQd7R04="; + cargoHash = "sha256-5rIbVYxSsjv+MvmZxviMhcfYN+jOFndvZa7PDO5DLn8="; postPatch = let From d7010f0f63206c8c836c78270abad4cb2551a187 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Mar 2025 01:35:14 +0000 Subject: [PATCH 03/17] mcaselector: 2.4.2 -> 2.5 (cherry picked from commit 5277ba6628f013993bf4a783ccc1561bbb099696) --- pkgs/tools/games/minecraft/mcaselector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/tools/games/minecraft/mcaselector/default.nix index 8745c9b5ba99..8d14fe04651b 100644 --- a/pkgs/tools/games/minecraft/mcaselector/default.nix +++ b/pkgs/tools/games/minecraft/mcaselector/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "mcaselector"; - version = "2.4.2"; + version = "2.5"; src = fetchurl { url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar"; - hash = "sha256-3Kq3vkBiz3A5tUSLNqDHNpognF2Q9HhU8WXwdRVxfSE="; + hash = "sha256-7u4EE8U7XTdlFj/hzZhis8lScyRz4Izx7KoJ+r3ZL00="; }; dontUnpack = true; From cf4f31b755503eaf0ee8da8f61e2205a057b258e Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 25 Mar 2025 19:01:05 +0100 Subject: [PATCH 04/17] mcaselector: 2.5 -> 2.5.1 Signed-off-by: Sefa Eyeoglu (cherry picked from commit f5ef9071f1ad5f2847f0c84fa233fcf45b0f2796) --- pkgs/tools/games/minecraft/mcaselector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/tools/games/minecraft/mcaselector/default.nix index 8d14fe04651b..15232f4c1f95 100644 --- a/pkgs/tools/games/minecraft/mcaselector/default.nix +++ b/pkgs/tools/games/minecraft/mcaselector/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "mcaselector"; - version = "2.5"; + version = "2.5.1"; src = fetchurl { url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar"; - hash = "sha256-7u4EE8U7XTdlFj/hzZhis8lScyRz4Izx7KoJ+r3ZL00="; + hash = "sha256-pdnJK35hWFAJogRzICVerqfpGJqVxWgRsy1v5nlCLGc="; }; dontUnpack = true; From ea9e2c26615462f7c702f92cf7b7d8480c3ad039 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 14 Dec 2024 09:02:52 +1000 Subject: [PATCH 05/17] go_1_24: init at 1.24rc1 --- pkgs/development/compilers/go/1.24.nix | 203 ++++++++++++++++++ .../development/compilers/go/bootstrap122.nix | 27 +++ pkgs/top-level/all-packages.nix | 5 + 3 files changed, 235 insertions(+) create mode 100644 pkgs/development/compilers/go/1.24.nix create mode 100644 pkgs/development/compilers/go/bootstrap122.nix diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix new file mode 100644 index 000000000000..92653cfeebde --- /dev/null +++ b/pkgs/development/compilers/go/1.24.nix @@ -0,0 +1,203 @@ +{ + lib, + stdenv, + fetchurl, + tzdata, + substituteAll, + iana-etc, + apple-sdk_11, + xcbuild, + mailcap, + buildPackages, + pkgsBuildTarget, + threadsCross, + testers, + skopeo, + buildGo124Module, +}: + +let + goBootstrap = buildPackages.callPackage ./bootstrap122.nix { }; + + skopeoTest = skopeo.override { buildGoModule = buildGo124Module; }; + + goarch = + platform: + { + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "i686" = "386"; + "mips" = "mips"; + "mips64el" = "mips64le"; + "mipsel" = "mipsle"; + "powerpc64" = "ppc64"; + "powerpc64le" = "ppc64le"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; + "x86_64" = "amd64"; + "wasm32" = "wasm"; + } + .${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; + + isCross = stdenv.buildPlatform != stdenv.targetPlatform; +in +stdenv.mkDerivation (finalAttrs: { + pname = "go"; + version = "1.24rc1"; + + src = fetchurl { + url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; + hash = "sha256-r9iiP9Jg8qJG0XQEmgdrigW7C62T8SIHaNIZuL33U50="; + }; + + strictDeps = true; + buildInputs = + [ ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ + apple-sdk_11 + xcbuild + ]; + + depsBuildTarget = lib.optional isCross targetCC; + + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; + + postPatch = '' + patchShebangs . + ''; + + patches = [ + (substituteAll { + src = ./iana-etc-1.17.patch; + iana = iana-etc; + }) + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + (substituteAll { + src = ./mailcap-1.17.patch; + inherit mailcap; + }) + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + (substituteAll { + src = ./tzdata-1.19.patch; + inherit tzdata; + }) + ./remove-tools-1.11.patch + ./go_no_vendor_checks-1.22.patch + ]; + + GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if isCross then "${targetCC}/bin/${targetCC.targetPrefix}cc" else null; + CXX_FOR_TARGET = if isCross then "${targetCC}/bin/${targetCC.targetPrefix}c++" else null; + + GOARM = toString ( + lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ] + ); + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 + # Wasi does not support CGO + CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1; + + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + + buildPhase = '' + runHook preBuild + export GOCACHE=$TMPDIR/go-cache + + export PATH=$(pwd)/bin:$PATH + + ${lib.optionalString isCross '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + + pushd src + ./make.bash + popd + runHook postBuild + ''; + + preInstall = + '' + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + + ( + if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then + '' + mv bin/*_*/* bin + rmdir bin/*_* + ${lib.optionalString + (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) + '' + rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} + '' + } + '' + else + lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' + rm -rf bin/*_* + ${lib.optionalString + (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) + '' + rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH} + '' + } + '' + ); + + installPhase = '' + runHook preInstall + mkdir -p $out/share/go + cp -a bin pkg src lib misc api doc go.env $out/share/go + mkdir -p $out/bin + ln -s $out/share/go/bin/* $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + passthru = { + inherit goBootstrap skopeoTest; + tests = { + skopeo = testers.testVersion { package = skopeoTest; }; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "go version"; + version = "go${finalAttrs.version}"; + }; + }; + }; + + meta = with lib; { + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}"; + description = "Go Programming language"; + homepage = "https://go.dev/"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; + mainProgram = "go"; + }; +}) diff --git a/pkgs/development/compilers/go/bootstrap122.nix b/pkgs/development/compilers/go/bootstrap122.nix new file mode 100644 index 000000000000..44ebbb29f266 --- /dev/null +++ b/pkgs/development/compilers/go/bootstrap122.nix @@ -0,0 +1,27 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "1.22.10"; + hashes = { + # Use `print-hashes.sh ${version}` to generate the list below + darwin-amd64 = "dd2c4ac3702658c2c20e3a8b394da1917d86156b2cb4312c9d2f657f80067874"; + darwin-arm64 = "21cf49415ffe0755b45f2b63e75d136528a32f7bb7bdd0166f51d22a03eb0a3f"; + freebsd-386 = "f82f5d194114963693e0f51fd56d55d8417ca556438062f2b0df608473b62837"; + freebsd-amd64 = "cce9da240870a4430c5cf1227bcf29d37575043ff16f7982a69f1139c6f564b5"; + freebsd-arm64 = "abae388d0d42563a242db0d405172cb73e09236f68000ff90c2a327ec8c5764c"; + freebsd-armv6l = "7c9c8fe30cbabbb4fb597f0f0ad1279fd2b320bc70831eba4c207b55ad46931d"; + freebsd-riscv64 = "d6f25fd79e17b84d1b61bec3e2fdffc47377b28b51a04b6bdbeac0199313e059"; + linux-386 = "2ae9f00e9621489b75494fa2b8abfc5d09e0cae6effdd4c13867957ad2e4deba"; + linux-amd64 = "736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092"; + linux-arm64 = "5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec"; + linux-armv6l = "a7bbbc80fe736269820bbdf3555e91ada5d18a5cde2276aac3b559bc1d52fc70"; + linux-loong64 = "0be34dbc69726b52414e0283736f997fee477379ebff66cebd7d8c35f4f64f9d"; + linux-mips = "bb7d7e99db7ee70063cb57bb7395c392b8b5ed87f37d733a1c91de935c70bb91"; + linux-mips64 = "c7f0571410297cb29e52d10fed7a2a21aeaeabb9539d0c04a6d778adf0fe7f1b"; + linux-mips64le = "e66c440c03dd19bf8423034cbde7f6813321beb18d3fcf2ef234c13a25467952"; + linux-mipsle = "b4e0061f62a9c1f874893aa4951a4883c19762a9dd64c5710554ec5a7aaf311a"; + linux-ppc64 = "4192158cdedc6a124aa32a099cc6bebebabf1f4d380c46c5e36ea52c30a3888b"; + linux-ppc64le = "db05b9838f69d741fb9a5301220b1a62014aee025b0baf341aba3d280087b981"; + linux-riscv64 = "aef9b186c1b9b58c0472dbf54978f97682852a91b2e8d6bf354e59ba9c24438a"; + linux-s390x = "4ab2286adb096576771801b5099760b1d625fd7b44080449151a4d9b21303672"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afedc8e9375f..b406e9c7b96c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12604,6 +12604,11 @@ with pkgs; go = buildPackages.go_1_23; }; + go_1_24 = callPackage ../development/compilers/go/1.24.nix { }; + buildGo124Module = callPackage ../build-support/go/module.nix { + go = buildPackages.go_1_24; + }; + ### DEVELOPMENT / HARE hareHook = callPackage ../by-name/ha/hare/hook.nix { }; From 7a98de45a77f1953db9ebc640b6feee175497515 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 17 Jan 2025 10:38:31 +0100 Subject: [PATCH 06/17] go_1_24: 1.24rc1 -> 1.24rc2 Signed-off-by: Paul Meyer --- pkgs/development/compilers/go/1.24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 92653cfeebde..6184d17a6d3f 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24rc1"; + version = "1.24rc2"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-r9iiP9Jg8qJG0XQEmgdrigW7C62T8SIHaNIZuL33U50="; + hash = "sha256-uge2hj8ggWDo8J8RyLlYJym1HP63Us5rp5o3m0+8rG0="; }; strictDeps = true; From 6733e010fb95eb4f8e6b171a2f8733f50cbfeef4 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 6 Feb 2025 08:31:02 +0100 Subject: [PATCH 07/17] go_1_24: rc2 -> rc3 Signed-off-by: Paul Meyer --- pkgs/development/compilers/go/1.24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 6184d17a6d3f..7ec74dabbc11 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24rc2"; + version = "1.24rc3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-uge2hj8ggWDo8J8RyLlYJym1HP63Us5rp5o3m0+8rG0="; + hash = "sha256-LHEopY9iz9706vaOe5vxh/P/6i7AZ1SmTW7ja/6j1pE="; }; strictDeps = true; From e434e79ed41df38dcc99f1754d55c4f36bae1ff6 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 11 Feb 2025 13:47:23 -0500 Subject: [PATCH 08/17] go_1_24: 1.24rc3 -> 1.24.0 --- pkgs/development/compilers/go/1.24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 7ec74dabbc11..933bb8d1feaf 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24rc3"; + version = "1.24.0"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-LHEopY9iz9706vaOe5vxh/P/6i7AZ1SmTW7ja/6j1pE="; + hash = "sha256-0UEgYUrLKdEryrcr1onyV+tL6eC2+IqPt+Qaxl+FVuU="; }; strictDeps = true; From 7f1f7f56cb38c2d3ac4f966a5dd21fcf5d02a271 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Wed, 5 Mar 2025 08:06:29 +0100 Subject: [PATCH 09/17] go_1_24: 1.24.0 -> 1.24.1 Signed-off-by: Paul Meyer --- pkgs/development/compilers/go/1.24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 933bb8d1feaf..a632c1fc2a4c 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-0UEgYUrLKdEryrcr1onyV+tL6eC2+IqPt+Qaxl+FVuU="; + hash = "sha256-gkTr9GxlYH2xAiK1gGrrMcH8+JecG2sS9gxnfpo8BlY="; }; strictDeps = true; From dce3f0197d214a9febe2433e322a973985068da4 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 1 Apr 2025 18:50:59 +0200 Subject: [PATCH 10/17] go_1_24: 1.24.1 -> 1.24.2 Signed-off-by: Paul Meyer --- pkgs/development/compilers/go/1.24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index a632c1fc2a4c..e4e48d9b3f34 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-gkTr9GxlYH2xAiK1gGrrMcH8+JecG2sS9gxnfpo8BlY="; + hash = "sha256-ncd/+twW2DehvzLZnGJMtN8GR87nsRnt2eexvMBfLgA="; }; strictDeps = true; From 1aaf61fe75aed0bdf65e7f9a84512b8162860814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 15 Apr 2025 15:44:27 +0200 Subject: [PATCH 11/17] portunus: 2.1.1 -> 2.1.2 Diff: https://github.com/majewsky/portunus/compare/v2.1.1...v2.1.2 --- pkgs/by-name/po/portunus/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/po/portunus/package.nix b/pkgs/by-name/po/portunus/package.nix index 96408db6f66d..2eb86491def1 100644 --- a/pkgs/by-name/po/portunus/package.nix +++ b/pkgs/by-name/po/portunus/package.nix @@ -1,20 +1,20 @@ { lib, - buildGoModule, + buildGo124Module, fetchFromGitHub, libxcrypt, nixosTests, }: -buildGoModule rec { +buildGo124Module rec { pname = "portunus"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "majewsky"; repo = "portunus"; rev = "v${version}"; - sha256 = "sha256-+pMMIutj+OWKZmOYH5NuA4a7aS5CD+33vAEC9bJmyfM="; + sha256 = "sha256-nLFwfH1K6vsgNATwAxyq/q6HTtfLK8gsQhei7eJ86Kc="; }; buildInputs = [ libxcrypt ]; From 71ab7e9098b9308c4b9aba4cfe4eb37177a982aa Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 15 Apr 2025 18:41:51 +1000 Subject: [PATCH 12/17] ruby_3_4: 3.4.1 -> 3.4.3 Release notes: https://github.com/ruby/ruby/releases/tag/v3_4_2 Release notes: https://github.com/ruby/ruby/releases/tag/v3_4_3 (cherry picked from commit fb4390604f89825e423bd82c9e3d60b2ae1c7e08) --- pkgs/development/interpreters/ruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 15a02c1f4e02..ad63232bbea1 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -441,8 +441,8 @@ in }; ruby_3_4 = generic { - version = rubyVersion "3" "4" "1" ""; - hash = "sha256-PTheXSLTaLBkyBehPtjjzD9xp3BdftG654ATwzqnyH8="; + version = rubyVersion "3" "4" "3" ""; + hash = "sha256-VaTNHcvlyifPZeiak1pILCuyKEgyk5JmVRwOxotDf0Y="; cargoHash = "sha256-kdfNY8wVmSRR+cwEDYge/HDPRvdTNKLk/BhgqQeelOg="; }; } From dfb90afc608f722f7b8d14381d5422ad727819e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Apr 2025 06:31:32 +0000 Subject: [PATCH 13/17] brave: 1.77.95 -> 1.77.97 (cherry picked from commit af4c04018f810362510d76fca9876cdab86f25bb) --- pkgs/by-name/br/brave/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 634d7acf32bd..0d11a4b64ec5 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.77.95"; + version = "1.77.97"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-jK9narldfjxgtRjOR2P/0r2hVwFF+D60iCHOIrVTBdM="; + hash = "sha256-1MIcibP89EMCOK4A9lbXxGgwvMKCB+3UxrT+UYiwmtk="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-k4x2TdTIlYPCJ/u30JrwPt0AOSvt16qrxisHjqkDNY8="; + hash = "sha256-6JO67t5yR2psvlYhOMERnMgta+YYTIQx/zen7y3B1Ec="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-apJFnG80joh7RMJndJI7jU6tgS2QwHZpnackVp4rCek="; + hash = "sha256-d2MQMf1twOhcAouIPpdjG5jB/tZ7FGi/lrRJZ/A/ibs="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-wdKIFUwGKJdI7EiMFIrOJuLnMaeBSGgDOk2QUwhNlLE="; + hash = "sha256-vEF26I1+nqBERFdZEKLcDZBDru0RXcwytvblRuqL8/M="; }; }; From 43de5ad76d13b90ea5f9c6a8d6bd96102c8020dd Mon Sep 17 00:00:00 2001 From: James Ward Date: Thu, 10 Apr 2025 17:03:37 -0600 Subject: [PATCH 14/17] amazon-q-cli: 1.7.2 -> 1.7.3 (cherry picked from commit 99c18ee6eab53fa8bcacb3fe5bd9df6bdeb28f1f) --- pkgs/by-name/am/amazon-q-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index 0d7082f3f787..a5432f353e58 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "amazon-q-cli"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-q-developer-cli"; tag = "v${version}"; - hash = "sha256-uKsj7QBKomkO1xP5VgOGI5W8CHIgPQx4QsS2voghrVc="; + hash = "sha256-Hi0klNNxtWlZvcqobb8Y2hLsw/Pck1YQZB4AYBmcNKI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-G99vb+7eomxDy9xFJjKA+KpCH2NUzitAKHZE5b62Db8="; + cargoHash = "sha256-XK6B2OTCnWMow3KHWU6OK1HsyQW7apcLoYRP7viTte0="; cargoBuildFlags = [ "-p" From 293f26f70d42b0a274301a3e8c744129c686d0e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 13:50:17 +0000 Subject: [PATCH 15/17] microsoft-edge: 134.0.3124.95 -> 135.0.3179.54 (cherry picked from commit 33125d154431f9f718e0a1d34b8db4791783f838) --- pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index c064a0542d4f..6bb65ed33a8d 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -174,11 +174,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "134.0.3124.95"; + version = "135.0.3179.54"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-vgTJl9BmMdm4Aw1FCpIfqzfmgsLuY61G/RSkA66kPhI="; + hash = "sha256-AppUIXOFouGRxMM6ioZq0cglKkNh811n+36z5yvVAuc="; }; # With strictDeps on, some shebangs were not being patched correctly From 6dcb23b523504fb79f3340b7f92d3d1b86ec9526 Mon Sep 17 00:00:00 2001 From: ToasterUwU Date: Tue, 15 Apr 2025 20:44:04 +0200 Subject: [PATCH 16/17] pyfa: 2.62.2 -> 2.62.3 (cherry picked from commit c40fa1e16345294584a74a4c0baeef180016e7e8) --- pkgs/by-name/py/pyfa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index fa7c5c7ddb1e..821759ad8413 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -8,7 +8,7 @@ gdk-pixbuf, }: let - version = "2.62.2"; + version = "2.62.3"; in python3Packages.buildPythonApplication rec { inherit version; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-7YFObKV4vXiTWgCfek7k4yVq7IG3JMtaB36Jhu7rGjk="; + hash = "sha256-PqiwZwok7Mv1M4txU3D5MZYu8WxDCetLmvTqZ30rypY="; }; build-system = [ python3Packages.setuptools ]; From a75fd524834f3452fd1aec76f4d6f7cf9b3dda39 Mon Sep 17 00:00:00 2001 From: Sapphire Date: Tue, 15 Apr 2025 19:38:25 -0500 Subject: [PATCH 17/17] vesktop: 1.5.5 -> 1.5.6 (cherry picked from commit 5b328f10f58c0cd5c0647dc2efa6b4655a897082) --- pkgs/by-name/ve/vesktop/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 56675ee25ebc..28645384bad8 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -13,7 +13,7 @@ pipewire, libpulseaudio, autoPatchelfHook, - pnpm_9, + pnpm_10, nodejs, nix-update-script, withTTS ? true, @@ -24,29 +24,29 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-z2MKnCWDWUczoz39zzBYRB6wiSU1SRRHLpeUZeJqbLc="; + hash = "sha256-hY707k3kpfbDaRsLisVQFUeWgsxkYJ29GTdQtdeC0X4="; }; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src patches ; - hash = "sha256-xn3yE2S6hfCijV+Edx3PYgGro8eF76/GqarOIRj9Tbg="; + hash = "sha256-pL4pxIB+tF9Lv5eQdLilvg/T4knjzPqBMbTxoZ3RqbI="; }; nativeBuildInputs = [ nodejs - pnpm_9.configHook + pnpm_10.configHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # vesktop uses venmic, which is a shipped as a prebuilt node module