summaryrefslogtreecommitdiffstats
path: root/pkgs/development/java-modules
diff options
context:
space:
mode:
authorBen Siraphob <bensiraphob@gmail.com>2021-01-24 00:15:07 +0700
committerBen Siraphob <bensiraphob@gmail.com>2021-01-24 00:16:29 +0700
commit2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 (patch)
treefd273f1e48a30237aa9b96342f6324757a4ca09f /pkgs/development/java-modules
parentec334a1b01c491faa3463c96717b71921dddef2c (diff)
pkgs/development: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/java-modules')
-rw-r--r--pkgs/development/java-modules/build-maven-package.nix6
-rw-r--r--pkgs/development/java-modules/junit/default.nix8
-rw-r--r--pkgs/development/java-modules/maven-hello/default.nix8
-rw-r--r--pkgs/development/java-modules/maven-minimal.nix4
4 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index a7196c6e0314..cb895d9c6720 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -1,11 +1,11 @@
-{ stdenv, maven, pkgs }:
+{ lib, stdenv, maven, pkgs }:
{ mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }:
with builtins;
-with stdenv.lib;
+with lib;
let
- mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; };
+ mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs stdenv; };
in stdenv.mkDerivation rec {
inherit mavenDeps src name meta m2Path;
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index dbbce6b62624..c4b02071ec04 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, mavenbuild, fetchMaven }:
+{ lib, stdenv, pkgs, mavenbuild, fetchMaven }:
with pkgs.javaPackages;
@@ -21,9 +21,9 @@ in rec {
meta = {
homepage = "https://junit.org/junit4/";
description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
- license = stdenv.lib.licenses.epl10;
- platforms = stdenv.lib.platforms.all;
- maintainers = with stdenv.lib.maintainers;
+ license = lib.licenses.epl10;
+ platforms = lib.platforms.all;
+ maintainers = with lib.maintainers;
[ nequissimus ];
};
};
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
index b4639d9ee1d1..e0087e857a47 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, mavenbuild }:
+{ lib, stdenv, pkgs, mavenbuild }:
with pkgs.javaPackages;
@@ -20,9 +20,9 @@ in rec {
meta = {
homepage = "https://github.com/NeQuissimus/maven-hello/";
description = "Maven Hello World";
- license = stdenv.lib.licenses.unlicense;
- platforms = stdenv.lib.platforms.all;
- maintainers = with stdenv.lib.maintainers;
+ license = lib.licenses.unlicense;
+ platforms = lib.platforms.all;
+ maintainers = with lib.maintainers;
[ nequissimus ];
};
};
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index 52edcd2104fd..9019e3ba28e9 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -1,6 +1,6 @@
-{ stdenv, pkgs }:
+{ lib, stdenv, pkgs }:
-with stdenv.lib;
+with lib;
with pkgs.javaPackages;
let