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: 9a3e34ae6013
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: e1afc39b483c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 2, 2020

  1. sane-backends: 1.0.28 -> 1.0.30 

    (cherry picked from commit 03690ba)
    @priegger @bjornfor
    priegger authored and bjornfor committed Jul 2, 2020
    Copy the full SHA
    b5120fe View commit details

  2. libreswan: 3.31 -> 3.32 

    Changes: https://github.com/libreswan/libreswan/releases/tag/v3.32

Fixes: https://nvd.nist.gov/vuln/detail/CVE-2020-1763
(cherry picked from commit d0cb57b)
    @mmilata @bjornfor
    mmilata authored and bjornfor committed Jul 2, 2020
    Copy the full SHA
    e1afc39 View commit details
Showing with 10 additions and 13 deletions.
  1. +3 −3 pkgs/applications/graphics/sane/backends/default.nix
  2. +7 −10 pkgs/tools/networking/libreswan/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/graphics/sane/backends/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // rec {
version = "1.0.28";
version = "1.0.30";

src = fetchurl {
url = "https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/sane-backends-${version}.tar.gz";
sha256 = "00yy8q9hqdf0zjxxl4d8njr9zf0hhi3a9ib23ikc2anqf8zhy9ii";
url = "https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-${version}.tar.gz";
sha256 = "18vryaycps3zpjzxh0wjgg8nv2f4pdvcfxxmdfj28qbzqjlrcp9z";
};
})
17 changes: 7 additions & 10 deletions pkgs/tools/networking/libreswan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,9 +5,6 @@
}:

let
optional = stdenv.lib.optional;
version = "3.31";
name = "libreswan-${version}";
binPath = stdenv.lib.makeBinPath [
bash iproute iptables procps coreutils gnused gawk nss.tools which python
];
@@ -16,13 +13,13 @@ in
assert docs -> xmlto != null;
assert stdenv.isLinux -> libselinux != null;

stdenv.mkDerivation {
inherit name;
inherit version;
stdenv.mkDerivation rec {
pname = "libreswan";
version = "3.32";

src = fetchurl {
url = "https://download.libreswan.org/${name}.tar.gz";
sha256 = "1wxqsv11nqgfj5and5xzfgh6ayqvl47midcghd5ryynh60mp7naa";
url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
sha256 = "0bj3g6qwd3ir3gk6hdl9npy3k44shf56vcgjahn30qpmx3z5fsr3";
};

# These flags were added to compile v3.18. Try to lift them when updating.
@@ -37,8 +34,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
libcap_ng curl nspr nss python ldns ]
++ optional docs xmlto
++ optional stdenv.isLinux libselinux;
++ stdenv.lib.optional docs xmlto
++ stdenv.lib.optional stdenv.isLinux libselinux;

prePatch = ''
# Correct bash path