Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linuxPackages.nvidia_x11.open: don't include date for reproducibility #377335

Merged
merged 1 commit into from
Jan 27, 2025

Conversation

katexochen
Copy link
Contributor

date string was included in debug info, making the build non-reproducible: https://github.com/NVIDIA/open-gpu-kernel-modules/blob/9d0b0414a5304c3679c5db9d44d2afba8e58cc1b/utils.mk#L552

│ │ │ │ │ │ │   --- /nix/store/y4lkv451s2dn0m0088i8kfrfvi7d2sfl-nvidia-open-6.12.11-550.142/lib/modules/6.12.11-gnu/kernel/drivers/video/nvidia.ko.xz
│ │ │ │ │ │ ├── +++ /nix/store/y4lkv451s2dn0m0088i8kfrfvi7d2sfl-nvidia-open-6.12.11-550.142.check/lib/modules/6.12.11-gnu/kernel/drivers/video/nvidia.ko.xz
│ │ │ │ │ │ │ ├── nvidia.ko
│ │ │ │ │ │ │ │┄ File has been modified after NT_GNU_BUILD_ID has been applied.
│ │ │ │ │ │ │ │ ├── readelf --wide --notes {}
│ │ │ │ │ │ │ │ │ @@ -1,13 +1,13 @@
│ │ │ │ │ │ │ │ │  
│ │ │ │ │ │ │ │ │  Displaying notes found in: .note.gnu.property
│ │ │ │ │ │ │ │ │    Owner                Data size     Description
│ │ │ │ │ │ │ │ │    GNU                  0x00000030    NT_GNU_PROPERTY_TYPE_0        Properties: x86 feature: IBT, x86 feature used: x86, x86 ISA used: x86-64-baseline
│ │ │ │ │ │ │ │ │  
│ │ │ │ │ │ │ │ │  Displaying notes found in: .note.gnu.build-id
│ │ │ │ │ │ │ │ │    Owner                Data size     Description
│ │ │ │ │ │ │ │ │ -  GNU                  0x00000014    NT_GNU_BUILD_ID (unique build ID bitstring)         Build ID: aa37d42114b89f7dfc33253d732d12291ca935eb
│ │ │ │ │ │ │ │ │ +  GNU                  0x00000014    NT_GNU_BUILD_ID (unique build ID bitstring)         Build ID: 6dea79d218f42675ec3d96a255285387d7597a6d
│ │ │ │ │ │ │ │ │  
│ │ │ │ │ │ │ │ │  Displaying notes found in: .note.Linux
│ │ │ │ │ │ │ │ │    Owner                Data size     Description
│ │ │ │ │ │ │ │ │    Linux                0x00000004    func       description data: 00 00 00 00 
│ │ │ │ │ │ │ │ │    Linux                0x00000001    OPEN       description data: 00
│ │ │ │ │ │ │ │ ├── strings --all --bytes=8 {}
│ │ │ │ │ │ │ │ │ @@ -24187,15 +24187,15 @@
│ │ │ │ │ │ │ │ │  **** Bad metadata.  Lost %lld entries from %s ****
│ │ │ │ │ │ │ │ │  Assertion failed: %s (0x%08X) returned from 
│ │ │ │ │ │ │ │ │  Check failed: %s (0x%08X) returned from 
│ │ │ │ │ │ │ │ │  ../common/uproc/os/libos-v3.1.0/lib/liblogdecode.c
│ │ │ │ │ │ │ │ │  (pLog->hNvLogNoWrap != 0) && (pNvLogBuffer != NULL)
│ │ │ │ │ │ │ │ │  (pLog->hNvLogWrap != 0) && (pNvLogBuffer != NULL)
│ │ │ │ │ │ │ │ │  0123456789ABCDEF
│ │ │ │ │ │ │ │ │ -nvidia id: NVIDIA UNIX Open Kernel Module for x86_64  550.142  Release Build  (nixbld@)  Sun Jan 26 00:46:12 UTC 2025
│ │ │ │ │ │ │ │ │ +nvidia id: NVIDIA UNIX Open Kernel Module for x86_64  550.142  Release Build  (nixbld@)  Mon Jan 27 14:42:33 UTC 2025

This patch sets an empty string as date instead.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
@github-actions github-actions bot added 6.topic: nvidia 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 101-500 labels Jan 27, 2025
@nix-owners nix-owners bot requested a review from NickCao January 27, 2025 15:59
@drupol drupol merged commit 215b417 into NixOS:master Jan 27, 2025
25 of 28 checks passed
@katexochen katexochen deleted the nvidia-x11-open/repro branch January 27, 2025 21:06
VeilSilence pushed a commit to VeilSilence/nixpkgs that referenced this pull request Jan 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants