From 340cd4a44555ef472865d36b06a9e41b3810c72f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 16 May 2025 12:57:10 +0200 Subject: [PATCH 1/7] nixos/hardware/nvidia: add prime.offload.offloadCmdMainProgram prime-run is the default name on arch linux. This allows me and some others I found on github to slim their config. --- nixos/modules/hardware/video/nvidia.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 48f8ded73c64..21a9d35a451c 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -204,11 +204,22 @@ in prime.offload.enableOffloadCmd = lib.mkEnableOption '' adding a `nvidia-offload` convenience script to {option}`environment.systemPackages` - for offloading programs to an nvidia device. To work, should have also enabled + for offloading programs to an nvidia device. To work, you must also enable {option}`hardware.nvidia.prime.offload.enable` or {option}`hardware.nvidia.prime.reverseSync.enable`. - Example usage `nvidia-offload sauerbraten_client` + Example usage: `nvidia-offload sauerbraten_client` + + This script can be renamed with {option}`hardware.nvidia.prime.offload.enableOffloadCmd`. ''; + prime.offload.offloadCmdMainProgram = lib.mkOption { + type = lib.types.str; + description = '' + Specifies the CLI name of the {option}`hardware.nvidia.prime.offload.enableOffloadCmd` + convenience script for offloading programs to an nvidia device. + ''; + default = "nvidia-offload"; + example = "prime-run"; + }; prime.reverseSync.enable = lib.mkEnableOption '' NVIDIA Optimus support using the NVIDIA proprietary driver via reverse @@ -558,7 +569,7 @@ in lib.optional cfg.nvidiaSettings nvidia_x11.settings ++ lib.optional cfg.nvidiaPersistenced nvidia_x11.persistenced ++ lib.optional offloadCfg.enableOffloadCmd ( - pkgs.writeShellScriptBin "nvidia-offload" '' + pkgs.writeShellScriptBin cfg.prime.offload.offloadCmdMainProgram '' export __NV_PRIME_RENDER_OFFLOAD=1 export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 export __GLX_VENDOR_LIBRARY_NAME=nvidia From 6a84a15c869a886517bd8320b4e2ba91a3c5adcd Mon Sep 17 00:00:00 2001 From: SomeoneSerge Date: Tue, 13 May 2025 15:53:02 +0000 Subject: [PATCH 2/7] cudaPackages_11_0.autoAddCudaCompatRunpath.libcudaPath: fix the eval --- pkgs/top-level/cuda-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 740efe03b346..84a05e71649a 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -27,6 +27,7 @@ newScope, pkgs, stdenv, + runCommand, }: let inherit (lib) @@ -135,7 +136,10 @@ let [ ( final: _: - lib.packagesFromDirectoryRecursive { + { + cuda_compat = runCommand "cuda_compat" { meta.platforms = [ ]; } "false"; # Prevent missing attribute errors + } + // lib.packagesFromDirectoryRecursive { inherit (final) callPackage; directory = ../development/cuda-modules/packages; } From bb871f562ea693325211ccafb629e788ad02fda5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Jun 2025 08:20:14 +0000 Subject: [PATCH 3/7] simdjson: 3.12.3 -> 3.13.0 --- pkgs/by-name/si/simdjson/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix index 574fd70bc2d0..1a64b60ac280 100644 --- a/pkgs/by-name/si/simdjson/package.nix +++ b/pkgs/by-name/si/simdjson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.12.3"; + version = "3.13.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-/FfaM5BTWKrt2m70+VcUXz//RiZuzxnUOaHOjPJWsGw="; + sha256 = "sha256-Vzw1FpFjg3Tun1Sfk7H4h4tY7lfnjE1Wk+W82K7dcW0="; }; nativeBuildInputs = [ cmake ]; From c4a3706a8d17b9b389e687cffd7a9329f2e8b907 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 4 Jun 2025 09:48:04 +0200 Subject: [PATCH 4/7] elementsd-simplicity: drop --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 162b19d07af5..f824d77ae5cb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -586,6 +586,7 @@ mapAliases { electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17 element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17 + elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04 elixir_ls = elixir-ls; # Added 2023-03-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b6a97087eba..abe946812c71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14721,15 +14721,6 @@ with pkgs; withGui = false; inherit (darwin) autoSignDarwinBinariesHook; }; - elementsd-simplicity = elementsd.overrideAttrs { - version = "unstable-2023-04-18"; - src = fetchFromGitHub { - owner = "ElementsProject"; - repo = "elements"; - rev = "ea318a45094ab3d31dd017d7781a6f28f1ffaa33"; # simplicity branch latest - hash = "sha256-ooe+If3HWaJWpr2ux7DpiCTqB9Hv+aXjquEjplDjvhM="; - }; - }; fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { }; From d674be05acd5a9c15546289c35b5533ce9cb0b4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 12:37:12 +0000 Subject: [PATCH 5/7] objfw: 1.3 -> 1.3.1 --- pkgs/by-name/ob/objfw/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ob/objfw/package.nix b/pkgs/by-name/ob/objfw/package.nix index ebda5feb6aa0..e35dfde0b7ba 100644 --- a/pkgs/by-name/ob/objfw/package.nix +++ b/pkgs/by-name/ob/objfw/package.nix @@ -11,12 +11,12 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "objfw"; - version = "1.3"; + version = "1.3.1"; src = fetchfossil { url = "https://objfw.nil.im/home"; rev = "${finalAttrs.version}-release"; - hash = "sha256-2ESlN3BeVWZElcQLgjMs8B7HRTC0xHuYrLH362npa+Q="; + hash = "sha256-RhdZyVtBLsv5nP61pmTE2zYX1vS8Cdo+0ZqqVc8ljzQ="; }; nativeBuildInputs = [ From 162d97199f5155258fe87dadb6b2326534a5dcec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 12:16:27 +0000 Subject: [PATCH 6/7] python3Packages.pandoc-latex-environment: 1.2.0.0 -> 1.2.1.0 --- .../python-modules/pandoc-latex-environment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandoc-latex-environment/default.nix b/pkgs/development/python-modules/pandoc-latex-environment/default.nix index 6ccf7dd09ce6..a34e86148dbf 100644 --- a/pkgs/development/python-modules/pandoc-latex-environment/default.nix +++ b/pkgs/development/python-modules/pandoc-latex-environment/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pandoc-latex-environment"; - version = "1.2.0.0"; + version = "1.2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "chdemko"; repo = "pandoc-latex-environment"; tag = version; - hash = "sha256-DdDCwysTCiDg1rXO3pvI5m6lIcdAXhsnwEEgvG/ErBM="; + hash = "sha256-uyOqw8YnTljgXkwZOXTXAsnobVSV65EVicohREBNMCY="; }; build-system = [ From d7b44d4905199d613c62ddffcd7e914d52d93cb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 18:47:28 +0000 Subject: [PATCH 7/7] exercism: 3.5.4 -> 3.5.5 --- pkgs/by-name/ex/exercism/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exercism/package.nix b/pkgs/by-name/ex/exercism/package.nix index 4676addc2c2b..9cc664db82ca 100644 --- a/pkgs/by-name/ex/exercism/package.nix +++ b/pkgs/by-name/ex/exercism/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "exercism"; - version = "3.5.4"; + version = "3.5.5"; src = fetchFromGitHub { owner = "exercism"; repo = "cli"; tag = "v${version}"; - hash = "sha256-7euitdo/rdeopnP7hHHxQ5lPh8wJVDaTneckeR5BEGo="; + hash = "sha256-Xz+yTCFwMKd8P3PKX8e3L+XFvt0ntZrOgxnsnrFio6g="; }; vendorHash = "sha256-xY3C3emqtPIKyxIN9aEkrLXhTxWNmo0EJXNZVtbtIvs=";