public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-12-15 18:49:15 +01:00
commit 47efb03cd3
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-2003.xml
View File

@ -243,6 +243,14 @@
choices (whether to perform the action as themselves with wheel permissions, or as the root user). choices (whether to perform the action as themselves with wheel permissions, or as the root user).
</para> </para>
</listitem> </listitem>
<listitem>
<para>
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 <literal>&lt;nixos/modules/profiles/minimal.nix&gt;</literal> module is included
in container config.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

1
nixos/modules/virtualisation/container-config.nix
View File

@ -10,6 +10,7 @@ with lib;
nix.optimise.automatic = mkDefault false; # the store is host managed nix.optimise.automatic = mkDefault false; # the store is host managed
services.udisks2.enable = mkDefault false; services.udisks2.enable = mkDefault false;
powerManagement.enable = mkDefault false; powerManagement.enable = mkDefault false;
documentation.nixos.enable = mkDefault false;
networking.useHostResolvConf = mkDefault true; networking.useHostResolvConf = mkDefault true;

2
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@ -61,7 +61,7 @@ mkChromiumDerivation (base: rec {
meta = { meta = {
description = "An open source web browser from Google"; description = "An open source web browser from Google";
homepage = http://www.chromium.org/; 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; license = if enableWideVine then licenses.unfree else licenses.bsd3;
platforms = platforms.linux; platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];

8
pkgs/servers/monitoring/loki/default.nix
View File

@ -15,9 +15,9 @@ buildGoPackage rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ systemd.dev ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ];
preFixup = '' preFixup = stdenv.lib.optionalString stdenv.isLinux ''
wrapProgram $bin/bin/promtail \ wrapProgram $bin/bin/promtail \
--prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
''; '';
@ -25,8 +25,8 @@ buildGoPackage rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Like Prometheus, but for logs"; description = "Like Prometheus, but for logs";
license = licenses.asl20; license = licenses.asl20;
homepage = "https://grafana.com/loki"; homepage = "https://grafana.com/oss/loki/";
maintainers = with maintainers; [ willibutz globin mmahut ]; maintainers = with maintainers; [ willibutz globin mmahut ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

6
pkgs/tools/typesetting/tectonic/default.nix
View File

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tectonic"; pname = "tectonic";
version = "0.1.11"; version = "0.1.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tectonic-typesetting"; owner = "tectonic-typesetting";
repo = "tectonic"; repo = "tectonic";
rev = "v${version}"; rev = "v${version}";
sha256 = "1j98qxlq74vs8nf2jsn2xw9iyrf8kih4v0hrvznkhcab6bpibp2x"; sha256 = "0dycv135bkpf71iwlwh8rwwvn287d605nl7v8mjxlrsayiivdmn9";
}; };
cargoSha256 = "0hsm5a40lc3gy1zrfrchp7zby17xjv5a4llqr4xmka07y7sk08fn"; cargoSha256 = "0bkgh73kqcdv3j9hr3m13wrdhls3zrk7aii9shzbzl6rnp2ry1az";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];