diff options
| author | Profpatsch <mail@profpatsch.de> | 2021-01-11 08:54:33 +0100 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2021-01-11 10:38:22 +0100 |
| commit | 4a7f99d55d299453a9c2397f90b33d1120669775 (patch) | |
| tree | 9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/development/java-modules | |
| parent | e87aef06e00c42b26789321454d7bd609548cc12 (diff) | |
treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938
meta = with stdenv.lib;
is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.
This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.
The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
Diffstat (limited to 'pkgs/development/java-modules')
| -rw-r--r-- | pkgs/development/java-modules/jogl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/java-modules/postgresql_jdbc/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index d4e5f1b62bf7..5f20adada23e 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }: +{ lib, stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }: { jogl_2_3_2 = @@ -55,7 +55,7 @@ cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar $out/share/java/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Java libraries for 3D Graphics, Multimedia and Processing"; homepage = "https://jogamp.org/"; license = licenses.bsd3; diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index 01041d775398..e7968cf80c0a 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchMavenArtifact }: +{ lib, stdenv, fetchMavenArtifact }: stdenv.mkDerivation rec { pname = "postgresql-jdbc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://jdbc.postgresql.org/"; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; license = licenses.bsd2; |