Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2ec36d2105e9
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7bb74e653654
Choose a head ref
  • 4 commits
  • 2 files changed
  • 5 contributors

Commits on May 9, 2019

  1. wireguard-tools: 0.0.20190123 -> 0.0.20190227 

    (cherry picked from commit f96f14f)
    @elseym @flokli
    elseym authored and flokli committed May 9, 2019
    Copy the full SHA
    3b15f9a View commit details

  2. wireguard-tools: 0.0.20190227 -> 0.0.20190406 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireguard-tools/versions

(cherry picked from commit 08a62e0)
    @r-ryantm @flokli
    r-ryantm authored and flokli committed May 9, 2019
    Copy the full SHA
    67c9139 View commit details

  3. 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>
(cherry picked from commit 2c3ab52)
    @Ma27 @elseym
    @fpletz @flokli
    3 people authored and flokli committed May 9, 2019
    Copy the full SHA
    8334fa0 View commit details

  4. wireguard: 0.0.20190123 -> 0.0.20190406 [backport 19.03] (#59762) 

    wireguard: 0.0.20190123 -> 0.0.20190406 [backport 19.03]
    @flokli
    flokli authored May 9, 2019
    Copy the full SHA
    7bb74e6 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.20190406";

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

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;
};
}