treewide: fix some eval issues

Signed-off-by: lucasew <[email protected]>
NixOS · Jan 7, 2025 · d4ca92a · d4ca92a
1 parent 60b962a
commit d4ca92a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
@@ -88,7 +88,7 @@ mkDerivation {
         gpl2
         lgpl3
       ]
-      ++ optional unfreeEnableUnrar unfree;
+      ++ lib.optional unfreeEnableUnrar unfree;
     maintainers = [ lib.maintainers.ttuegel ];
   };
 }
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
@@ -7,6 +7,8 @@
   runCommandLocal,
   makeWrapper,
   substituteAll,
+  sbcl,
+  bash,
   which,
   perl,
   hostname,
@@ -192,7 +194,7 @@ stdenv.mkDerivation rec {
         # ACL2 itself is bsd3
         bsd3
       ]
-      ++ optionals certifyBooks [
+      ++ lib.optionals certifyBooks [
         # The community books are mostly bsd3 or mit but with a few
         # other things thrown in.
         mit

diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix
@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   fetchPypi,
 }:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # No tests distributed
   doCheck = false;
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Simple, generic API for escaping strings";
     homepage = "https://github.com/minrk/escapism";
     license = lib.licenses.mit;

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
@@ -45,7 +45,7 @@ let
     propagatedBuildInputs = depends;
     nativeBuildInputs = depends;
     meta.homepage = mkHomepage (args // { inherit name; });
-    meta.platforms = lib.platforms;
+    meta.platforms = platforms;
     meta.hydraPlatforms = hydraPlatforms;
     meta.broken = broken;
     meta.maintainers = maintainers;

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -175,7 +175,7 @@ let
     description = "TeX Live environment";
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers;  [ veprbl ];
-    license = lib.licenses.scheme-infraonly;
+    license = licenses.scheme-infraonly;
   };
 
   combined = recurseIntoAttrs (
@@ -191,15 +191,15 @@ let
         }).overrideAttrs {
           meta = meta // {
             description = "TeX Live environment for ${pname}";
-            license = lib.licenses.${pname};
+            license = licenses.${pname};
           };
         }
       )
   );
 
   schemes = lib.listToAttrs (map (s: {
     name = "texlive" + s;
-    value = lib.addMetaAttrs { license = lib.licenses.${"scheme-" + (lib.toLower s)}; } (buildTeXEnv { requiredTeXPackages = ps: [ ps.${"scheme-" + (lib.toLower s)} ]; });
+    value = lib.addMetaAttrs { license = licenses.${"scheme-" + (lib.toLower s)}; } (buildTeXEnv { requiredTeXPackages = ps: [ ps.${"scheme-" + (lib.toLower s)} ]; });
   }) [ "Basic" "BookPub" "ConTeXt" "Full" "GUST" "InfraOnly" "Medium" "Minimal" "Small" "TeTeX" ]);
 
 in