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
base: 34e93f4eff63
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 84f1b236701d
Choose a head ref
  • 5 commits
  • 2 files changed
  • 3 contributors

Commits on Mar 8, 2020

  1. glibc: provide fallback for kernels with missing prlimit64 

    The current version of glibc implements support for kernels down to
3.2.0 (and we make sure to enable such support with apporopriate
--enable-kernel setting). The current RHEL6 operating system is based on
a maintained kernel based on 2.6.32 with lots of backports. We provide
basic support for this specific kernel by patching glibc to provide an
exception for this specific version of kernel. This allows for nixpkgs
software distribution to work on RHEL6 and it does so quite well with
almost no problems. There are, however, a few syscalls that are missing
in the 2.6.32 kernel, one of which is prlimit64. This commit provides a
fallback that uses an older {get,set}rlimit syscalls in cases when
prlimit64 is not available. This should streamline the experience for
nixpkgs users wanting to run it on RHEL6, namely, this fixes one of the
tests in findutils.

See also discussion in guix:
https://lists.gnu.org/archive/html/guix-devel/2018-03/msg00356.html

(cherry picked from commit 6740593)
    @veprbl
    veprbl committed Mar 8, 2020
    Copy the full SHA
    9cc2f18 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. libxml2: add patch for CVE-2019-20388 

    (cherry picked from commit 291c735)
/cc roundup #79725
    @mmilata @vcunat
    mmilata authored and vcunat committed Mar 16, 2020
    Copy the full SHA
    feb386f View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. Merge remote-tracking branch 'origin/release-20.03' into staging-20.03

    @veprbl
    veprbl committed Mar 17, 2020
    Copy the full SHA
    d9bb3a3 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2020

  1. Merge pull request #82065 from veprbl/pr/glibc_prlimit64_20.03 

    [20.03] glibc: provide fallback for kernels with missing prlimit64
    @veprbl
    veprbl committed Mar 22, 2020
    Copy the full SHA
    1332522 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

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

    @vcunat
    vcunat committed Mar 26, 2020
    Copy the full SHA
    84f1b23 View commit details
    Browse the repository at this point in the history