Skip to content

pkgs/os-specific: stdenv.lib -> lib #109490

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jan 17, 2021
Merged

pkgs/os-specific: stdenv.lib -> lib #109490

merged 1 commit into from
Jan 17, 2021
+597 −599

Conversation

siraben
Copy link
Member

@siraben siraben commented Jan 16, 2021

Motivation for this change

Pending merge of #109455

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@ofborg ofborg bot added 6.topic: cinnamon Desktop environment 6.topic: emacs Text editor 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: pantheon The Pantheon desktop environment 6.topic: printing 6.topic: vim 6.topic: xfce The Xfce Desktop Environment 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 501+ 10.rebuild-darwin: 501-1000 10.rebuild-linux: 11-100 labels Jan 16, 2021
@jonringer
Copy link
Contributor

this shouldn't be causing any rebuilds...

@siraben
Copy link
Member Author

siraben commented Jan 16, 2021

@jonringer The reason why might be because of whitespace changes.

@siraben siraben force-pushed the stdenv-lib-os-specific branch from 3c284d9 to fd4dd83 Compare January 16, 2021 17:38
@jonringer
Copy link
Contributor

ah that makes sense, and it's unfortunate.

If saw rebuilds: 0, then it makes it easier to merge as there's almost no risk in breaking something.... and the linting gate can just be bypassed.

@ofborg ofborg bot removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: cinnamon Desktop environment 6.topic: emacs Text editor 6.topic: pantheon The Pantheon desktop environment 6.topic: printing 6.topic: vim labels Jan 16, 2021
@ofborg ofborg bot removed 6.topic: xfce The Xfce Desktop Environment 8.has: documentation This PR adds or changes documentation labels Jan 16, 2021
@ofborg ofborg bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-linux: 11-100 labels Jan 16, 2021
@siraben siraben force-pushed the stdenv-lib-os-specific branch from fd4dd83 to 0175b75 Compare January 16, 2021 17:52
@prusnak
Copy link
Member

prusnak commented Jan 17, 2021 •
edited
Loading

@jonringer The reason why might be because of whitespace changes.

Seems there is a whitespace change here: https://github.com/NixOS/nixpkgs/pull/109490/files#diff-0e2f4255d92df895a1e001d696295864233cb319f2aa78aa10654efef9ef1663L33-R33 (file pkgs/os-specific/linux/x86info/default.nix)

@siraben
Copy link
Member Author

siraben commented Jan 17, 2021

@prusnak but that whitespace change is in the longDescription which shouldn't affect the hash.

@prusnak
Copy link
Member

prusnak commented Jan 17, 2021 •
edited
Loading

OK, right.

There is another whitespace change in pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix in patchPhase. Maybe that explains why there is no rebuild on linux, but there is on darwin.

@siraben siraben force-pushed the stdenv-lib-os-specific branch from 0175b75 to 6530799 Compare January 17, 2021 15:55
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 501+ 10.rebuild-darwin: 501-1000 labels Jan 17, 2021
@siraben siraben force-pushed the stdenv-lib-os-specific branch from 6530799 to f31a133 Compare January 17, 2021 16:11
@siraben
Copy link
Member Author

siraben commented Jan 17, 2021

@prusnak Thanks, that made rebuilds go to 0.

@SuperSandro2000 pending one last ofborg CI check.

@siraben siraben force-pushed the stdenv-lib-os-specific branch from f31a133 to 16d91ee Compare January 17, 2021 16:26
@SuperSandro2000 SuperSandro2000 merged commit 2c18940 into NixOS:master Jan 17, 2021
@siraben siraben deleted the stdenv-lib-os-specific branch January 18, 2021 00:30
@kira-bruneau kira-bruneau mentioned this pull request Jan 20, 2021
Merged
10 tasks
kira-bruneau added a commit to kira-bruneau/nixpkgs that referenced this pull request Jan 20, 2021
@kira-bruneau
pkgs/os-specific/windows: fix evaluation after stdenv.lib -> lib
9788188 
Fixes the evaluation of packages in pkgs/os-specific/windows that
weren't updated to include a new lib parameter after the refactor from
stdenv.lib -> lib (NixOS#109490).

I originally only intended this change to fix
`pkgsCross.mingw32.buildPackages.gcc` & `pkgsCross.mingwW64.buildPackages.gcc`
to support building wine with `mingwSupport`, but I noticed this was
an issue for all updated windows packages. Most of these other
packages fail to build for other reasons.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adisbladis adisbladis

@edwtjo edwtjo

@jonringer jonringer

@mkg20001 mkg20001

@mmahut mmahut

@peti peti

@RaghavSood RaghavSood

@rycee rycee

@teto teto

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@siraben @jonringer @prusnak @SuperSandro2000