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: 66393625f6c4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4ddaf40a7dc0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 23, 2019

  1. eagle7: unbreak by using openssl 1.0 instead of 1.1 

    The default openssl version in nixpkgs is too new for eagle7 and it
fails to start:

  eagle: error while loading shared libraries: libssl.so.1.0.0: cannot open shared object file: No such file or directory

(cherry picked from commit 13859d0)
    @bjornfor
    bjornfor committed Oct 23, 2019
    Copy the full SHA
    5b314a1 View commit details

  2. wireguard-tools: 0.0.20190913 -> 0.0.20191012 

    https://lists.zx2c4.com/pipermail/wireguard/2019-October/004594.html

Also decided to add myself to the maintainers list as I use WireGuard
pretty heavily for private/work-related stuff and I intend to help taking care
of the WireGuard ecosystem in NixOS as well.

(cherry picked from commit 2177639)
    @Ma27
    Ma27 committed Oct 23, 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
    4ddaf40 View commit details
Showing with 6 additions and 4 deletions.
  1. +3 −3 pkgs/tools/networking/wireguard-tools/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
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
@@ -13,11 +13,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "wireguard-tools";
version = "0.0.20190913";
version = "0.0.20191012";

src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "08ns5d6xbl0qylb98mml0yh0yp837a1sm3hvpra21by1dvx8k0dg";
sha256 = "0nwcx7m5cpp4h1bclswiqq1jzj08xzpxmq5s4rcfqmrp59cmwgrs";
};

sourceRoot = "source/src/tools";
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
downloadPage = "https://git.zx2c4.com/WireGuard/refs/";
homepage = "https://www.wireguard.com/";
license = licenses.gpl2;
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ];
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 ];
platforms = platforms.unix;
};
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -23262,7 +23262,9 @@ in
# Since version 8 Eagle requires an Autodesk account and a subscription
# in contrast to single payment for the charged editions.
# This is the last version with the old model.
eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix { };
eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix {
openssl = openssl_1_0_2;
};

eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };