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: c544d8a3fc18
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: 4e3aa3de4122
Choose a head ref
  • 9 commits
  • 6 files changed
  • 6 contributors

Commits on Jan 18, 2020

  1. e2fsprogs: 1.45.3 -> 1.45.4

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/e2fsprogs/versions
    
    (cherry picked from commit eff7a16)
    r-ryantm authored and flokli committed Jan 18, 2020
    Copy the full SHA
    2a65776 View commit details

Commits on Jan 19, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    caendesilva Caen De Silva
    Copy the full SHA
    45931aa View commit details
  2. Merge pull request #77998 from flokli/19.09-e2fsprogs-1.45.4

    [19.09] e2fsprogs: 1.45.3 -> 1.45.4
    flokli authored Jan 19, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    caendesilva Caen De Silva
    Copy the full SHA
    66098b5 View commit details

Commits on Feb 2, 2020

  1. Merge #79052: libxml2: patch for CVE-2020-7595

    (cherry picked from commit 3c46f9d)
    vcunat committed Feb 2, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    caendesilva Caen De Silva
    Copy the full SHA
    876f699 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    caendesilva Caen De Silva
    Copy the full SHA
    6cff34d View commit details

Commits on Feb 3, 2020

  1. Merge branch 'staging-19.09' into release-19.09

    x86_64-linux has rebuilt on Hydra; we probably don't need to wait
    with this merge for others.
    vcunat committed Feb 3, 2020
    Copy the full SHA
    a7d55dd View commit details

Commits on Feb 4, 2020

  1. openafs_1_8: 1.8.3 -> 1.8.5 (#75104)

    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    (cherry picked from commit b661db1)
    andersk authored and veprbl committed Feb 4, 2020
    Copy the full SHA
    14a7b01 View commit details
  2. Copy the full SHA
    841cc98 View commit details
  3. Merge pull request #79225 from primeos/signal-desktop-backport

    [19.09] signal-desktop: 1.30.0 -> 1.30.1 (backport)
    primeos authored Feb 4, 2020
    Copy the full SHA
    4e3aa3d View commit details
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.30.0"; # Please backport all updates to the stable channel.
version = "1.30.1"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1gbvna40sc83s7mwip5281yn4bs0k19fj061y0xzwkvh0yk06x3i";
sha256 = "08l51f1fq9jlnqb4j38lxdfwfbqfzb85zrim57wlgcj8azp2ash6";
};

nativeBuildInputs = [
17 changes: 12 additions & 5 deletions pkgs/development/libraries/libxml2/default.nix
Original file line number Diff line number Diff line change
@@ -18,11 +18,18 @@ in stdenv.mkDerivation rec {
sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl";
};

patches = [ (fetchpatch {
name = "CVE-2019-19956"; # Upstream patch
url = "https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549.patch";
sha256 = "05r36wb3jfiqqr595v8y1djb535pk99lvajvsi5rq7x90k8s6g61";
})];
patches = [
(fetchpatch {
name = "CVE-2019-19956"; # Upstream patch
url = "https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549.patch";
sha256 = "05r36wb3jfiqqr595v8y1djb535pk99lvajvsi5rq7x90k8s6g61";
})
(fetchpatch {
name = "CVE-2020-7595.patch";
url = "https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch";
sha256 = "0klvaxkzakkpyq0m44l9xrpn5kwaii194sqsivfm6zhnb9hhl15l";
})
];

outputs = [ "bin" "dev" "out" "man" "doc" ]
++ lib.optional pythonSupport "py"
2 changes: 1 addition & 1 deletion pkgs/servers/openafs/1.8/cross-build.patch
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@ diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new
--- openafs-1.8.2/configure.ac 2018-09-11 17:52:48.000000000 +0200
+++ openafs-1.8.2.new/configure.ac 2018-10-16 15:56:36.512277860 +0200
@@ -23,6 +23,7 @@
AFS_LT_INIT

AC_PROG_CC
AC_PROG_LIBTOOL
+AX_PROG_CC_FOR_BUILD

AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
3 changes: 0 additions & 3 deletions pkgs/servers/openafs/1.8/default.nix
Original file line number Diff line number Diff line change
@@ -28,9 +28,6 @@ stdenv.mkDerivation {
# Makefiles don't include install targets for all new shared libs, yet.
dontDisableStatic = true;

# Fixes broken format string in 1.8.2
hardeningDisable=[ "format" ];

preConfigure = ''
patchShebangs .
for i in `grep -l -R '/usr/\(include\|src\)' .`; do
6 changes: 3 additions & 3 deletions pkgs/servers/openafs/1.8/srcs.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ fetchurl }:
rec {
version = "1.8.3";
version = "1.8.5";
src = fetchurl {
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
sha256 = "19ffchxwgqg4wl98l456jdpgq2w8b5izn8hxdsq9hjs0a1nc3nga";
sha256 = "08w5n803xm75j7daa3mr2ncfmcg0wpm7yasj6zyddqlb4f7xdppf";
};

srcs = [ src
(fetchurl {
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
sha256 = "14smdhn1f6f3cbvvwxgjjld0m4b17vqh3rzkxf5apmjsdda21njq";
sha256 = "08mg3n0q2igfas1khj18r9apyrkpbp1jick0ix5nfaal90jbifis";
})];
}
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/e2fsprogs/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "e2fsprogs";
version = "1.45.3";
version = "1.45.4";

src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "0gcqfnp9h7wgz1vq402kxd2w398vqaim26aq9i722v3lrgh5cm9s";
sha256 = "0jsclghxfzj9qmdd3qqk0gdmkrgjv2gakf8qz9dba37qkj1nk776";
};

outputs = [ "bin" "dev" "out" "man" "info" ];