From 5c0f6f6456c67d569ba5cf370de225d43804d3be Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 4 Mar 2025 06:06:22 +1100 Subject: [PATCH 01/36] wasmserve: 1.2.0 -> 1.2.1 Release: https://github.com/hajimehoshi/wasmserve/releases/tag/v1.2.1 --- pkgs/by-name/wa/wasmserve/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wasmserve/package.nix b/pkgs/by-name/wa/wasmserve/package.nix index 9e641f9fe1cf..fbdbd76a8fd6 100644 --- a/pkgs/by-name/wa/wasmserve/package.nix +++ b/pkgs/by-name/wa/wasmserve/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "wasmserve"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "hajimehoshi"; repo = "wasmserve"; rev = "v${version}"; - hash = "sha256-k8g5ZCMm0xek+rToq9azE7mOUHU5eF8PxgBcXs6LrJk="; + hash = "sha256-sj2PPCuvh2RkQq5rAPQZdr96a8FG7RL5RCzWBDt2TeI="; }; vendorHash = null; From 5e7f1dc98c6f12784cfabf8a1e1bff63252d6bab Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 9 Mar 2025 21:47:22 +0100 Subject: [PATCH 02/36] mdk3-master: unbreak on GCC-14 --- pkgs/by-name/md/mdk3-master/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/md/mdk3-master/package.nix b/pkgs/by-name/md/mdk3-master/package.nix index 2c0a9c5be10c..0dd2ebdbce60 100644 --- a/pkgs/by-name/md/mdk3-master/package.nix +++ b/pkgs/by-name/md/mdk3-master/package.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { runtimeDependencies = [ wirelesstools ]; + # fix + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + installPhase = '' runHook preInstall make -C osdep install From 59db8b84a82564d251bdd9957a2c2af2b8cb702d Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 9 Mar 2025 21:47:33 +0100 Subject: [PATCH 03/36] mdk3-master: modernize --- pkgs/by-name/md/mdk3-master/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/md/mdk3-master/package.nix b/pkgs/by-name/md/mdk3-master/package.nix index 0dd2ebdbce60..5a9ee6b9ce59 100644 --- a/pkgs/by-name/md/mdk3-master/package.nix +++ b/pkgs/by-name/md/mdk3-master/package.nix @@ -5,7 +5,7 @@ wirelesstools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mdk3-master"; version = "6-unstable-2015-05-24"; @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "MDK3 fork able to force reboot Access Points"; homepage = "https://github.com/charlesxsh/mdk3-master"; - changelog = "https://github.com/charlesxsh/mdk3-master/blob/${src.rev}/CHANGELOG"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ pinpox ]; + changelog = "https://github.com/charlesxsh/mdk3-master/blob/${finalAttrs.src.rev}/CHANGELOG"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ pinpox ]; mainProgram = "mdk3"; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) From dca28aed6b2270c4f676051545813b4e94c2fdb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Mar 2025 16:54:02 +0000 Subject: [PATCH 04/36] vuetorrent: 2.22.0 -> 2.23.0 --- pkgs/by-name/vu/vuetorrent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix index c0074d970cde..bcbc66e0898f 100644 --- a/pkgs/by-name/vu/vuetorrent/package.nix +++ b/pkgs/by-name/vu/vuetorrent/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "vuetorrent"; - version = "2.22.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "VueTorrent"; repo = "VueTorrent"; tag = "v${version}"; - hash = "sha256-4tjYvH9JQpHaCmG+5t+K7tyBOqN+RssbYTAHz6BgZw8="; + hash = "sha256-0OAfe0Kwjc8Shsz5isPMFlO4E9vKvmsKabsYC8rXY6c="; }; - npmDepsHash = "sha256-QLbfinszfRrpDDrG4UqzGW4yviry3jftCzlVB0vmRsI="; + npmDepsHash = "sha256-65MEBowimZrDs3EFzu2REB5wf2oHlydsztucd0cfn20="; installPhase = '' runHook preInstall From e53bd85882bd385ce705c60f1d4d8aa24d252d61 Mon Sep 17 00:00:00 2001 From: purpole <101905225+purpole@users.noreply.github.com> Date: Wed, 12 Mar 2025 18:41:03 +0100 Subject: [PATCH 05/36] sccmhunter: 1.0.6-unstable-2024-10-30 -> 1.0.8 --- pkgs/by-name/sc/sccmhunter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/sccmhunter/package.nix b/pkgs/by-name/sc/sccmhunter/package.nix index 62ced9ce2af8..fd2fefbae28e 100644 --- a/pkgs/by-name/sc/sccmhunter/package.nix +++ b/pkgs/by-name/sc/sccmhunter/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication rec { pname = "sccmhunter"; - version = "1.0.6-unstable-2024-11-07"; + version = "1.0.8"; pyproject = true; src = fetchFromGitHub { owner = "garrettfoster13"; repo = "sccmhunter"; - rev = "33c23f0d71e48127a0b03b06a019148df71049ef"; - hash = "sha256-mU3GKgX8gcuJ+YT3xL0/dDds34uhFD+Rc3m15W7zoKc="; + rev = "v.1.0.8"; + hash = "sha256-WCrC9YdiTx1qwsnylFK/6pjdwErimjcsJ0gSHegvkzo="; }; build-system = with python3Packages; [ From 15aa58ea65b014e1f3ddb6733f272e00e4ddf37d Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 13 Mar 2025 03:36:02 +0800 Subject: [PATCH 06/36] wlopm: 0.1.0 -> 1.0.0 --- pkgs/by-name/wl/wlopm/package.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wl/wlopm/package.nix b/pkgs/by-name/wl/wlopm/package.nix index b1b746120c79..6025fb941dc7 100644 --- a/pkgs/by-name/wl/wlopm/package.nix +++ b/pkgs/by-name/wl/wlopm/package.nix @@ -6,29 +6,35 @@ wayland-scanner, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttr: { pname = "wlopm"; - version = "0.1.0"; + version = "1.0.0"; src = fetchFromSourcehut { owner = "~leon_plickat"; repo = "wlopm"; - rev = "v${version}"; - sha256 = "sha256-kcUJVB5jP2qZ1YgJDEBsyn5AgwhRxQmzOrk0gKj1MeM="; + rev = "v${finalAttr.version}"; + hash = "sha256-GrcV51mUZUaiiYhko8ysaTieJoZDcunLn1yG5k+TpQQ="; }; strictDeps = true; + nativeBuildInputs = [ wayland-scanner ]; + buildInputs = [ wayland ]; installFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + preInstall = '' + mkdir -p $out/share/bash-completion/completions + ''; + + meta = { description = "Simple client implementing zwlr-output-power-management-v1"; homepage = "https://git.sr.ht/~leon_plickat/wlopm"; mainProgram = "wlopm"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ arjan-s ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arjan-s ]; + platforms = lib.platforms.linux; }; -} +}) From fd3518cd08f51255789b15649ccd949c6b23f623 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 15 Feb 2025 07:38:33 +0000 Subject: [PATCH 07/36] clash-rs: 0.7.4 -> 0.7.5 --- pkgs/by-name/cl/clash-rs/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index 886093d93ba8..0155e8d72370 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -7,18 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "clash-rs"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; tag = "v${version}"; - hash = "sha256-PaXcMJuenUrcCBdU3CZEIk9U5tZxSAVVtm9ttAldVLM="; + hash = "sha256-c4XF0F2ifTvbXTMGiJc1EaGTlS/X5ilZTpXe01uHs4Y="; }; useFetchCargoVendor = true; - - cargoHash = "sha256-ynGp1MU0l48mD+gfsyOFNo4jJDiDWgoPLc02WblPjt4="; + cargoHash = "sha256-ZSwNlknpZ0zKj+sklmO14Ey5DPZ0Wk9xxMiXwIiuRd0="; nativeInstallCheckInputs = [ protobuf From 190eb9581d77eac2a1fe259cc85aff61a371d68b Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 13 Mar 2025 14:00:40 -0400 Subject: [PATCH 08/36] kubernetes-helm: 3.17.1 -> 3.17.2 Diff: https://github.com/helm/helm/compare/v3.17.1...v3.17.2 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index c994b155d469..952c18256874 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.17.1"; + version = "3.17.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-wGORNOlfnBt8iApAP5s5tvy4Zfk87fOTpLSY5XYnzQM="; + sha256 = "sha256-EMvKmnf4KfimjPYHoylij2kZVnvClK3Q/+offZvlO1I="; }; - vendorHash = "sha256-dZN1rOcGDIvhqXi35904kTBQ8RPeS1PFgspzn/j1ZQU="; + vendorHash = "sha256-IX4zZnu8+cb2mJxQHOmZLUVxyqfWvbsRQR3q02Wpx6c="; subPackages = [ "cmd/helm" ]; ldflags = [ From 248d620e3640fafc6d3d7a3cb7f28bc4cfabbac8 Mon Sep 17 00:00:00 2001 From: Ariel Ebersberger Date: Thu, 13 Mar 2025 19:26:43 +0100 Subject: [PATCH 09/36] morgen: move package to pkgs/by-name --- .../morgen/default.nix => by-name/mo/morgen/package.nix} | 2 +- pkgs/{applications/office => by-name/mo}/morgen/update.sh | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 1 insertion(+), 5 deletions(-) rename pkgs/{applications/office/morgen/default.nix => by-name/mo/morgen/package.nix} (97%) rename pkgs/{applications/office => by-name/mo}/morgen/update.sh (100%) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/by-name/mo/morgen/package.nix similarity index 97% rename from pkgs/applications/office/morgen/default.nix rename to pkgs/by-name/mo/morgen/package.nix index df939e531e47..5c59d7a2ec64 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/by-name/mo/morgen/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "All-in-one Calendars, Tasks and Scheduler"; - homepage = "https://morgen.so/download"; + homepage = "https://morgen.so/"; mainProgram = "morgen"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; diff --git a/pkgs/applications/office/morgen/update.sh b/pkgs/by-name/mo/morgen/update.sh similarity index 100% rename from pkgs/applications/office/morgen/update.sh rename to pkgs/by-name/mo/morgen/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04b2f59bb27c..27271bd668b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4222,10 +4222,6 @@ with pkgs; docbook-xsl = docbook_xsl; }; - morgen = callPackage ../applications/office/morgen { - electron = electron_32; - }; - metasploit = callPackage ../tools/security/metasploit { }; mhost = callPackage ../applications/networking/mhost { From 7630ef89a83aab34f953f4846467a8b2d2a07b5f Mon Sep 17 00:00:00 2001 From: Ariel Ebersberger Date: Thu, 13 Mar 2025 19:26:57 +0100 Subject: [PATCH 10/36] morgen: fix update script --- pkgs/by-name/mo/morgen/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/morgen/update.sh b/pkgs/by-name/mo/morgen/update.sh index e12f86a04bbc..6eda4e9d8c38 100755 --- a/pkgs/by-name/mo/morgen/update.sh +++ b/pkgs/by-name/mo/morgen/update.sh @@ -23,4 +23,4 @@ echo "Latest version of Morgen is $latestVersion" update-source-version morgen "$latestVersion" # Fetch and update the hash -nix-prefetch-url --unpack "https://dl.todesktop.com/210203cqcj00tw1/versions/${latestVersion}/linux/deb" +nix-prefetch-url "https://dl.todesktop.com/210203cqcj00tw1/versions/${latestVersion}/linux/deb" From 6ecd6c11e8b9a48df352004d6557329ba2b66988 Mon Sep 17 00:00:00 2001 From: Ariel Ebersberger Date: Thu, 13 Mar 2025 19:28:14 +0100 Subject: [PATCH 11/36] morgen: 3.6.6 -> 3.6.9 --- pkgs/by-name/mo/morgen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix index 5c59d7a2ec64..c7c35cdae86b 100644 --- a/pkgs/by-name/mo/morgen/package.nix +++ b/pkgs/by-name/mo/morgen/package.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.6.6"; + version = "3.6.9"; src = fetchurl { name = "morgen-${version}.deb"; url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-QisOXMj6uUMluPruUjtOEK93l+aZe7qsJUAZ589RzvU="; + hash = "sha256-An3CfJQ89aqpxMOf20YG+cuEVDrhgMGAm/Scn4hMV8E="; }; nativeBuildInputs = [ From 2a8fe43e4de45aa0f706867f26669206b842c30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?= Date: Tue, 11 Mar 2025 21:22:00 +0100 Subject: [PATCH 12/36] ut1999: fix starting a multiplayer game Upstream has this fixed in the next release, but that is not out yet. Thus this fix allows multiplayer games until then. --- pkgs/by-name/ut/ut1999/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index 3301ac5668ec..53d8a9fa88a8 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -166,6 +166,17 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + # This can be removed with version 469e as that contains this file already + # Workaround for bug https://github.com/OldUnreal/UnrealTournamentPatches/issues/1578 + # that prevented starting or joining a multi player game + missing-file = fetchurl { + url = "https://gist.github.com/dwt/733d620fbbfd5c49da88683aef60d889/raw/73b271ef019412cf1be5ce1966842ef63a18ba39/de.u"; + hash = "sha256-M14imMl35KUT0tG8dgB+DBoXve/1saVL7hPNgUFo1hY="; + }; + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' + cp ${finalAttrs.missing-file} $out/Applications/UnrealTournament.app/Contents/MacOS/System/de.u + ''; + # Bring in game's .so files into lookup. Otherwise game fails to start # as: `Object not found: Class Render.Render` appendRunpaths = [ From 30b054b6475667ad617473a9f7aa289318f05c89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Mar 2025 22:31:47 +0000 Subject: [PATCH 13/36] cargo-tally: 1.0.59 -> 1.0.60 --- pkgs/by-name/ca/cargo-tally/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index d49e6f1fa555..d646b8a3f312 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.59"; + version = "1.0.60"; src = fetchCrate { inherit pname version; - hash = "sha256-YYDllHQAoNY/jOUVcHvjkwi38aXBH7dTXjxaOa6sdv0="; + hash = "sha256-d1nl3Gnk5huejUriwo1Q3+F6htIBe+uC36sDEXO5SGY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jO/0DS4SRRvw5Ie7LYtLB+dkpA4PvleUMKSFH7EE4E4="; + cargoHash = "sha256-XJZtOK+0+GJ1qM9OR/Z/764BfM+9VTYxBA9eOCHu4ms="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; From ab7dd371cf18ae7c720f4a0ac0fc4c767c1b67f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Mar 2025 22:47:44 +0000 Subject: [PATCH 14/36] drone-oss: 2.25.0 -> 2.26.0 --- .../tools/continuous-integration/drone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index e039a6ba910f..c077fae90f93 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.25.0"; + version = "2.26.0"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-FVuUkRYQGZNFaSpempluMbCYFndx0DRZjF9PfJkvCZo="; + sha256 = "sha256-rTMu3wd/drxALAZB0O5bAJuWdYsHSwwOD4nbAFIhXbg="; }; vendorHash = "sha256-9jzhoFN7aAUgPxENPuGYR41gXLzSv1VtnTPB38heVlI="; From 89f1870e47c0cf0c2da0b920aadc320e209515fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 00:04:31 +0000 Subject: [PATCH 15/36] hexpatch: 1.9.5 -> 1.10.0 --- pkgs/by-name/he/hexpatch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index 1e633897f8ad..5dc99a54e173 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "hexpatch"; - version = "1.9.5"; + version = "1.10.0"; src = fetchFromGitHub { owner = "Etto48"; repo = "HexPatch"; tag = "v${version}"; - hash = "sha256-DRuknqj4E+G4ChN5CH5N4Zrl3btSo1HdqiRPfLC5YTE="; + hash = "sha256-GzDrB0UJxBc2U/JXcJee7dMvlahD2Qqaen14677q+28="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tBOsFbJUi+xxYx+nEKBbwN8i0GDmGSjuJY05ghC6Rl0="; + cargoHash = "sha256-G9Mm89nb9dJH+vl6YL9mlisD+/wrFiSYnuSuobBon9c="; nativeBuildInputs = [ cmake From 80bb47a17bcc4119a8d7cc7519df6b41ba7c4cae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 00:55:41 +0000 Subject: [PATCH 16/36] xk6: 0.14.3 -> 0.14.4-4c1 --- pkgs/by-name/xk/xk6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix index 1cf7aa8f8c83..7da517ddf90d 100644 --- a/pkgs/by-name/xk/xk6/package.nix +++ b/pkgs/by-name/xk/xk6/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "xk6"; - version = "0.14.3"; + version = "0.14.4-4c1"; src = fetchFromGitHub { owner = "grafana"; repo = "xk6"; tag = "v${version}"; - hash = "sha256-pxiZelbAEEtibNdpEuRplPFtJ61YicoiAnAs8oaX6IA="; + hash = "sha256-r8DbE6H4VFFzRq2uKj+N2mgN/V0w5PVWf3FvmB0YwbM="; }; vendorHash = null; From 9621479c63ee279c64fce3d97d9c29e405fb8e43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 04:35:01 +0000 Subject: [PATCH 17/36] kubevirt: 1.4.0 -> 1.5.0 --- pkgs/by-name/ku/kubevirt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix index 93b409588848..ba8da889fd96 100644 --- a/pkgs/by-name/ku/kubevirt/package.nix +++ b/pkgs/by-name/ku/kubevirt/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - hash = "sha256-FMKug/V1R1SB75zcsOxNAdP6A/YeNEkore88j+38yF8="; + hash = "sha256-Hjqk3A/GtpcT++GyiYBL24X99IrwXzQMXRqTKgOD6Ak="; }; vendorHash = null; From 2a3ed72526ee9afe1e660772a8b5bf7d8539ce05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 05:29:19 +0000 Subject: [PATCH 18/36] maltego: 4.9.1 -> 4.9.2 --- pkgs/by-name/ma/maltego/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix index 41de89224b5b..d3a3570aaba8 100644 --- a/pkgs/by-name/ma/maltego/package.nix +++ b/pkgs/by-name/ma/maltego/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maltego"; - version = "4.9.1"; + version = "4.9.2"; src = fetchzip { url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip"; - hash = "sha256-0bh1dsYBK6VO43mSxzVR1UOg8vCEJvf1pR/EREZ9Uxg="; + hash = "sha256-+jPfIqvaVLo+s/yNHc5fHtnEMClcHtLVsVzFi4LZnK0="; }; postPatch = '' From b8826621203567a458693fd89d75368e5b35bfee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 11:12:14 +0000 Subject: [PATCH 19/36] tandoor-recipes: 1.5.31 -> 1.5.32 --- pkgs/applications/misc/tandoor-recipes/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index eebcdc14d170..d840bc808327 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.31"; + version = "1.5.32"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - hash = "sha256-58ysUfjQD2aNh+dA9kSzHMgpVhMrSfDwvgpfmoaWIjI="; + hash = "sha256-CNlst4bpvRSOPABg85k9xltbrZhs5MQLfJr+t7l7hhI="; }; - yarnHash = "sha256-lU8QrTkI32XOHefIkj/0fa2UKhuZpQIT1wyweQnzXmQ="; + yarnHash = "sha256-CFPofExwhvto6FVBXdsEY/uZaVKPkWaSdfqkEV7KY70="; meta = with lib; { homepage = "https://tandoor.dev/"; From 634ea3f27d51af273f46a81c26d8f4df9eef5640 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 13 Mar 2025 03:53:19 +0800 Subject: [PATCH 20/36] wluma: 4.6.1 -> 4.9.0 --- pkgs/by-name/wl/wluma/package.nix | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/wl/wluma/package.nix b/pkgs/by-name/wl/wluma/package.nix index e8cba7a25bcd..7de4756258e2 100644 --- a/pkgs/by-name/wl/wluma/package.nix +++ b/pkgs/by-name/wl/wluma/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, makeWrapper, rustPlatform, @@ -17,30 +16,26 @@ rustPlatform.buildRustPackage rec { pname = "wluma"; - version = "4.6.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "maximbaz"; repo = "wluma"; - rev = version; - sha256 = "sha256-ds/qBaQNyZ/HdetI1QdJOZcjVotz4xHgoIIuWI9xOEg="; + tag = version; + hash = "sha256-K/AJP+2J+u83sCCbyXvCLh51Ip979nSnb0bjT22Y2+0="; }; postPatch = '' - substituteInPlace Makefile --replace \ - 'target/release/$(BIN)' \ - 'target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/$(BIN)' - # Needs chmod and chgrp - substituteInPlace 90-wluma-backlight.rules --replace \ + substituteInPlace 90-wluma-backlight.rules --replace-fail \ 'RUN+="/bin/' 'RUN+="${coreutils}/bin/' - substituteInPlace wluma.service --replace \ + substituteInPlace wluma.service --replace-fail \ 'ExecStart=/usr/bin/wluma' 'ExecStart=${placeholder "out"}/bin/wluma' ''; useFetchCargoVendor = true; - cargoHash = "sha256-1zBp6eTkIDSMzNN5jKKu6lZVzzBJY+oB6y5UESlm/yA="; + cargoHash = "sha256-+uJ9SytwucYiuzTwdKTAfHb81LyV9NZmGOlzm6Qjftw="; nativeBuildInputs = [ makeWrapper @@ -56,12 +51,6 @@ rustPlatform.buildRustPackage rec { dbus ]; - postBuild = '' - make docs - ''; - - dontCargoInstall = true; - installFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' wrapProgram $out/bin/wluma \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}" @@ -69,18 +58,18 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Automatic brightness adjustment based on screen contents and ALS"; homepage = "https://github.com/maximbaz/wluma"; changelog = "https://github.com/maximbaz/wluma/releases/tag/${version}"; - license = licenses.isc; - maintainers = with maintainers; [ + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ yshym jmc-figueira atemu Rishik-Y ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "wluma"; }; } From e7fbec8c21240badd0b131a6c22c5c69c1ea24e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 13:43:15 +0000 Subject: [PATCH 21/36] kin-openapi: 0.129.0 -> 0.130.0 --- pkgs/by-name/ki/kin-openapi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix index fa854b28c2f3..f407381077ec 100644 --- a/pkgs/by-name/ki/kin-openapi/package.nix +++ b/pkgs/by-name/ki/kin-openapi/package.nix @@ -5,14 +5,14 @@ }: buildGoModule rec { pname = "kin-openapi"; - version = "0.129.0"; - vendorHash = "sha256-/pXC1YHqbeM6skwTQZ9ZPjroIC6XYq5/A1riWWJFaYY="; + version = "0.130.0"; + vendorHash = "sha256-VtN2dOJEBAS7khjn2GlvMspFvd7SgMqNWBte3gwbWng="; src = fetchFromGitHub { owner = "getkin"; repo = "kin-openapi"; tag = "v${version}"; - hash = "sha256-eYAsKklrIJanXbA5NZdX2utLWK66h1MQtKBuzMMaXSQ="; + hash = "sha256-e8oSnd3CJex+7hCI+hvptYnubIRLybKWh1ydMlHgJok="; }; checkFlags = From 54b856fdcd658a87a7bed6f4ce67fc2f8e0a1e2e Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 14 Mar 2025 15:23:43 +0100 Subject: [PATCH 22/36] rofimoji: remove rofi --- pkgs/by-name/ro/rofimoji/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix index 6ca2d660a04f..ad104c00aebc 100644 --- a/pkgs/by-name/ro/rofimoji/package.nix +++ b/pkgs/by-name/ro/rofimoji/package.nix @@ -7,7 +7,6 @@ waylandSupport ? true, x11Support ? true, - rofi, wl-clipboard, wtype, xdotool, @@ -36,7 +35,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = [ python3Packages.configargparse - rofi ] ++ lib.optionals waylandSupport [ wl-clipboard From 9afb1a4753687cd8f46ba1fa45f47ad5e0937062 Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Tue, 11 Mar 2025 11:34:31 +0100 Subject: [PATCH 23/36] databricks-cli: 0.237 -> 0.243 --- pkgs/by-name/da/databricks-cli/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index b4d80becdd75..6f2a8937ad13 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -8,18 +8,22 @@ buildGoModule rec { pname = "databricks-cli"; - version = "0.237.0"; + version = "0.243.0"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${version}"; - hash = "sha256-dGhEOghGs0Fif1/6Yfyy+aMzY+/ougl7GiPh3AikE1c="; + hash = "sha256-U1ZQFRPL9iYtCHJXBdgCgaE1LZgKOWdYJ1gFAsgWPI8="; }; - vendorHash = "sha256-GYgbZ8JdQXEOYCAxrloHccA0eS02hs9NTMRfD+hakks="; + vendorHash = "sha256-InVmtV3PH75exsftC3sxz9/xt9drJPlXgRYqvqnp+yM="; - excludedPackages = [ "bundle/internal" ]; + excludedPackages = [ + "bundle/internal" + "acceptance" + "integration" + ]; postBuild = '' mv "$GOPATH/bin/cli" "$GOPATH/bin/databricks" @@ -34,6 +38,8 @@ buildGoModule rec { "TestExpandPipelineGlobPaths" "TestRelativePathTranslationDefault" "TestRelativePathTranslationOverride" + # Use venv + "TestVenvSuccess" ]); nativeCheckInputs = [ @@ -58,6 +64,8 @@ buildGoModule rec { homepage = "https://github.com/databricks/cli"; changelog = "https://github.com/databricks/cli/releases/tag/v${version}"; license = licenses.databricks; - maintainers = with maintainers; [ kfollesdal ]; + maintainers = with maintainers; [ + kfollesdal + ]; }; } From a1854c77d36583f56b5bae63e6baae3cbf18f8f9 Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Fri, 14 Mar 2025 16:06:23 +0100 Subject: [PATCH 24/36] databricks-cli: add taranarmo as maintainer --- pkgs/by-name/da/databricks-cli/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index 6f2a8937ad13..a31d005657d0 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -66,6 +66,7 @@ buildGoModule rec { license = licenses.databricks; maintainers = with maintainers; [ kfollesdal + taranarmo ]; }; } From 7d3ee347cee898a6749992d54fc34bb362ae25fa Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Fri, 14 Mar 2025 23:31:43 +0800 Subject: [PATCH 25/36] pds: 0.4.74 -> 0.4.107 --- pkgs/by-name/pd/pds/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pd/pds/package.nix b/pkgs/by-name/pd/pds/package.nix index 4dbe0e355763..17651e7959ba 100644 --- a/pkgs/by-name/pd/pds/package.nix +++ b/pkgs/by-name/pd/pds/package.nix @@ -20,13 +20,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pds"; - version = "0.4.74"; + version = "0.4.107"; src = fetchFromGitHub { owner = "bluesky-social"; repo = "pds"; - rev = "v${finalAttrs.version}"; - hash = "sha256-kNHsQ6funmo8bnkFBNWHQ0Fmd5nf/uh+x9buaRJMZnM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-cS9BVR14CAqT1dMw8afd3jVygG1h9bdF0QZ7mBVlIe8="; }; sourceRoot = "${finalAttrs.src.name}/service"; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-oU4dwlBdsMmgAUv1ICaOqaqucmg/TjKOZxjnxpm0qL8="; + hash = "sha256-KyHa7pZaCgyqzivI0Y7E6Y4yBRllYdYLnk1s0o0dyHY="; }; buildPhase = '' From 0ba71503fd483806e4bad503cc8249a84f28737c Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Thu, 13 Mar 2025 19:29:25 -0700 Subject: [PATCH 26/36] bant: 0.1.11 -> 0.2.0 Co-authored-by: Simon Chatterjee --- pkgs/by-name/ba/bant/package.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index 4203ae75d5a5..93e6de1921e6 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -6,6 +6,7 @@ bazel_6, jdk, nix-update-script, + cctools, }: let @@ -13,25 +14,26 @@ let registry = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-central-registry"; - rev = "40bc9ad53e5a59d596935839e7c072679e706266"; - hash = "sha256-CL0YMQd1ck6/dlvJCLxt9jYyqDuk+iAWfdBOMj864u8="; + rev = "b03f4f95d8ba67873843eae80a73fef8ebf1522e"; + hash = "sha256-gJr5bJ6Kj7jiUhnCC+YOUh3ChFR/55eUbwpP2srsVvM="; }; in buildBazelPackage rec { pname = "bant"; - version = "0.1.11"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hzeller"; repo = "bant"; rev = "v${version}"; - hash = "sha256-vqZGHMIs4t1TP+9r2hvtFXN5B5GXZerC18l8gQA9cmQ="; + hash = "sha256-Qq35WhRFpmQwWPupcjnUo/SEFRSRynVIx+PiHEsGED8="; }; bazelFlags = [ "--registry" "file://${registry}" ]; + LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; postPatch = '' patchShebangs scripts/create-workspace-status.sh @@ -40,8 +42,9 @@ buildBazelPackage rec { fetchAttrs = { hash = { - aarch64-linux = "sha256-M6LMaqPli71YvJS/4iwvowCyVaf+qe8WSICR3CgdU34="; - x86_64-linux = "sha256-iBxAzbSriYkkgDDkSjSSSVeWGBygxKAfruh8T5drUFw="; + aarch64-linux = "sha256-ibv49Y0VjAvfTUwxRUH4BmzUvz8J/qfYPGnI5Tw51HA="; + x86_64-linux = "sha256-VHR08FB4G0LlczWtBb8AdU5tNEzBDNUZpHoB6e3HB1M="; + aarch64-darwin = "sha256-5uKCLDJs0tzOJ7YiKP90RIfIYrken3XFyhT5HHdzft0="; } .${system} or (throw "No hash for system: ${system}"); }; @@ -66,11 +69,10 @@ buildBazelPackage rec { meta = { description = "Bazel/Build Analysis and Navigation Tool"; homepage = "http://bant.build/"; - license = lib.licenses.gpl2Only; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ hzeller lromor ]; - platforms = lib.platforms.linux; }; } From 4ebc1e8ae6a0a46eeb57f8167fa5caeefcb29d96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 20:10:18 +0000 Subject: [PATCH 27/36] opencommit: 3.2.5 -> 3.2.7 --- pkgs/by-name/op/opencommit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix index 7708a3b1d644..df42e0e4eef1 100644 --- a/pkgs/by-name/op/opencommit/package.nix +++ b/pkgs/by-name/op/opencommit/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "opencommit"; - version = "3.2.5"; + version = "3.2.7"; src = fetchFromGitHub { owner = "di-sukharev"; repo = "opencommit"; rev = "v${version}"; - hash = "sha256-6bC3irUyIppu7QVT3jGwMe+r/5WuHA0pLLH/gYORDOM="; + hash = "sha256-vmVOrNwUsgB3iBvO8QhpJfI2OO0Kb9ZthcAXVaQ2cBM="; }; - npmDepsHash = "sha256-exjK00MuzBsjlW34seaaAj8s0bPrzi7zBdJqQ0SuIWM="; + npmDepsHash = "sha256-F19xbiZoIC2JA+3rLqJBbFZvs2XbAk94F2borp/7gMo="; passthru.updateScript = nix-update-script { }; From d53597e6dbcf57213dd09f4a10c94ba6c4c8f244 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 15 Mar 2025 05:52:33 +0800 Subject: [PATCH 28/36] tpnote: 1.25.2 -> 1.25.4 --- pkgs/by-name/tp/tpnote/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 1430ba0efc27..7d2d2772b74d 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "tpnote"; - version = "1.25.2"; + version = "1.25.4"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; - rev = "v${version}"; - hash = "sha256-8AUPNjrT4/Vu8ykTHuDSdnCteih3i61CrfRBfPMwCfY="; + tag = "v${version}"; + hash = "sha256-1KcTY98QNOic0riHhLi4HcSREboMaXq7lb1+LsB0HL0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+qtphGkypyVY8SZsEmejikhnu18WIuvABlYGNA3GDUw="; + cargoHash = "sha256-c6Kz6Z8yfdh7QaDlgI2qSCoG+4c/g9rjBikjN31JftM="; nativeBuildInputs = [ cmake From ebccc61d0877c1e95afbc32e8164fc726ee1c845 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Mar 2025 03:02:53 +0000 Subject: [PATCH 29/36] mitra: 3.18.0 -> 3.19.0 --- pkgs/by-name/mi/mitra/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index f8cdc707ba81..0b9cf686cae5 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "silverpill"; repo = "mitra"; rev = "v${version}"; - hash = "sha256-PBlAxQvuXS/qoPcze9CKsD18HYzORj9yL+sWC+l1jUk="; + hash = "sha256-3Qa9L8RnEeKJw/+GSVaGXPkCNZ8aWG/JkV6e2DF6ZEk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lTGrj02v0vmWg50GZZzf7Mmb40gM4Iid5invxiB2ue0="; + cargoHash = "sha256-PFq6gKMDbRGZaLjqLp8eNLn4mQ1we6RJXunzItdj+SQ="; # require running database doCheck = false; From 8850b3b49682150d889b4614eae4ddaaab1532c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Mar 2025 11:01:48 +0000 Subject: [PATCH 30/36] upbound-main: 0.39.0-0.rc.0.80.g101d5d22 -> 0.39.0-0.rc.0.161.gfb781f0d --- pkgs/by-name/up/upbound/sources-main.json | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json index 125686ef2a91..80833b96a637 100644 --- a/pkgs/by-name/up/upbound/sources-main.json +++ b/pkgs/by-name/up/upbound/sources-main.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-hbNbKN2qDZW/py7ofrspt8sEx8bUbJAhTDqkkwfTHKI=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.80.g101d5d22/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-OeFMycBwFtZStrXduaGRY0VCB/EFWndzkx7IgGsB+XQ=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-Ys7EQrdZcjwY4AdwRJW7mPaCqOvgCOSPq/Y8UG3UkwM=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.80.g101d5d22/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-XTtcnxJ+N9DPBunyBd9mk5JSN12H//73aZiiWZ5JNEM=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-BxDELML833LLokK92R4Dtb7G8uMyJgTfSXlgb1cpAfc=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.80.g101d5d22/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-QmFB1w1CgrjE1ON4FHuyjyXyvmplNhmcFH+3Xew5nsE=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-zcvvXk4Eoc8JUBNz5BMhdhQc7360RFqQMXiY0+rb0lU=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.80.g101d5d22/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-Xa26xnlJ2s7rjMyV+Xo7A/OjAjsAg3fZ21rTCkLHOAM=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-4G3KqSmR8KErMpo2L2M2UmCea813zbpfiUthFUV/p1I=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.80.g101d5d22/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-Md+lA+JqVaA60hJLQBDKfQYBbUwMQBVT/kPsgSCEuIY=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-MPp61tPuYw/aSdZC0N7/KNW7FS6E0WpJUNDXptNNiag=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.80.g101d5d22/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-fCuvg8kQg9GozlrQfYHGZtPGYVJgJccW1LkYUxMF4DI=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-gSKB11iONjsTlPq48F1AWTu+rQEmrc/X9v/TGIfV6zg=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.80.g101d5d22/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-nzRUk4FG4oHb6IPHHKBfUlJJvn74RM632Vmo+SF/EHg=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-xfE6yt+o9gT+AOKFQRHDZDmX75poQTREt1Rm6ew/q04=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.80.g101d5d22/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-FpILjL2IV4EJ7UfLuBPHUfCDxx0a86+P5AZm3yinHuA=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.39.0-0.rc.0.80.g101d5d22" + "version": "0.39.0-0.rc.0.161.gfb781f0d" } From 97075a7f0c44e340618c3affe7e38059fcc3e7be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Mar 2025 11:05:47 +0000 Subject: [PATCH 31/36] upbound: 0.37.1 -> 0.38.1 --- pkgs/by-name/up/upbound/sources-stable.json | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json index f7fa7ac80671..4f8adfbe7993 100644 --- a/pkgs/by-name/up/upbound/sources-stable.json +++ b/pkgs/by-name/up/upbound/sources-stable.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-I4pzsc8lR7w7RFuPig7nUAoLhOridrobglnGNAK//Ek=", - "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-/KHFtDPIZUp9IkO6tb7xOx1BbgCREQo0xNgD7jYMffk=", + "url": "https://cli.upbound.io/stable/v0.38.1/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-PVJON0BzYMN3vBlHIAIBycfO9jvy1KRnelSnPTsJ6pg=", - "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-2NR9KMdTSRsS4Stc1mXfL0rp/IXVaABbnk0hfTq0/Z8=", + "url": "https://cli.upbound.io/stable/v0.38.1/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-VNJ4zII+RK82ulN0TRwrl4tpbnQKICKhcKm1re4bJJY=", - "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-RUbefciA1t7DO84M0fzkrDLLdQlguPNHpWujWB2O1lY=", + "url": "https://cli.upbound.io/stable/v0.38.1/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-L7Ar3NhsMGne3AOCJ8IWrKBlSleYqKU5Fm9DRN8DZPU=", - "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-j7G5yi+HS/O36sMDPHaJ3QVnbqtDXDEU9JUvEcm3s+g=", + "url": "https://cli.upbound.io/stable/v0.38.1/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-c4wqYH7AG//7uI5sHbDOwZ0LxYIgP3tXDOut9kMlR6o=", - "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-dT7FmnR6CFf2fihqUFOA4zOxlY3CA2xtLnWwPa1lTtc=", + "url": "https://cli.upbound.io/stable/v0.38.1/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-70ib5DXhpVBPB8FVaS1qzEtWA1M20B3soKltT4cwyZE=", - "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-uYjuisoB3/j2fFjlTg4WyYNgbStjs3gbQIhXVOyNiPk=", + "url": "https://cli.upbound.io/stable/v0.38.1/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-CRtxAO7FFPHjLTaF+MGbAoRLcTCG8GYStFuq+t8t9hM=", - "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-nM2NGy3JGeywZJBPbl98m1R7j4H14q0QVah3zQaQZtQ=", + "url": "https://cli.upbound.io/stable/v0.38.1/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-tA0k7DBh8cqYcqC/+8E1QeMNzRLDbE9X4sjlLnYyS08=", - "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-nFEef9UNVSs+igCxbK55PchCaBrf31yw45NFNYhpoBo=", + "url": "https://cli.upbound.io/stable/v0.38.1/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.37.1" + "version": "0.38.1" } From 5bc0d4dc82d45304b2ba7a80fcd0de90b3743e47 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 15 Mar 2025 14:50:57 +0800 Subject: [PATCH 32/36] python313Packages.baize: fix build --- pkgs/development/python-modules/baize/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/baize/default.nix b/pkgs/development/python-modules/baize/default.nix index f26314e74440..9b55c4b15fe5 100644 --- a/pkgs/development/python-modules/baize/default.nix +++ b/pkgs/development/python-modules/baize/default.nix @@ -8,6 +8,7 @@ pytestCheckHook, setuptools, starlette, + fetchpatch, }: buildPythonPackage rec { @@ -22,6 +23,16 @@ buildPythonPackage rec { hash = "sha256-vsYt1q8QEDmEXjd8dlzHr85Fz3YAjPowS+oBWYGbG1o="; }; + patches = [ + # Fix tests failing with httpx>=0.28 + # https://github.com/abersheeran/baize/pull/74 + # FIXME: Remove in next release + (fetchpatch { + url = "https://github.com/abersheeran/baize/commit/40dc83bc03b4e5acd5155917be3a481e6494530e.patch"; + hash = "sha256-z4jb4iwo51WIPAAECiM4kPThpHcrzy3349gm/orgoq8="; + }) + ]; + build-system = [ pdm-pep517 setuptools From f5b5c11d78fab97288f7a13bbe4b71c9de098222 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Mar 2025 00:29:26 +0000 Subject: [PATCH 33/36] nezha: 1.9.5 -> 1.9.11 --- pkgs/by-name/ne/nezha/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 920e2107c4d4..efe4793aaab2 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -14,7 +14,7 @@ let pname = "nezha"; - version = "1.9.5"; + version = "1.9.11"; frontendName = lib.removePrefix "nezha-theme-"; @@ -58,7 +58,7 @@ buildGo124Module { owner = "nezhahq"; repo = "nezha"; tag = "v${version}"; - hash = "sha256-06x/M3Np8223ovMVj1K6e7WyoI5+QZohEIHNs/9+bJ0="; + hash = "sha256-qGWOy4nKgCXt2AzQB/tbllRifuXxfZCt9ITE+KtThDU="; }; proxyVendor = true; @@ -97,7 +97,7 @@ buildGo124Module { GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false ''; - vendorHash = "sha256-q9/P6xSoGtMExhdwl5UuyvXTAaI+mD7MfIAidRz0rxw="; + vendorHash = "sha256-VEWev+RPt7WSa8UsiADxUndeCmnUmhQddriJ2tQoNxA="; ldflags = [ "-s" From 799e2914727221f7211e327e683823a9a9fd7b06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 16 Mar 2025 02:51:39 +0100 Subject: [PATCH 34/36] python313Packages.graphene-django: 3.2.2 -> 3.2.3 https://github.com/graphql-python/graphene-django/releases/tag/v3.2.3 --- pkgs/development/python-modules/graphene-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 804b3d4a703d..7cc96eab7712 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "3.2.2"; + version = "3.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; tag = "v${version}"; - hash = "sha256-12ue7Pq7TFMSBAfaj8Si6KrpuKYp5T2EEesJpc8wRho="; + hash = "sha256-uMkzgXn3YRgEU46Sv5lg60cvetHir9bv0mzJGDv79DI="; }; postPatch = '' From 3c793992a26ab0333aa0f5ac55bf72636fb43c23 Mon Sep 17 00:00:00 2001 From: wattmto Date: Sat, 8 Mar 2025 21:51:51 +0900 Subject: [PATCH 35/36] copilot-language-server: refactor to use GitHub release --- .../copilot-language-server/package-lock.json | 44 -------------- .../co/copilot-language-server/package.nix | 59 +++++++++++++------ .../co/copilot-language-server/update.sh | 30 ---------- 3 files changed, 42 insertions(+), 91 deletions(-) delete mode 100644 pkgs/by-name/co/copilot-language-server/package-lock.json delete mode 100755 pkgs/by-name/co/copilot-language-server/update.sh diff --git a/pkgs/by-name/co/copilot-language-server/package-lock.json b/pkgs/by-name/co/copilot-language-server/package-lock.json deleted file mode 100644 index f5f68a310487..000000000000 --- a/pkgs/by-name/co/copilot-language-server/package-lock.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "@github/copilot-language-server", - "version": "1.280.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "@github/copilot-language-server", - "version": "1.280.0", - "license": "https://docs.github.com/en/site-policy/github-terms/github-terms-for-additional-products-and-features", - "dependencies": { - "vscode-languageserver-protocol": "^3.17.5" - }, - "bin": { - "copilot-language-server": "dist/language-server.js" - } - }, - "node_modules/vscode-jsonrpc": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", - "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/vscode-languageserver-protocol": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", - "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", - "license": "MIT", - "dependencies": { - "vscode-jsonrpc": "8.2.0", - "vscode-languageserver-types": "3.17.5" - } - }, - "node_modules/vscode-languageserver-types": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", - "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", - "license": "MIT" - } - } -} diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index fff7ec334a6c..0e5105234f86 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -1,31 +1,53 @@ { lib, - buildNpmPackage, - fetchurl, + stdenvNoCC, + fetchzip, + nix-update-script, }: -buildNpmPackage rec { +let + arch = + { + aarch64-darwin = "arm64"; + aarch64-linux = "arm64"; + x86_64-darwin = "x64"; + x86_64-linux = "x64"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); + os = + { + aarch64-darwin = "darwin"; + aarch64-linux = "linux"; + x86_64-darwin = "darwin"; + x86_64-linux = "linux"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); +in + +stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; version = "1.280.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@github/copilot-language-server/-/copilot-language-server-${version}.tgz"; - hash = "sha256-6UniNoKUoATY+7amMoyWmo0DxEM82Iuu2Jf8P2raWx4="; + src = fetchzip { + url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-native-${finalAttrs.version}.zip"; + hash = "sha256-s47WaWH0ov/UazQCOFBUAO6ZYgCmCpQ1o79KjAVJFh4="; + stripRoot = false; }; - npmDepsHash = "sha256-BtErMpXdRC0t9DNa3hKU+tct6e9K+tMP+LcbmwSJrLI="; + npmDepsHash = "sha256-PLX/mN7xu8gMh2BkkyTncP3+rJ3nBmX+pHxl0ONXbe4="; + installPhase = '' + runHook preInstall - postPatch = '' - ln -s ${./package-lock.json} package-lock.json + install -Dt "$out"/bin "${os}-${arch}"/copilot-language-server + + runHook postInstall ''; - postInstall = '' - ln -s $out/lib/node_modules/@github/copilot-language-server/dist $out/lib/node_modules/@github/dist - ''; + dontStrip = true; - dontNpmBuild = true; - - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = { description = "Use GitHub Copilot with any editor or IDE via the Language Server Protocol"; @@ -41,9 +63,12 @@ buildNpmPackage rec { mainProgram = "copilot-language-server"; platforms = [ "x86_64-linux" + "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with lib.maintainers; [ arunoruto ]; + maintainers = with lib.maintainers; [ + arunoruto + ]; }; -} +}) diff --git a/pkgs/by-name/co/copilot-language-server/update.sh b/pkgs/by-name/co/copilot-language-server/update.sh deleted file mode 100755 index e708412b35f8..000000000000 --- a/pkgs/by-name/co/copilot-language-server/update.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget - -set -euo pipefail -pushd "$(dirname "${BASH_SOURCE[0]}")" - -version=$(npm view @github/copilot-language-server version) -tarball="copilot-language-server-$version.tgz" -url="https://registry.npmjs.org/@github/copilot-language-server/-/$tarball" - -if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then - echo "Already up to date!" - exit 0 -fi - -sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix - -sha256=$(nix-prefetch-url "$url") -src_hash=$(nix-hash --to-sri --type sha256 "$sha256") -sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix - -rm -f package-lock.json package.json *.tgz -wget "$url" -tar xf "$tarball" --strip-components=1 package/package.json -npm i --package-lock-only --ignore-scripts -npm_hash=$(prefetch-npm-deps package-lock.json) -sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix -rm -f package.json *.tgz - -popd From 9143491265056eb6491d98cfe9a9c3fdc4b5216d Mon Sep 17 00:00:00 2001 From: wattmto Date: Mon, 10 Mar 2025 06:55:56 +0900 Subject: [PATCH 36/36] copilot-language-server: add wattmto as a maintainer --- pkgs/by-name/co/copilot-language-server/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index 0e5105234f86..7921fde702fd 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -69,6 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ arunoruto + wattmto ]; }; })