From 684550615a4e27c58e731d82fb39d47e3aa9d2d6 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Sun, 6 Dec 2020 14:26:07 -0500 Subject: [PATCH] Move permittedInsecurePackages to channels module * Move permittedInsecurePackages option to channels module so all channels consider the modified insecure package rules --- config/new-modules/channels.nix | 7 +++++++ config/new-modules/profiles/desktop.nix | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/new-modules/channels.nix b/config/new-modules/channels.nix index 2459a5176..85048f19c 100644 --- a/config/new-modules/channels.nix +++ b/config/new-modules/channels.nix @@ -1,9 +1,16 @@ { config, pkgs, lib, ... }: +let + permittedInsecurePackages = [ + # what requires cryptography for python 2.7? + "python2.7-cryptography-2.9.2" + ]; +in with lib; { config.nixpkgs.config = { # Allow proprietary packages allowUnfree = true; + inherit permittedInsecurePackages; # Create an alias for the unstable channel packageOverrides = pkgs: rec { diff --git a/config/new-modules/profiles/desktop.nix b/config/new-modules/profiles/desktop.nix index e17db3a34..2e6e045ab 100644 --- a/config/new-modules/profiles/desktop.nix +++ b/config/new-modules/profiles/desktop.nix @@ -330,11 +330,6 @@ in { services.fstrim.enable = true; mine.prometheus.export.enable = true; - - # what requires cryptography for python 2.7? - nixpkgs.config.permittedInsecurePackages = [ - "python2.7-cryptography-2.9.2" - ]; }) ]; }