Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 92f96b51d157
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eec84d5e849b
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Mar 13, 2019

  1. wireguard-tools: 0.0.20190123 -> 0.0.20190227

    @elseym
    elseym committed Mar 13, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    elseym Simon Waibl
    GPG key ID: 8696D1F9E5C020D2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f96f14f View commit details

Commits on Mar 15, 2019

  1. linuxPackages.wireguard: fix build 

    Ensure that only module-related targets from the project's Makefile are
built.

Co-authored-by: elseym <elseym@me.com>
Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
    @Ma27 @elseym @fpletz
    3 people committed Mar 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2c3ab52 View commit details

  2. Merge pull request #57534 from elseym/wireguard-tools 

    wireguard-tools: 0.0.20190123 -> 0.0.20190227
    @fpletz
    fpletz authored Mar 15, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eec84d5 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −1 pkgs/os-specific/linux/wireguard/default.nix
  2. +3 −3 pkgs/tools/networking/wireguard-tools/default.nix
3 changes: 2 additions & 1 deletion pkgs/os-specific/linux/wireguard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ perl ] ++ kernel.moduleBuildDependencies;

buildPhase = "make module";
buildFlags = [ "module" ];
installTargets = [ "module-install" ];

meta = with stdenv.lib; {
inherit (wireguard-tools.meta) homepage license maintainers;
6 changes: 3 additions & 3 deletions pkgs/tools/networking/wireguard-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "wireguard-tools-${version}";
version = "0.0.20190123";
version = "0.0.20190227";

src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "1lyl3nmsgp9jk9js3vz032vdx7cg9ynkwzdr19wrr26pkxhpcnxr";
sha256 = "1kaq0mjcdr4hxr3rx8z11rvlh4ycjsn5654fjw1gh1fdbjgczax5";
};

sourceRoot = "source/src/tools";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
downloadPage = https://git.zx2c4.com/WireGuard/refs/;
homepage = https://www.wireguard.com/;
license = licenses.gpl2;
maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ];
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 ];
platforms = platforms.unix;
};
}