From 508752b266d16de6e1107b5aaa9aece32010b814 Mon Sep 17 00:00:00 2001
From: Luca Comellini <luca.com@gmail.com>
Date: Mon, 30 Sep 2024 10:51:49 -0700
Subject: [PATCH] more updates

---
 ci.nix     | 5 ++++-
 flake.lock | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ci.nix b/ci.nix
index 22b1352..f84dd96 100644
--- a/ci.nix
+++ b/ci.nix
@@ -15,7 +15,10 @@ with builtins;
 let
   isReserved = n: n == "lib" || n == "overlays" || n == "modules";
   isDerivation = p: isAttrs p && p ? type && p.type == "derivation";
-  isBuildable = p: !(p.meta.broken or false) && p.meta.license.free or true;
+  isBuildable = p: let
+    licenseFromMeta = p.meta.license or [];
+    licenseList = if builtins.isList licenseFromMeta then licenseFromMeta else [licenseFromMeta];
+  in !(p.meta.broken or false) && builtins.all (license: license.free or true) licenseList;
   isCacheable = p: !(p.preferLocalBuild or false);
   shouldRecurseForDerivations = p: isAttrs p && p.recurseForDerivations or false;
 
diff --git a/flake.lock b/flake.lock
index a804412..78cf35d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1624561540,
-        "narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=",
+        "lastModified": 1712449641,
+        "narHash": "sha256-U9DDWMexN6o5Td2DznEgguh8TRIUnIl9levmit43GcI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11",
+        "rev": "600b15aea1b36eeb43833a50b0e96579147099ff",
         "type": "github"
       },
       "original": {