From 1a2d582f2190920670dac64063b394530fefe5a8 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 7 Jan 2025 12:31:52 -0300
Subject: [PATCH] treewide: more eval fixes

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/re/redeclipse/package.nix      | 2 +-
 pkgs/by-name/tr/trrntzip/package.nix        | 2 +-
 pkgs/by-name/ve/vectorscan/package.nix      | 2 +-
 pkgs/by-name/xb/xbill/package.nix           | 2 +-
 pkgs/desktops/enlightenment/efl/default.nix | 2 +-
 pkgs/development/compilers/scala/2.x.nix    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/re/redeclipse/package.nix b/pkgs/by-name/re/redeclipse/package.nix
index 8eb5c03da8ae9f..ec7770de26d62b 100644
--- 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
index 8ca39b75cf1922..97d107526602f4 100644
--- 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
index 1353c27d22a21c..a58bf130a1e128 100644
--- 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
index 031f63141907fe..d473eb717afe0e 100644
--- 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
index 544c39b5e7570b..2a3436c16256e6 100644
--- 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
index 69f75c596dfd68..00f9f029497b29 100644
--- 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