Merge master into staging-next (b4d4509d) · Commits · nix / nixpkgs

README.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		</p>

		<p align="center">
		<a href="https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md"><img src="https://img.shields.io/github/contributors-anon/NixOS/nixpkgs" alt="Contributors badge" /></a>
		<a href="CONTRIBUTING.md"><img src="https://img.shields.io/github/contributors-anon/NixOS/nixpkgs" alt="Contributors badge" /></a>
		<a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=supporters&color=brightgreen" alt="Open Collective supporters" /></a>
		</p>

		@@ -74,7 +74,7 @@ Community contributions are always welcome through GitHub Issues and
		Pull Requests.

		For more information about contributing to the project, please visit
		the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
		the [contributing page](CONTRIBUTING.md).

		# Donations

+10 −4

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@
		lib,
		stdenvNoCC,
		callPackage,
		devmode,
		mkShellNoCC,
		documentation-highlighter,
		nixos-render-docs,
		nixpkgs ? { },
		@@ -95,10 +97,14 @@ stdenvNoCC.mkDerivation (

		pythonInterpreterTable = callPackage ./python-interpreter-table.nix { };

		shell = callPackage ../../pkgs/tools/nix/web-devmode.nix {
		shell =
		let
		devmode' = devmode.override {
		buildArgs = "./.";
		open = "/share/doc/nixpkgs/manual.html";
		};
		in
		mkShellNoCC { packages = [ devmode' ]; };

		tests.manpage-urls = callPackage ../tests/manpage-urls.nix { };
		};

+6 −3

Original line number	Diff line number	Diff line
		@@ -6,8 +6,11 @@ let

		common = import ./common.nix;
		inherit (common) outputPath indexPath;
		in
		pkgs.callPackage ../../../pkgs/tools/nix/web-devmode.nix {
		devmode = pkgs.devmode.override {
		buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}";
		open = "/${outputPath}/${indexPath}";
		};
		in
		pkgs.mkShellNoCC {
		packages = [ devmode ];
		}

+19 −4

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ If you want to prevent Athens from writing to disk, you can instead configure it
		}
		```

		To use the local proxy in Go builds, you can set the proxy as environment variable:
		To use the local proxy in Go builds (outside of `nix`), you can set the proxy as environment variable:

		```nix
		{
		@@ -47,6 +47,21 @@ To use the local proxy in Go builds, you can set the proxy as environment variab
		}
		```

		It is currently not possible to use the local proxy for builds done by the Nix daemon. This might be enabled
		by experimental features, specifically [`configurable-impure-env`](https://nixos.org/manual/nix/unstable/contributing/experimental-features#xp-feature-configurable-impure-env),
		in upcoming Nix versions.
		To also use the local proxy for Go builds happening in `nix` (with `buildGoModule`), the nix daemon can be configured to pass the GOPROXY environment variable to the `goModules` fixed-output derivation.

		This can either be done via the nix-daemon systemd unit:

		```nix
		{
		systemd.services.nix-daemon.environment.GOPROXY = "http://localhost:3000";
		}
		```

		or via the [impure-env experimental feature](https://nix.dev/manual/nix/2.24/command-ref/conf-file#conf-impure-env):

		```nix
		{
		nix.settings.experimental-features = [ "configurable-impure-env" ];
		nix.settings.impure-env = "GOPROXY=http://localhost:3000";
		}
		```

+9 −10

Original line number	Diff line number	Diff line
		@@ -482,6 +482,9 @@ in {

		# so NSS can look up usernames
		"${pkgs.glibc}/lib/libnss_files.so.2"

		# Resolving sysroot symlinks without code exec
		"${pkgs.chroot-realpath}/bin/chroot-realpath"
		] ++ optionals cfg.package.withCryptsetup [
		# fido2 support
		"${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so"
		@@ -522,7 +525,7 @@ in {

		script = /* bash */ ''
		set -uo pipefail
		export PATH="/bin:${cfg.package.util-linux}/bin"
		export PATH="/bin:${cfg.package.util-linux}/bin:${pkgs.chroot-realpath}/bin"

		# Figure out what closure to boot
		closure=
		@@ -543,7 +546,7 @@ in {

		# Resolve symlinks in the init parameter. We need this for some boot loaders
		# (e.g. boot.loader.generationsDir).
		closure="$(chroot /sysroot ${pkgs.coreutils}/bin/realpath "$closure")"
		closure="$(chroot-realpath /sysroot "$closure")"

		# Assume the directory containing the init script is the closure.
		closure="$(dirname "$closure")"
		@@ -578,14 +581,10 @@ in {
		];

		services.initrd-nixos-activation = {
		requires = [
		config.boot.initrd.systemd.services.initrd-find-nixos-closure.name
		];
		after = [
		"initrd-fs.target"
		config.boot.initrd.systemd.services.initrd-find-nixos-closure.name
		];
		requiredBy = [ "initrd.target" ];
		after = [ "initrd-switch-root.target" ];
		requiredBy = [ "initrd-switch-root.service" ];
		before = [ "initrd-switch-root.service" ];
		unitConfig.DefaultDependencies = false;
		unitConfig = {
		AssertPathExists = "/etc/initrd-release";
		RequiresMountsFor = [