colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #310385 from szlend/cross-deterministic-uname

Browse Source 
deterministic-uname: overridable platform
This commit is contained in:
Atemu 2024-06-06 21:09:43 +02:00 committed by GitHub
commit 10b7b6a403
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/build-support/deterministic-uname/default.nix
View File

@ -5,6 +5,7 @@
, coreutils
, getopt
, modDirVersion ? ""
, forPlatform ? stdenv.buildPlatform
}:
substituteAll {
@ -17,8 +18,8 @@ substituteAll {
inherit coreutils getopt;
uSystem = if stdenv.buildPlatform.uname.system != null then stdenv.buildPlatform.uname.system else "unknown";
inherit (stdenv.buildPlatform.uname) processor;
uSystem = if forPlatform.uname.system != null then forPlatform.uname.system else "unknown";
inherit (forPlatform.uname) processor;
# uname -o
# maybe add to lib/systems/default.nix uname attrset
@ -26,9 +27,9 @@ substituteAll {
# https://stackoverflow.com/questions/61711186/where-does-host-operating-system-in-uname-c-comes-from
# https://github.com/coreutils/gnulib/blob/master/m4/host-os.m4
operatingSystem =
if stdenv.buildPlatform.isLinux
if forPlatform.isLinux
then "GNU/Linux"
else if stdenv.buildPlatform.isDarwin
else if forPlatform.isDarwin
then "Darwin" # darwin isn't in host-os.m4 so where does this come from?
else "unknown";
@ -42,11 +43,12 @@ substituteAll {
mainProgram = "uname";
longDescription = ''
This package provides a replacement for `uname` whose output depends only
on `stdenv.buildPlatform`. It is meant to be used from within derivations.
Many packages' build processes run `uname` at compile time and embed its
output into the result of the build. Since `uname` calls into the kernel,
and the Nix sandbox currently does not intercept these calls, builds made
on different kernels will produce different results.
on `stdenv.buildPlatform`, or a configurable `forPlatform`. It is meant
to be used from within derivations. Many packages' build processes run
`uname` at compile time and embed its output into the result of the build.
Since `uname` calls into the kernel, and the Nix sandbox currently does
not intercept these calls, builds made on different kernels will produce
different results.
'';
license = [ licenses.mit ];
maintainers = with maintainers; [ artturin ];

2
pkgs/top-level/all-packages.nix
View File

@ -3650,6 +3650,8 @@ with pkgs;
deterministic-uname = callPackage ../build-support/deterministic-uname { };
deterministic-host-uname = deterministic-uname.override { forPlatform = stdenv.hostPlatform; };
dfmt = callPackage ../tools/text/dfmt { };
diopser = callPackage ../applications/audio/diopser { };