From 9f2092b6a98eaa9af1111753fcd2a1c69030f06c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 14 Dec 2019 22:22:22 -0500 Subject: [PATCH 1/4] grafana-loki: fix build on darwin --- pkgs/servers/monitoring/loki/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 12b181a480fc..895621d4cba6 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -15,9 +15,9 @@ buildGoPackage rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ systemd.dev ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; - preFixup = '' + preFixup = stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $bin/bin/promtail \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; @@ -25,8 +25,8 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Like Prometheus, but for logs"; license = licenses.asl20; - homepage = "https://grafana.com/loki"; + homepage = "https://grafana.com/oss/loki/"; maintainers = with maintainers; [ willibutz globin mmahut ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From b29e3582acc18e37b892c5e511538c75f8fc7f9e Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 15 Dec 2019 21:28:09 +0900 Subject: [PATCH 2/4] chromium: add thefloweringash (myself) as maintainer I have an interest in making Chromium available on Aarch64. I'm adding myself here on a recommendation from @ivan [1]. [1] https://github.com/NixOS/nixpkgs/pull/74015#issuecomment-565780595 --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index ad7fa78527cd..bbfce71a115c 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -61,7 +61,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ bendlas ivan ]; + maintainers = with maintainers; [ bendlas ivan thefloweringash ]; license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; From d206f2304fad797d1ba37c75a80d7251cfec0654 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Sun, 15 Dec 2019 18:21:52 +0200 Subject: [PATCH 3/4] nixos containers: disable NixOS manual in container config. (#75659) This makes ~2.5x speed up of an empty container instantiate, hence reduces rebuild time of system with many declarative containers. Note that this doesn't affect production systems much, becaseu those most likely already include `minimal.nix` profile. --- nixos/doc/manual/release-notes/rl-2003.xml | 8 ++++++++ nixos/modules/virtualisation/container-config.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 7791a72d263a..2a38b2adbbb4 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -243,6 +243,14 @@ choices (whether to perform the action as themselves with wheel permissions, or as the root user). + + + NixOS containers no longer build NixOS manual by default. This saves evaluation time, + especially if there are many declarative containers defined. Note that this is already done + when <nixos/modules/profiles/minimal.nix> module is included + in container config. + + diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index f7a37d8c9f3b..6ff6bdd30c20 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -10,6 +10,7 @@ with lib; nix.optimise.automatic = mkDefault false; # the store is host managed services.udisks2.enable = mkDefault false; powerManagement.enable = mkDefault false; + documentation.nixos.enable = mkDefault false; networking.useHostResolvConf = mkDefault true; From 5425557214cd59a1ddd42a8195b076717802a485 Mon Sep 17 00:00:00 2001 From: Marco A L Barbosa Date: Sun, 15 Dec 2019 13:27:41 -0300 Subject: [PATCH 4/4] tectonic: 0.1.11 -> 0.1.12 (#75396) --- pkgs/tools/typesetting/tectonic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 98c80da5b2c1..c78e60996bb2 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "v${version}"; - sha256 = "1j98qxlq74vs8nf2jsn2xw9iyrf8kih4v0hrvznkhcab6bpibp2x"; + sha256 = "0dycv135bkpf71iwlwh8rwwvn287d605nl7v8mjxlrsayiivdmn9"; }; - cargoSha256 = "0hsm5a40lc3gy1zrfrchp7zby17xjv5a4llqr4xmka07y7sk08fn"; + cargoSha256 = "0bkgh73kqcdv3j9hr3m13wrdhls3zrk7aii9shzbzl6rnp2ry1az"; nativeBuildInputs = [ pkgconfig ];