Merge remote-tracking branch 'other/master'

nix-community · Nov 3, 2024 · 2376a86 · 2376a86
2 parents 7d68864 + b8d62ad
commit 2376a86
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
@@ -7,7 +7,7 @@ let
   inherit (builtins) head length;
   inherit (lib.trivial) oldestSupportedReleaseIsAtLeast mergeAttrs warn warnIf;
   inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName;
-  inherit (lib.lists) foldr foldl' concatMap elemAt all partition groupBy take foldl;
+  inherit (lib.lists) filter foldr foldl' concatMap elemAt all partition groupBy take foldl;
 in
 
 rec {
@@ -644,8 +644,7 @@ rec {
   filterAttrs =
     pred:
     set:
-    listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set));
-
+    removeAttrs set (filter (name: ! pred name set.${name}) (attrNames set));
 
   /**
     Filter an attribute set recursively by removing all attributes for

diff --git a/lib/licenses.nix b/lib/licenses.nix
@@ -942,6 +942,11 @@ lib.mapAttrs mkLicense ({
     url = "https://license.coscl.org.cn/MulanPSL2";
   };
 
+  naist-2003 = {
+    spdxId = "NAIST-2003";
+    fullName = "Nara Institute of Science and Technology License (2003)";
+  };
+
   nasa13 = {
     spdxId = "NASA-1.3";
     fullName = "NASA Open Source Agreement 1.3";
@@ -1285,6 +1290,15 @@ lib.mapAttrs mkLicense ({
   watcom = {
     spdxId = "Watcom-1.0";
     fullName = "Sybase Open Watcom Public License 1.0";
+    # Despite being OSI‐approved, this licence is not considered FOSS
+    # by Debian, Fedora, or the FSF, due to an onerous restriction that
+    # requires publication of even privately‐deployed modifications.
+    # This violates the FSF’s freedom 3 and Debian’s “desert island
+    # test” and “dissident test”.
+    #
+    # See: <https://en.wikipedia.org/wiki/Sybase_Open_Watcom_Public_License>
+    free = false;
+    redistributable = true;
   };
 
   w3c = {

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
@@ -47,6 +47,7 @@ let
     evalModules
     extends
     filter
+    filterAttrs
     fix
     fold
     foldAttrs
@@ -1102,6 +1103,25 @@ runTests {
     };
   };
 
+  testFilterAttrs = {
+    expr = filterAttrs (n: v: n != "a" && (v.hello or false) == true) {
+      a.hello = true;
+      b.hello = true;
+      c = {
+        hello = true;
+        world = false;
+      };
+      d.hello = false;
+    };
+    expected = {
+      b.hello = true;
+      c = {
+        hello = true;
+        world = false;
+      };
+    };
+  };
+
   # code from example
   testFoldlAttrs = {
     expr = {