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: 4a0446664e04
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: 645fd4a2c05d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 9, 2020

  1. wdisplays: 2020-03-15 -> 1.0 

    https://github.com/cyclopsian/wdisplays/releases/tag/1.0
(cherry picked from commit fd0a039)
    @Ma27
    Ma27 committed May 9, 2020
    Copy the full SHA
    e9ea446 View commit details

  2. linuxPackages.wireguard: 1.0.20200429 -> 1.0.20200506 

    https://lists.zx2c4.com/pipermail/wireguard/2020-May/005408.html
(cherry picked from commit f887d09)
    @Ma27
    Ma27 committed May 9, 2020
    Copy the full SHA
    645fd4a View commit details
Showing with 8 additions and 7 deletions.
  1. +2 −2 pkgs/os-specific/linux/wireguard/default.nix
  2. +6 −5 pkgs/tools/graphics/wdisplays/default.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/wireguard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6";

stdenv.mkDerivation rec {
pname = "wireguard";
version = "1.0.20200429";
version = "1.0.20200506";

src = fetchzip {
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
sha256 = "161srq06qa6ag2lycqz19mfms4ha2pmwn778jhvi96729rmivjkd";
sha256 = "05dphmcxm3lg860r5bj1b995avh43d1pap8p18p4ig4kv2r2g9nq";
};

hardeningDisable = [ "pic" ];
11 changes: 6 additions & 5 deletions pkgs/tools/graphics/wdisplays/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }:
stdenv.mkDerivation {
pname = "wdisplays-unstable";
version = "2020-03-15";

stdenv.mkDerivation rec {
pname = "wdisplays";
version = "1.0";

nativeBuildInputs = [ meson ninja pkgconfig ];

@@ -10,8 +11,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "cyclopsian";
repo = "wdisplays";
rev = "0faafdc04d7dd47d3a4e385f348cb9d267f2e60d";
sha256 = "1y3bzh4mi6d67n6v0i8j5snpaikpbyr89acayr4m6bx85qnrq4g2";
rev = version;
sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y";
};

meta = let inherit (stdenv) lib; in {