Merge branch 'fc-22.05-dev' into fc-22.05-staging

flyingcircusio · Feb 15, 2024 · 323686d · 323686d
2 parents d65b167 + 1fbd011
commit 323686d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/nixpkgs-config.nix b/nixpkgs-config.nix
@@ -6,10 +6,6 @@
     # fc-sensuplugins and thus needed on all machines. Should be moved to
     # the raid service after decoupling fc-sensuplugins.
     "megacli"
-    # MongoDB starting with 4.0 uses the SSPL license, which is declared
-    # as unfree. We don't have alternatives to mongodb right now so we have
-    # to enable it.
-    "mongodb"
   ];
 
   permittedInsecurePackages = [

diff --git a/tests/loghost.nix b/tests/loghost.nix
@@ -70,6 +70,7 @@ in {
         enable = true;
         hostName = host;
       };
+      flyingcircus.allowedUnfreePackageNames = [ "mongodb" ];
 
     };
 

diff --git a/tests/mongodb.nix b/tests/mongodb.nix
@@ -24,6 +24,7 @@ in {
           gateways = {};
         };
       };
+      flyingcircus.allowedUnfreePackageNames = ["mongodb"];
     };