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/nix
base: 444b921fcb72
Choose a base ref
...
head repository: NixOS/nix
compare: 686241825c30
Choose a head ref
  • 4 commits
  • 4 files changed
  • 3 contributors

Commits on May 3, 2018

  1. Fix bzip2 compression of files > 4 GiB 

    Bzip2's 'avail_in' parameter is declared as an unsigned int, so
assigning a size_t length to it led to silent truncation.

Fixes #2111.

(cherry picked from commit 4a2c948)
    @edolstra
    edolstra committed May 3, 2018
    Configuration menu
    Copy the full SHA
    1a67d41 View commit details
    Browse the repository at this point in the history

  2. nix-collect-garbage: little doc fix 

    This removes confusing documentation. It's better to remove doc than add implementation, because Nix 1.12 will surely have new GC interface anyway.

Fixes #641

(cherry picked from commit ac22d77)
    @danbst @edolstra
    danbst authored and edolstra committed May 3, 2018
    Configuration menu
    Copy the full SHA
    3c6dd39 View commit details
    Browse the repository at this point in the history

  3. LocalStore::addValidPath(): Throw error when the CA assertion is wrong 

    Closes #2133.

(cherry picked from commit 80a7b16)
    @edolstra
    edolstra committed May 3, 2018
    Configuration menu
    Copy the full SHA
    8eceb32 View commit details
    Browse the repository at this point in the history

  4. build.cc: fix bind-mount of /dev/{pts,ptmx} fallback 

    Don't bind-mount these to themselves,
mount them into the chroot directory.

Fixes pty issues when using sandbox on CentOS 7.4.
(build of perlPackages.IOTty fails before this change)

(cherry picked from commit 6d91290)
    @dtzWill @edolstra
    dtzWill authored and edolstra committed May 3, 2018
    Configuration menu
    Copy the full SHA
    6862418 View commit details
    Browse the repository at this point in the history