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

nixos/systemd: use global proxy config in systemd-importd #75487

Merged
merged 1 commit into from May 6, 2020

Conversation

@michaeladler
Copy link

michaeladler commented Dec 11, 2019

Motivation for this change

Currently machinectl pull does not work behind proxies.

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 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 @peterhoeg @Infinisil

Copy link
Contributor

flokli left a comment

Sorry, didn't see this until now.

nixos/modules/system/boot/systemd.nix Show resolved Hide resolved
@flokli
Copy link
Contributor

flokli commented May 5, 2020

Can you change the base to master and rebase?

nixos-unstable is a channel, PRs don't go there.

@michaeladler michaeladler changed the base branch from nixos-unstable to master May 6, 2020
@michaeladler
Copy link
Author

michaeladler commented May 6, 2020

Can you change the base to master and rebase?

nixos-unstable is a channel, PRs don't go there.

[x] Done. I have also rebased and force-pushed my fork to the latest origin/master.

@flokli
Copy link
Contributor

flokli commented May 6, 2020

Ofborg is wrong here - this is no world rebuild.

@flokli flokli merged commit 274a62a into NixOS:master May 6, 2020
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
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="7915dc7"; rev="7915dc737ca769b0b25e59702a520aff7080b650"; } ./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="7915dc7"; rev="7915dc737ca769b0b25e59702a520aff7080b650"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7915dc7"; rev="7915dc737ca769b0b25e59702a520aff7080b650"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7915dc7"; rev="7915dc737ca769b0b25e59702a520aff7080b650"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7915dc7"; rev="7915dc737ca769b0b25e59702a520aff7080b650"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7915dc7"; rev="7915dc737ca769b0b25e59702a520aff7080b650"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7915dc7"; rev="7915dc737ca769b0b25e59702a520aff7080b650"; } ./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 automation moved this from To Do to Done May 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.