From 2f3f5d27e6aa1f6ff7bf5126465a56ad3044fac6 Mon Sep 17 00:00:00 2001 From: Luchang Jin Date: Sat, 15 Feb 2025 23:15:08 -0500 Subject: [PATCH 1/9] update test --- .github/workflows/test.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dd5f213..d238db0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,12 +8,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.4.2 - - uses: cachix/install-nix-action@v17 - - uses: cachix/cachix-action@v10 - with: - name: guibou - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v30 - name: Build all run: nix-build all.nix From 674b5f2a44f53f1ea11c98c7a74bfeebfac6b8bb Mon Sep 17 00:00:00 2001 From: Luchang Jin Date: Sat, 15 Feb 2025 23:21:46 -0500 Subject: [PATCH 2/9] reduce tests --- all.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/all.nix b/all.nix index 47fadc0..d48db7b 100644 --- a/all.nix +++ b/all.nix @@ -20,6 +20,8 @@ let ''; }); in - (with pure; [nixGLIntel nixVulkanNvidia nixGLNvidia nixVulkanIntel]) - ++ (with versionFile440.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) - ++ (with versionFile510.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) + # (with pure; [nixGLIntel nixVulkanNvidia nixGLNvidia nixVulkanIntel]) + # ++ + # (with versionFile440.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) + # ++ + (with versionFile510.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) From c149afac8b6cedb8f3a349067516566134289964 Mon Sep 17 00:00:00 2001 From: Luchang Jin Date: Sat, 15 Feb 2025 23:27:33 -0500 Subject: [PATCH 3/9] update nixpkgs --- nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixpkgs.nix b/nixpkgs.nix index dfede53..e7daabd 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,5 +1,5 @@ let - rev = "4f6d8095fd51"; + rev = "0b73e36b1962620a8ac551a37229dd8662dac5c8"; in import (fetchTarball { url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz"; From 12eeff3adecd56e5cd47237fdcfa39b63e93b84f Mon Sep 17 00:00:00 2001 From: Luchang Jin Date: Sat, 15 Feb 2025 23:31:17 -0500 Subject: [PATCH 4/9] reduce tests --- all.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/all.nix b/all.nix index d48db7b..5d0d9fe 100644 --- a/all.nix +++ b/all.nix @@ -24,4 +24,5 @@ in # ++ # (with versionFile440.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) # ++ - (with versionFile510.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) + # (with versionFile510.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) + (with versionFile510.auto; [nixGLDefault]) From a18992a5b3f954abd926b6cf08dd8f78f41bd315 Mon Sep 17 00:00:00 2001 From: Luchang Jin Date: Sun, 16 Feb 2025 00:04:38 -0500 Subject: [PATCH 5/9] use new tests --- all.nix | 28 ++++++++++++++++++++++------ nixGL.nix | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/all.nix b/all.nix index 5d0d9fe..cc3798a 100644 --- a/all.nix +++ b/all.nix @@ -1,9 +1,14 @@ let pkgs = import ./nixpkgs.nix { config = { allowUnfree = true; }; }; - pure = pkgs.recurseIntoAttrs (pkgs.callPackage ./nixGL.nix { - nvidiaVersion = "440.82"; - nvidiaHash = "edd415acf2f75a659e0f3b4f27c1fab770cf21614e84a18152d94f0d004a758e"; + pure565 = pkgs.recurseIntoAttrs (pkgs.callPackage ./nixGL.nix { + nvidiaVersion = "565.77"; + nvidiaHash = "sha256-CnqnQsRrzzTXZpgkAtF7PbH9s7wbiTRNcM0SPByzFHw="; + }); + + pure550 = pkgs.recurseIntoAttrs (pkgs.callPackage ./nixGL.nix { + nvidiaVersion = "550.135"; + nvidiaHash = "sha256-ESBH9WRABWkOdiFBpVtCIZXKa5DvQCSke61MnoGHiKk="; }); versionFile440 = (pkgs.callPackage ./nixGL.nix { @@ -19,10 +24,21 @@ let GCC version: gcc version 9.3.0 (Arch Linux 9.3.0-1) ''; }); + + versionFile565 = (pkgs.callPackage ./nixGL.nix { + nvidiaVersionFile = pkgs.writeText "nvidia-version-565.77" '' + NVRM version: NVIDIA UNIX Open Kernel Module for x86_64 565.77 Release Build (nixbld@) Sun Feb 9 11:08:26 UTC 2025 + GCC version: gcc version 13.3.0 (GCC) + ''; + }); + in - # (with pure; [nixGLIntel nixVulkanNvidia nixGLNvidia nixVulkanIntel]) - # ++ + (with pure565; [nixGLIntel nixVulkanNvidia nixGLNvidia nixVulkanIntel]) + ++ + (with pure550; [nixGLIntel nixVulkanNvidia nixGLNvidia nixVulkanIntel]) + ++ # (with versionFile440.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) # ++ # (with versionFile510.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) - (with versionFile510.auto; [nixGLDefault]) + # ++ + (with versionFile565.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) diff --git a/nixGL.nix b/nixGL.nix index e8556c8..b26f861 100644 --- a/nixGL.nix +++ b/nixGL.nix @@ -233,7 +233,7 @@ let # Get if from the nvidiaVersionFile let data = builtins.readFile _nvidiaVersionFile; - versionMatch = builtins.match ".*Module ([0-9.]+) .*" data; + versionMatch = builtins.match ".*NVIDIA UNIX.*Kernel Module.* ([0-9]+\\.[0-9]+) .*" data; in if versionMatch != null then builtins.head versionMatch else null; autoNvidia = nvidiaPackages {version = nvidiaVersionAuto; }; From 08e12d9b8bc8b6ea615f8393887d03643ad80def Mon Sep 17 00:00:00 2001 From: Luchang Jin Date: Sun, 16 Feb 2025 00:10:19 -0500 Subject: [PATCH 6/9] add another test --- all.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/all.nix b/all.nix index cc3798a..3c24b9b 100644 --- a/all.nix +++ b/all.nix @@ -11,16 +11,9 @@ let nvidiaHash = "sha256-ESBH9WRABWkOdiFBpVtCIZXKa5DvQCSke61MnoGHiKk="; }); - versionFile440 = (pkgs.callPackage ./nixGL.nix { - nvidiaVersionFile = pkgs.writeText "nvidia-version-440.82" '' - NVRM version: NVIDIA UNIX x86_64 Kernel Module 440.82 Wed Apr 1 20:04:33 UTC 2020 - GCC version: gcc version 9.3.0 (Arch Linux 9.3.0-1) - ''; - }); - - versionFile510 = (pkgs.callPackage ./nixGL.nix { - nvidiaVersionFile = pkgs.writeText "nvidia-version-510.54" '' - NVRM version: NVIDIA UNIX x86_64 Kernel Module 510.54 Wed Apr 1 20:04:33 UTC 2020 + versionFile550 = (pkgs.callPackage ./nixGL.nix { + nvidiaVersionFile = pkgs.writeText "nvidia-version-550.135" '' + NVRM version: NVIDIA UNIX x86_64 Kernel Module 550.135 Wed Apr 1 20:04:33 UTC 2020 GCC version: gcc version 9.3.0 (Arch Linux 9.3.0-1) ''; }); @@ -37,8 +30,6 @@ in ++ (with pure550; [nixGLIntel nixVulkanNvidia nixGLNvidia nixVulkanIntel]) ++ - # (with versionFile440.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) - # ++ - # (with versionFile510.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) - # ++ + (with versionFile550.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) + ++ (with versionFile565.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia]) From 0666d975fb80a7e8bedb4caafff8f113c5b14072 Mon Sep 17 00:00:00 2001 From: Luchang Jin Date: Mon, 17 Feb 2025 13:00:46 -0500 Subject: [PATCH 7/9] use runCommandLocal --- nixGL.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixGL.nix b/nixGL.nix index b26f861..1ae3f59 100644 --- a/nixGL.nix +++ b/nixGL.nix @@ -13,7 +13,7 @@ nvidiaVersionFile ? null, # This is one by default, you can switch it to off if you want to reduce a # bit the size of nixGL closure. enable32bits ? stdenv.hostPlatform.isx86 -, stdenv, writeTextFile, shellcheck, pcre, runCommand, linuxPackages +, stdenv, writeTextFile, shellcheck, pcre, runCommand, runCommandLocal, linuxPackages , fetchurl, lib, runtimeShell, bumblebee, libglvnd, vulkan-validation-layers , mesa, libvdpau-va-gl, intel-media-driver, pkgsi686Linux, driversi686Linux , zlib, libdrm, xorg, wayland, gcc, zstd }: @@ -217,12 +217,10 @@ let # # builtins.readFile is not able to read /proc files. See # https://github.com/NixOS/nix/issues/3539. - runCommand "impure-nvidia-version-file" { + runCommandLocal "impure-nvidia-version-file" { # To avoid sharing the build result over time or between machine, # Add an impure parameter to force the rebuild on each access. time = builtins.currentTime; - preferLocalBuild = true; - allowSubstitutes = false; } "cp /proc/driver/nvidia/version $out 2> /dev/null || touch $out"; # The nvidia version. Either fixed by the `nvidiaVersion` argument, or From f72374ff8c0dccef46b7b02e7cde09f91007aac6 Mon Sep 17 00:00:00 2001 From: Luchang Jin Date: Sat, 28 Jun 2025 18:19:09 -0400 Subject: [PATCH 8/9] fix version match for NVIDIA 570 --- nixGL.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixGL.nix b/nixGL.nix index 1ae3f59..dc63eea 100644 --- a/nixGL.nix +++ b/nixGL.nix @@ -231,7 +231,7 @@ let # Get if from the nvidiaVersionFile let data = builtins.readFile _nvidiaVersionFile; - versionMatch = builtins.match ".*NVIDIA UNIX.*Kernel Module.* ([0-9]+\\.[0-9]+) .*" data; + versionMatch = builtins.match ".*NVIDIA UNIX.*Kernel Module.* ([0-9]+\\.[.0-9]+) .*" data; in if versionMatch != null then builtins.head versionMatch else null; autoNvidia = nvidiaPackages {version = nvidiaVersionAuto; }; From ad6c6c2c7dbb629e436056683d567f619c1d9d92 Mon Sep 17 00:00:00 2001 From: Luchang Jin Date: Sat, 12 Jul 2025 22:06:53 -0400 Subject: [PATCH 9/9] update nixpkgs rev --- nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixpkgs.nix b/nixpkgs.nix index e7daabd..bdc62d8 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,5 +1,5 @@ let - rev = "0b73e36b1962620a8ac551a37229dd8662dac5c8"; + rev = "10e687235226880ed5e9f33f1ffa71fe60f2638a"; in import (fetchTarball { url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";