treewide: more eval fixes

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

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/pkgs/by-name/re/redeclipse/package.nix b/pkgs/by-name/re/redeclipse/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.redeclipse.net";
     license = with lib.licenses; [
-      licenses.zlib
+      lib.licenses.zlib
       cc-by-sa-30
     ];
     maintainers = with lib.maintainers; [ lambda-11235 ];

diff --git a/pkgs/by-name/tr/trrntzip/package.nix b/pkgs/by-name/tr/trrntzip/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/0-wiz-0/trrntzip";
     license = with lib.licenses; [
       # "This software includes code from minizip, which is part of zlib"
-      licenses.zlib
+      lib.licenses.zlib
 
       gpl2Plus
     ];

diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
     license = with lib.licenses; [
       bsd3 # and
       bsd2 # and
-      licenses.boost
+      lib.licenses.boost
     ];
     maintainers = with lib.maintainers; [
       tnias

diff --git a/pkgs/by-name/xb/xbill/package.nix b/pkgs/by-name/xb/xbill/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     install -Dm644 pixmaps/icon.xpm $out/share/pixmaps/xbill.xpm
   '';
 
-  meta = with stdenv; {
+  meta = {
     description = "Protect a computer network from getting infected";
     homepage = "http://www.xbill.org/";
     license = lib.licenses.gpl1Only;

diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix
@@ -215,7 +215,7 @@ stdenv.mkDerivation rec {
     license = with lib.licenses; [
       bsd2
       lgpl2Only
-      licenses.zlib
+      lib.licenses.zlib
     ];
     platforms = lib.platforms.linux;
     maintainers =

diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.scala-lang.org/";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
-    branch = versions.majorMinor version;
+    branch = lib.versions.majorMinor version;
     maintainers = with lib.maintainers; [
       nequissimus
       kashw2