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:
Profpatsch
@@ -1,4 +1,4 @@
|
||||
{ stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkgconfig, xmlsec }:
|
||||
{ lib, stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkgconfig, xmlsec }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
cp ./.libs/mod_auth_mellon.so $out/modules
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/UNINETT/mod_auth_mellon";
|
||||
description = "An Apache module with a simple SAML 2.0 service provider";
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }:
|
||||
{ lib, stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_ca";
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
"LIBEXECDIR=${placeholder ''out''}/modules"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service module";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "RedWax module for Certificate Revocation Lists";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service module to handle Certificate Signing Requests";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mod_dnssd-0.6";
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
cp src/.libs/mod_dnssd.so $out/modules
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "http://0pointer.de/lennart/projects/mod_dnssd";
|
||||
description = "Provide Zeroconf support via DNS-SD using Avahi";
|
||||
license = licenses.asl20;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_ocsp";
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service modules of OCSP Online Certificate Validation";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_pkcs12";
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service modules for PKCS#12 format files";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_scep";
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_spkac";
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service module for handling the Netscape keygen requests. ";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_tile";
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
rm -rf $out/nix
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/openstreetmap/mod_tile";
|
||||
description = "Efficiently render and serve OpenStreetMap tiles using Apache and Mapnik";
|
||||
license = licenses.gpl2;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_timestamp";
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service module for issuing signed timestamps";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, apacheHttpd, jdk }:
|
||||
{ lib, stdenv, fetchurl, apacheHttpd, jdk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tomcat-connectors-1.2.48";
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ apacheHttpd jdk ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Provides web server plugins to connect web servers with Tomcat";
|
||||
homepage = "https://tomcat.apache.org/download-connectors.cgi";
|
||||
license = licenses.asl20;
|
||||
|
||||
Reference in New Issue
Block a user