Skip to content
This repository has been 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
base: 9e58ecd4ad0f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 2cf477f28da9
Choose a head ref
  • 8 commits
  • 5 files changed
  • 8 contributors

Commits on Dec 8, 2019

  1. kubeseal: 0.9.5 -> 0.9.6

    @r-ryantm
    r-ryantm committed Dec 8, 2019
    Copy the full SHA
    3864ec3 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2019

  1. pythonPackages.testresources: Move pbr to propagatedBuildInputs 

    Since testresources declares `Requires-Dist: pbr (>=1.8)` and imports
`pbr.version`, any user of testresources also needs to have pbr.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Dec 11, 2019
    Copy the full SHA
    1e09e64 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #75477 from andersk/testresources 

    pythonPackages.testresources: Move pbr to propagatedBuildInputs
    @worldofpeace
    worldofpeace committed Dec 11, 2019
    Copy the full SHA
    897a232 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #75255 from r-ryantm/auto-update/kubeseal 

    kubeseal: 0.9.5 -> 0.9.6
    @ryantm
    ryantm committed Dec 11, 2019
    Copy the full SHA
    9c159ec View commit details
    Browse the repository at this point in the history

  4. installer/cd-dvd/iso-image: avoid leaking build timestamps 

    When 'grafting' '/nix/store/<hash>-loopback.cfg' from disk onto
'/boot/grub/loopback.cfg' on the iso, the parent 'grub' directory does not
exist yet. In this case it is automatically created and inherits its
attributes, including timestamp, from /nix/store.

This is correct/expected/intentional behavior of xorriso, but has the
undesired result of leaking the timestamps of /nix/store into the iso. For
this reason we put the loopback.cfg in a
'/nix/store/<hash>-loopback.cfg/grub/loopback.cfg' instead, so it will inherit
the attributes from the correctly-timestamped
'/nix/store/<hash>-loopback.cfg/grub' directory.

For the same reason we move '/EFI/boot/efi-background.png' down in the list
so it is grafted after its parent '/EFI/boot' directory is created with
the correct timestamp.

fixes #74944
    @raboof
    raboof committed Dec 11, 2019
    Copy the full SHA
    88ee3b0 View commit details
    Browse the repository at this point in the history

  5. zeek: 3.0.0 -> 3.0.1 

    Changelog: https://github.com/zeek/zeek/releases/tag/v3.0.1
    @marsam
    marsam authored and Jon committed Dec 11, 2019
    Copy the full SHA
    e11288b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #75484 from raboof/74944-timestamps-leak-into-mini… 

    …mal-image

installer/cd-dvd/iso-image: avoid leaking build timestamps
    @domenkozar
    domenkozar committed Dec 11, 2019
    Copy the full SHA
    17d1925 View commit details
    Browse the repository at this point in the history

  7. ocamlPackages.merlin: 3.3.2 → 3.3.3

    @vbgl
    vbgl committed Dec 11, 2019
    Copy the full SHA
    2cf477f View commit details
    Browse the repository at this point in the history