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/servers/varnish | |
parent | e87aef06e00c42b26789321454d7bd609548cc12 (diff) | |
download | nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.gz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.bz2 nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.lz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.xz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.zst nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.zip |
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/servers/varnish')
-rw-r--r-- | pkgs/servers/varnish/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/varnish/digest.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/varnish/dynamic.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/varnish/modules.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 27e0edfcc2b..0326c8988f4 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit +{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit , python3, makeWrapper }: let @@ -30,7 +30,7 @@ let outputs = [ "out" "dev" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; license = licenses.bsd2; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 8d69451f8b5..b6ec11e4e8d 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }: stdenv.mkDerivation rec { version = "1.0.2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Digest and HMAC vmod"; homepage = "https://github.com/varnish/libvmod-digest"; inherit (varnish.meta) license platforms maintainers; diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index c43f00b7a6b..a9900424b96 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: stdenv.mkDerivation rec { version = "0.4"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic director similar to the DNS director from Varnish 3"; homepage = "https://github.com/nigoroll/libvmod-dynamic"; inherit (varnish.meta) license platforms maintainers; diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 69ee7028de8..f39afd9c87c 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: stdenv.mkDerivation rec { version = "0.15.0"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = "find $out -type f -exec remove-references-to -t ${varnish.dev} '{}' +"; # varnish.dev captured only as __FILE__ in assert messages - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of Varnish Cache modules (vmods) by Varnish Software"; homepage = "https://github.com/varnish/varnish-modules"; inherit (varnish.meta) license platforms maintainers; |