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

systemd: create options for smaller derivation #98998

Merged
merged 1 commit into from Oct 10, 2020

Conversation

@Kloenk
Copy link
Contributor

@Kloenk Kloenk commented Sep 28, 2020

Motivation for this change

Base work for #98299

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.
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@flokli
Copy link
Contributor

@flokli flokli commented Sep 30, 2020

@Kloenk any chance you could keep this udev = systemd (but update the comment)? Maybe that's also what fails evaluation currently.

Otherwise I'd also gladly massage this in shape :-)

@Kloenk
Copy link
Contributor Author

@Kloenk Kloenk commented Sep 30, 2020

I can change that. But bigger changes have to wait a little. (School takes much time currently)

@Kloenk
Copy link
Contributor Author

@Kloenk Kloenk commented Sep 30, 2020

@flokli
replace, or add to the comment?

@flokli
Copy link
Contributor

@flokli flokli commented Sep 30, 2020

I'd propose to have that line look like this:

 udev = systemd; # TODO: change to systemdMinimal

So this shouldn't cause any breakage, and we have systemdMinimal available for other tasks.

I can change that. But bigger changes have to wait a little. (School takes much time currently)

No worries!

@Kloenk Kloenk marked this pull request as ready for review Sep 30, 2020
@Kloenk Kloenk force-pushed the Kloenk:systemd-module branch from c4968ae to 5dac951 Sep 30, 2020
@Kloenk Kloenk requested a review from flokli Sep 30, 2020
@Kloenk Kloenk force-pushed the Kloenk:systemd-module branch from 5dac951 to 647ff64 Sep 30, 2020
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@Kloenk Kloenk force-pushed the Kloenk:systemd-module branch from 647ff64 to 9b5a2f0 Sep 30, 2020
@flokli
Copy link
Contributor

@flokli flokli commented Sep 30, 2020

Sorry, I missed this - this is a mass rebuild, so it'll need to target staging.

@flokli flokli added this to To Do in systemd via automation Sep 30, 2020
@flokli flokli moved this from To Do to In Progress in systemd Sep 30, 2020
@Kloenk Kloenk changed the base branch from master to staging Sep 30, 2020
@Kloenk Kloenk force-pushed the Kloenk:systemd-module branch from 9b5a2f0 to 28655eb Oct 6, 2020
Copy link
Member

@Ericson2314 Ericson2314 left a comment

I'm not familiar with all our recent systemd decisions. But this PR makes sense to me, and I'm eager to try out homed in the one that depends on it.

@Kloenk says the ofborg failure doesn't reproduce locally, so I suspect this is due to ofborg merging a broken master/staging.

@Kloenk Kloenk requested a review from arianvp Oct 6, 2020
@Kloenk Kloenk force-pushed the Kloenk:systemd-module branch from 28655eb to c90be6a Oct 8, 2020
@Kloenk
Copy link
Contributor Author

@Kloenk Kloenk commented Oct 8, 2020

rebased, hopefully this fixes ofborg-eval

Co-Authored-By: Kirill Elagin <kirelagin@gmail.com>
@Kloenk Kloenk force-pushed the Kloenk:systemd-module branch from 11c511d to 2e52fca Oct 10, 2020
@Kloenk Kloenk mentioned this pull request Oct 10, 2020
2 of 10 tasks complete
@Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Oct 10, 2020

Ah good with the udev = systemd; # TODO: change to systemdMinimal this really is quite minimal. I'll just merge then.

In any event, I'm always for exposing more flags on the nix expr level. It gives gentoo people less reason to complain about us :D.

@Ericson2314 Ericson2314 merged commit db3b1c1 into NixOS:staging Oct 10, 2020
19 checks passed
19 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2e52fca"; rev="2e52fca7c81f9a8b19824b398e66157072d5735d"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2e52fca"; rev="2e52fca7c81f9a8b19824b398e66157072d5735d"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2e52fca"; rev="2e52fca7c81f9a8b19824b398e66157072d5735d"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2e52fca"; rev="2e52fca7c81f9a8b19824b398e66157072d5735d"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2e52fca"; rev="2e52fca7c81f9a8b19824b398e66157072d5735d"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2e52fca"; rev="2e52fca7c81f9a8b19824b398e66157072d5735d"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2e52fca"; rev="2e52fca7c81f9a8b19824b398e66157072d5735d"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
systemd, systemd.passthru.tests on aarch64-linux Success
Details
systemd, systemd.passthru.tests on x86_64-linux Success
Details
systemd automation moved this from In Progress to Done Oct 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
systemd
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.