Skip to content

haskell.packages: move platform specific overrides into own configuration files#122186

Merged
maralorn merged 4 commits intoNixOS:haskell-updatesfrom
sternenseemann:haskell-packages-platform-config
May 9, 2021
Merged

haskell.packages: move platform specific overrides into own configuration files#122186
maralorn merged 4 commits intoNixOS:haskell-updatesfrom
sternenseemann:haskell-packages-platform-config

Conversation

@sternenseemann
Copy link
Copy Markdown
Member

Motivation for this change
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.

@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label May 8, 2021
@sternenseemann sternenseemann force-pushed the haskell-packages-platform-config branch 2 times, most recently from a2de243 to 69701a6 Compare May 8, 2021 12:02
@ofborg ofborg bot added 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. labels May 8, 2021
@maralorn
Copy link
Copy Markdown
Member

maralorn commented May 8, 2021

Looks sensible at a first glance. I just hope that the extension plumbing code is really operationally equivalent …

@roberth
Copy link
Copy Markdown
Member

roberth commented May 8, 2021

Looks sensible at a first glance. I just hope that the extension plumbing code is really operationally equivalent …

This can be tested by running something like nix-instantiate --expr (import ./. { system = /.../; }).haskellPackages`, before and after the change and checking for any differences in the reported list of drvs.

@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 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. labels May 8, 2021
@sternenseemann
Copy link
Copy Markdown
Member Author

I'd appreciate if someone could review this changes in depth. I've looked over it already, but it's easy to miss stuff when doing refactors like this. I know it's tedious and I'd be very grateful :)

Also I've confirmed that e8ac57e does not change a single outpath (using nix-env-diff).

@sternenseemann sternenseemann marked this pull request as ready for review May 8, 2021 16:03
@roberth
Copy link
Copy Markdown
Member

roberth commented May 8, 2021

May be best to split the hash-changing changes into a separate PR? That way you can use ofborg results.

@sternenseemann sternenseemann force-pushed the haskell-packages-platform-config branch from e3c56a1 to 9232dcb Compare May 8, 2021 17:56
@sternenseemann
Copy link
Copy Markdown
Member Author

May be best to split the hash-changing changes into a separate PR? That way you can use ofborg results.

With the way the darwin overrides were done I don't think it's entirely possible and it'd be a nasty rebase nevertheless. Not sure how aarch64 fits into the picture for ofborg, I've picked some of the commits onto the haskell-updates branch now.

@roberth
Copy link
Copy Markdown
Member

roberth commented May 8, 2021

Fair enough.

@maralorn
Copy link
Copy Markdown
Member

maralorn commented May 9, 2021

I have stared at this for quite a while and this all seems very reasonable.

I have also tried to check that you didn‘t lose any overrides.

Thx very much! I like this refactor!

@maralorn maralorn merged commit 7333f7a into NixOS:haskell-updates May 9, 2021
@sternenseemann sternenseemann deleted the haskell-packages-platform-config branch May 9, 2021 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants