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

More closure size improvements for NixOS 19.09 #70025

Merged
merged 4 commits into from Sep 30, 2019

Conversation

ttuegel
Copy link
Member

@ttuegel ttuegel commented Sep 29, 2019

Motivation for this change

These are more closure size improvements for release-19.09 because they aren't relevant toward master.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @

@@ -17,6 +17,8 @@ in stdenv.mkDerivation rec {
sha256 = "0hlxakpyjg4q9hp7yp3har1n78341b4knwyll28hn48vykg28pza";
};

outputs = [ "out" "dev" ];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we actually already went a lot further with this

There's other commits there that clean up dependencies etc. on master that perhaps we can backport.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't aware of that pull request, thanks! I will backport that instead, as I prefer not to diverge from master.

ttuegel and others added 2 commits September 30, 2019 05:38
zbar: clean up
(cherry picked from commit 8752ff2)
@ttuegel ttuegel merged commit 9e8e87f into NixOS:staging-19.09 Sep 30, 2019
@srhb
Copy link
Contributor

srhb commented Oct 9, 2019

Why was this not relevant for master? This ends up being weird because now we need to fix up eg. kea which broke because of the mariadb change, but only in release-19.09. That's not a divergence I'm used to seeing.

@ttuegel
Copy link
Member Author

ttuegel commented Oct 9, 2019

Why was this not relevant for master? This ends up being weird because now we need to fix up eg. kea which broke because of the mariadb change, but only in release-19.09. That's not a divergence I'm used to seeing.

The relevant parts of this are in master, but the branches had already diverged to the point that I couldn't blindly cherry-pick the changes into the release branch.

@srhb
Copy link
Contributor

srhb commented Oct 9, 2019

@ttuegel Thanks! I understand what's going on now. :)

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.

None yet

5 participants