mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
treewide: remove in-tree usages of nixpkgs.config.allowUnfree
In multiple NixOS tests, nixpkgs.config.allowUnfree or nixpkgs.config.allowUnfreePredicate was set. This leads to Hydra building and redistributing packages with a unfree license. This is a quite huge legal problem. This changes removes these use cases.
This commit is contained in:
@@ -23,9 +23,6 @@
|
||||
|
||||
environment.systemPackages = with pkgs; [ breitbandmessung ];
|
||||
environment.variables.XAUTHORITY = "/home/alice/.Xauthority";
|
||||
|
||||
# breitbandmessung is unfree
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "breitbandmessung" ];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
node.pkgsReadOnly = false;
|
||||
|
||||
nodes.machine = {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
brscan5 = {
|
||||
|
||||
@@ -57,8 +57,6 @@ let
|
||||
];
|
||||
networking.firewall = firewallSettings;
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "consul" ];
|
||||
|
||||
services.consul = {
|
||||
enable = true;
|
||||
inherit webUi;
|
||||
@@ -87,8 +85,6 @@ let
|
||||
];
|
||||
networking.firewall = firewallSettings;
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "consul" ];
|
||||
|
||||
services.consul =
|
||||
assert builtins.elem thisConsensusServerHost allConsensusServerHosts;
|
||||
{
|
||||
|
||||
@@ -12,7 +12,6 @@ in
|
||||
node.pkgsReadOnly = false;
|
||||
|
||||
nodes.machine = {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
services.deconz = {
|
||||
enable = true;
|
||||
inherit httpPort;
|
||||
|
||||
@@ -15,8 +15,6 @@ in
|
||||
{
|
||||
environment.systemPackages = [ pkgs.mcrcon ];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
services.minecraft-server = {
|
||||
declarative = true;
|
||||
enable = true;
|
||||
|
||||
@@ -15,12 +15,6 @@ in
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
{
|
||||
nixpkgs.config.allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"n8n"
|
||||
];
|
||||
|
||||
services.n8n = {
|
||||
enable = true;
|
||||
environment.WEBHOOK_URL = webhookUrl;
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
nodes.outline = {
|
||||
virtualisation.memorySize = 2 * 1024;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
services.outline = {
|
||||
enable = true;
|
||||
forceHttps = false;
|
||||
|
||||
@@ -1502,9 +1502,6 @@ let
|
||||
metricProvider = {
|
||||
services.sabnzbd.enable = true;
|
||||
|
||||
# unrar is required for sabnzbd
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [ "unrar" ];
|
||||
|
||||
# extract the generated api key before starting
|
||||
systemd.services.sabnzbd-apikey = {
|
||||
requires = [ "sabnzbd.service" ];
|
||||
|
||||
@@ -7,18 +7,6 @@ let
|
||||
});
|
||||
};
|
||||
|
||||
# Only allow the demo data to be used (only if it's unfreeRedistributable).
|
||||
unfreePredicate =
|
||||
pkg:
|
||||
let
|
||||
allowPackageNames = [
|
||||
"quake3-demodata"
|
||||
"quake3-pointrelease"
|
||||
];
|
||||
allowLicenses = [ lib.licenses.unfreeRedistributable ];
|
||||
in
|
||||
lib.elem pkg.pname allowPackageNames && lib.elem (pkg.meta.license or null) allowLicenses;
|
||||
|
||||
client =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
@@ -26,7 +14,6 @@ let
|
||||
hardware.graphics.enable = true;
|
||||
environment.systemPackages = [ pkgs.quake3demo ];
|
||||
nixpkgs.config.packageOverrides = overrides;
|
||||
nixpkgs.config.allowUnfreePredicate = unfreePredicate;
|
||||
};
|
||||
in
|
||||
{
|
||||
@@ -49,7 +36,6 @@ in
|
||||
+ "+map q3dm7 +addbot grunt +addbot daemia 2> /tmp/log";
|
||||
};
|
||||
nixpkgs.config.packageOverrides = overrides;
|
||||
nixpkgs.config.allowUnfreePredicate = unfreePredicate;
|
||||
networking.firewall.allowedUDPPorts = [ 27960 ];
|
||||
};
|
||||
|
||||
|
||||
@@ -11,9 +11,6 @@
|
||||
services.sabnzbd = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
# unrar is unfree
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "unrar" ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
||||
@@ -11,8 +11,6 @@
|
||||
node.pkgsReadOnly = false;
|
||||
|
||||
nodes.machine = {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
services.unifi.enable = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -426,8 +426,6 @@ let
|
||||
enable = true;
|
||||
}
|
||||
// vboxHostConfig;
|
||||
|
||||
nixpkgs.config.allowUnfree = config.virtualisation.virtualbox.host.enableExtensionPack;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
||||
@@ -1,22 +1,6 @@
|
||||
import ./make-test-python.nix (
|
||||
{ lib, ... }@args:
|
||||
{ lib, pkgs, ... }@args:
|
||||
let
|
||||
pkgs = args.pkgs.extend (
|
||||
self: super: {
|
||||
stdenv = super.stdenv.override {
|
||||
config = super.config // {
|
||||
allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"vscode"
|
||||
"vscode-with-extensions"
|
||||
"vscode-extension-ms-vscode-remote-remote-ssh"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
|
||||
|
||||
inherit (pkgs.vscode.passthru) rev vscodeServer;
|
||||
|
||||
Reference in New Issue
Block a user