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

Jump to bottom

nixos/wireguard: fix wireguard service as well after it got upstreamed #80758

Merged
merged 1 commit into from Feb 22, 2020
Merged

nixos/wireguard: fix wireguard service as well after it got upstreamed #80758

merged 1 commit into from Feb 22, 2020

Conversation

ikervagyok
Copy link
Contributor

Motivation for this change

wireguard is either a package or null, depending on kernel version.

Source:

nixpkgs/pkgs/top-level/all-packages.nix

Line 16649 in 74e9b17

wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null;

Error:

building Nix...
building the system configuration...
error: The option value `boot.extraModulePackages.[definition 2-entry 1]' in `/nixpkgs/nixos/modules/services/networking/wireguard.nix' is not of type `package'.
Things done

built local config and checked connectivity

  • 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.

rnhmjoj
rnhmjoj approved these changes Feb 22, 2020
View reviewed changes
Copy link
Contributor

@rnhmjoj rnhmjoj left a comment

Choose a reason for hiding this comment

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

Looks good.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Feb 22, 2020

Just a question: where did you find kernel 5.6? linuxPackages_latest in master is still 5.5.

@ikervagyok
Copy link
Contributor Author

I use 'linuxPackages_testing' 😉

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Feb 22, 2020

I use 'linuxPackages_testing' 😉

Nice, learnt a new thing. Thank you.

@rnhmjoj rnhmjoj merged commit 02bbaad into NixOS:master Feb 22, 2020
@bkchr bkchr mentioned this pull request Apr 3, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rnhmjoj rnhmjoj rnhmjoj approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ikervagyok @rnhmjoj