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: 9e58ecd4ad0f
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: 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

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

  2. Merge pull request #75477 from andersk/testresources 

    pythonPackages.testresources: Move pbr to propagatedBuildInputs
    @worldofpeace
    worldofpeace authored Dec 11, 2019
    Copy the full SHA
    897a232 View commit details

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

    kubeseal: 0.9.5 -> 0.9.6
    @ryantm
    ryantm authored Dec 11, 2019
    Copy the full SHA
    9c159ec View commit details

  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

  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

  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 authored Dec 11, 2019
    Copy the full SHA
    17d1925 View commit details

  7. ocamlPackages.merlin: 3.3.2 → 3.3.3

    @vbgl
    vbgl committed Dec 11, 2019
    Copy the full SHA
    2cf477f View commit details
11 changes: 6 additions & 5 deletions nixos/modules/installer/cd-dvd/iso-image.nix
View file
Original file line number Diff line number Diff line change
@@ -603,9 +603,6 @@ in
{ source = config.system.build.squashfsStore;
target = "/nix-store.squashfs";
}
{ source = config.isoImage.efiSplashImage;
target = "/EFI/boot/efi-background.png";
}
{ source = config.isoImage.splashImage;
target = "/isolinux/background.png";
}
@@ -630,8 +627,8 @@ in
{ source = "${efiDir}/EFI";
target = "/EFI";
}
{ source = pkgs.writeText "loopback.cfg" "source /EFI/boot/grub.cfg";
target = "/boot/grub/loopback.cfg";
{ source = (pkgs.writeTextDir "grub/loopback.cfg" "source /EFI/boot/grub.cfg") + "/grub";
target = "/boot/grub";
}
] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [
{ source = "${pkgs.memtest86plus}/memtest.bin";
@@ -641,6 +638,10 @@ in
{ source = config.isoImage.grubTheme;
target = "/EFI/boot/grub-theme";
}
] ++ [
{ source = config.isoImage.efiSplashImage;
target = "/EFI/boot/efi-background.png";
}
];

boot.loader.timeout = 10;
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/kubeseal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoModule rec {
pname = "kubeseal";
version = "0.9.5";
version = "0.9.6";

src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
sha256 = "0k59n40rmxjdn0xi8gr08zlxk0irfc7crra9x8qdljvivqshma3z";
sha256 = "09ds5qn13l6l8kl2i01hgy6pqr30z1rm447ax32lf79zp8hca3r3";
};

modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd";
4 changes: 2 additions & 2 deletions pkgs/applications/networking/ids/zeek/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "zeek";
version = "3.0.0";
version = "3.0.1";

src = fetchurl {
url = "https://www.zeek.org/downloads/zeek-${version}.tar.gz";
sha256 = "16pz5fh0z1hmvhn8pxqmdm5a9d8mqrp4gxpxkaywnaqk2h598lmm";
sha256 = "1lhik212wrbi092qizc08f3i0b9pj318sxwm0abc5jc3v3pz7x3r";
};

nativeBuildInputs = [ cmake flex bison file ];
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/testresources/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417";
};

buildInputs = [ pbr ];
propagatedBuildInputs = [ pbr ];

checkInputs = [ fixtures testtools ];

14 changes: 6 additions & 8 deletions pkgs/development/tools/ocaml/merlin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
{ stdenv, fetchFromGitHub, buildDunePackage, yojson }:
{ lib, fetchurl, buildDunePackage, yojson }:

buildDunePackage rec {
pname = "merlin";
version = "3.3.2";
version = "3.3.3";

minimumOCamlVersion = "4.02.1";

src = fetchFromGitHub {
owner = "ocaml";
repo = pname;
rev = "v${version}";
sha256 = "1z9mcxflraj15sbz6q7f84n31n9fsialw7z8bi3r1biz68nypva9";
src = fetchurl {
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
sha256 = "05dfkbpbb7nvs4g6y0iw7a9f73ygvhs9l45l2g56y7zagvs9x43j";
};

buildInputs = [ yojson ];

meta = with stdenv.lib; {
meta = with lib; {
description = "An editor-independent tool to ease the development of programs in OCaml";
homepage = "https://github.com/ocaml/merlin";
license = licenses.mit;