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
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user