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: 8d4cb4e2142b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d41f20e9ccb5
Choose a head ref
  • 11 commits
  • 12 files changed
  • 6 contributors

Commits on Sep 23, 2017

  1. giv: 20150811-git (broken) -> 0.9.26 

    (cherry picked from commit 5da7552)
    @womfoo @globin
    womfoo authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    99d7dcd View commit details
    Browse the repository at this point in the history

  2. trackballs: 1.1.4 (broken) -> 1.2.3 

    (cherry picked from commit 92ec5cd)
    @womfoo @globin
    womfoo authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    06caa2a View commit details
    Browse the repository at this point in the history

  3. tor: enable parallel building 

    (cherry picked from commit fd3a9e6)
    @joachifm @globin
    joachifm authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    a8120e1 View commit details
    Browse the repository at this point in the history

  4. snapper: 0.3.3 -> 0.5.0 

    (cherry picked from commit 6bf5665)
    @joachifm @globin
    joachifm authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    6a17d11 View commit details
    Browse the repository at this point in the history

  5. nixos/hardened: simplify script 

    (cherry picked from commit 15a4f9d)
    @joachifm @globin
    joachifm authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    ce59db3 View commit details
    Browse the repository at this point in the history

  6. nixos/hardened test: add failing test-case for deferred mounts 

    (cherry picked from commit bccaf63)
    @joachifm @globin
    joachifm authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    cf4e7c0 View commit details
    Browse the repository at this point in the history

  7. nixos/lock-kernel-modules: fix deferred fileSystem mounts 

    Ensure that modules required by all declared fileSystems are explicitly
loaded.  A little ugly but fixes the deferred mount test.

See also #29019

(cherry picked from commit 1df6cf5)
    @joachifm @globin
    joachifm authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    8dd308c View commit details
    Browse the repository at this point in the history

  8. ferm: 2.3.1 -> 2.4.1 

    (cherry picked from commit e9a56e7)
    @andir @globin
    andir authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    7dda547 View commit details
    Browse the repository at this point in the history

  9. python.pkgs: alias dateutil to python-dateutil 

    (cherry picked from commit 5e91691)
    @FRidh @globin
    FRidh authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    d5cc00e View commit details
    Browse the repository at this point in the history

  10. singular: use gcc5 

    Progress on: #28643
Fixes: #29682

(cherry picked from commit f7d7c7b)
    @7c6f434c @globin
    7c6f434c authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    5cf35d7 View commit details
    Browse the repository at this point in the history

  11. dockerTools.buildImage: Switch to the format image generated by Skopeo 

    We were using 'Combined Image JSON + Filesystem Changeset Format' [1] to
unpack and pack image and this patch switches to the format used by the registry.

We used the 'repository' file which is not generated by Skopeo when it
pulls an image. Moreover, all information of this file are also in the
manifest.json file.
We then use the manifest.json file instead of 'repository' file. Note
also the manifest.json file is required to push an image with Skopeo.

Fix #29636

[1] https://github.com/moby/moby/blob/749d90e10f989802638ae542daf54257f3bf71f2/image/spec/v1.1.md#combined-image-json--filesystem-changeset-format

(cherry picked from commit 35f205a)
    @nlewo @globin
    nlewo authored and globin committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    d41f20e View commit details
    Browse the repository at this point in the history