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.

Sign up for GitHub

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

wireguard: fix up text, maintainer, and version #40903

Merged
merged 1 commit into from May 22, 2018
Merged

wireguard: fix up text, maintainer, and version #40903

merged 1 commit into from May 22, 2018

Conversation

zx2c4
Copy link
Contributor

@zx2c4 zx2c4 commented May 22, 2018

A few things weren't reviewed evidently.

CC @yegortimoshenko @flokli

flokli
flokli reviewed May 22, 2018
View reviewed changes
pkgs/os-specific/linux/wireguard/default.nix Outdated
@@ -5,8 +5,7 @@ assert stdenv.lib.versionAtLeast kernel.version "3.10";

stdenv.mkDerivation rec {
name = "wireguard-${version}";
version = "0.0.20180514";

inherit (wireguard-tools) version;
inherit (wireguard-tools) src;
Copy link
Contributor

Choose a reason for hiding this comment

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

you can just inherit both in the same line.

lukateras
lukateras approved these changes May 22, 2018
View reviewed changes
Copy link
Member

@lukateras lukateras left a comment

Choose a reason for hiding this comment

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

LGTM, thanks :-)

@lukateras lukateras merged commit ed82674 into NixOS:master May 22, 2018
@flokli
Copy link
Contributor

flokli commented May 22, 2018

@GrahamcOfBorg build linuxPackages.wireguard wireguard-tools

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: wireguard-tools

The following builds were skipped because they don't evaluate on x86_64-darwin: linuxPackages.wireguard

Partial log (click to expand)

while evaluating 'buildLinux' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:13818:16, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/linux-4.14.nix:5:1:
while evaluating 'callPackageWith' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:113:35, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:13818:23:
while evaluating 'makeOverridable' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:72:24, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:117:8:
while evaluating anonymous function at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/generic.nix:1:1, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:74:12:
assertion failed at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/generic.nix:45:1

these paths will be fetched (0.04 MiB download, 0.11 MiB unpacked):
  /nix/store/v9l0cd7j9bn18l1yxc19h4xsvxnjshic-wireguard-tools-0.0.20180519
copying path '/nix/store/v9l0cd7j9bn18l1yxc19h4xsvxnjshic-wireguard-tools-0.0.20180519' from 'https://cache.nixos.org'...
/nix/store/v9l0cd7j9bn18l1yxc19h4xsvxnjshic-wireguard-tools-0.0.20180519

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: linuxPackages.wireguard, wireguard-tools

Partial log (click to expand)

  INSTALL /build/source/src/wireguard.ko
  DEPMOD  4.14.42
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/41ajfixvvssz9w3mb4bzk7bhcbxwm8hb-wireguard-0.0.20180519
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/41ajfixvvssz9w3mb4bzk7bhcbxwm8hb-wireguard-0.0.20180519/lib
patching script interpreter paths in /nix/store/41ajfixvvssz9w3mb4bzk7bhcbxwm8hb-wireguard-0.0.20180519
checking for references to /build in /nix/store/41ajfixvvssz9w3mb4bzk7bhcbxwm8hb-wireguard-0.0.20180519...
/nix/store/41ajfixvvssz9w3mb4bzk7bhcbxwm8hb-wireguard-0.0.20180519
/nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: linuxPackages.wireguard, wireguard-tools

Partial log (click to expand)

  INSTALL /build/source/src/wireguard.ko
  DEPMOD  4.14.42
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ywfqmk8sckyj4j40q6176kch8xmgf92g-wireguard-0.0.20180519
strip is /nix/store/jk6j4lh9v5mvjdbdc35sj0zffhhf6s56-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ywfqmk8sckyj4j40q6176kch8xmgf92g-wireguard-0.0.20180519/lib
patching script interpreter paths in /nix/store/ywfqmk8sckyj4j40q6176kch8xmgf92g-wireguard-0.0.20180519
checking for references to /build in /nix/store/ywfqmk8sckyj4j40q6176kch8xmgf92g-wireguard-0.0.20180519...
/nix/store/ywfqmk8sckyj4j40q6176kch8xmgf92g-wireguard-0.0.20180519
/nix/store/2kx0lr9pr0rq2g7rywxf6x443srvi0zc-wireguard-tools-0.0.20180519

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli left review comments

@lukateras lukateras lukateras approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zx2c4 @flokli @GrahamcOfBorg @lukateras