Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: de57e3b630ba
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e371443a1e66
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 27, 2020

  1. Copy the full SHA
    4a26f17 View commit details

Commits on Nov 5, 2020

  1. Merge pull request #101833 from wamserma/allow-via-env

    stdenv/check-meta: add hint to NIXPKGS_ALLOW_* for unfree/broken/…
    kevincox authored Nov 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    e371443 View commit details
Showing with 17 additions and 2 deletions.
  1. +17 −2 pkgs/stdenv/generic/check-meta.nix
19 changes: 17 additions & 2 deletions pkgs/stdenv/generic/check-meta.nix
Original file line number Diff line number Diff line change
@@ -88,13 +88,28 @@ let
broken-outputs = remediateOutputsToInstall;
unknown-meta = x: "";
};
remediation_env_var = allow_attr: {
Unfree = "NIXPKGS_ALLOW_UNFREE";
Broken = "NIXPKGS_ALLOW_BROKEN";
UnsupportedSystem = "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM";
}.${allow_attr};
remediation_phrase = allow_attr: {
Unfree = "unfree packages";
Broken = "broken packages";
UnsupportedSystem = "packages that are unsupported for this system";
}.${allow_attr};
remediate_whitelist = allow_attr: attrs:
''
a) For `nixos-rebuild` you can set
a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable
for a single invocation of the nix tools.
$ export ${remediation_env_var allow_attr}=1
b) For `nixos-rebuild` you can set
{ nixpkgs.config.allow${allow_attr} = true; }
in configuration.nix to override this.
b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
{ allow${allow_attr} = true; }
to ~/.config/nixpkgs/config.nix.
'';