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/applications/misc/ape | |
| 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/applications/misc/ape')
| -rw-r--r-- | pkgs/applications/misc/ape/clex.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/ape/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix index c680ffe96783..a98695dab682 100644 --- a/pkgs/applications/misc/ape/clex.nix +++ b/pkgs/applications/misc/ape/clex.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "attempto-clex"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp clex_lexicon.pl $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Large lexicon for APE (~100,000 entries)"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index dda6c812c8d8..f16d6e157332 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -1,9 +1,9 @@ -{ stdenv, swiProlog, makeWrapper, +{ lib, stdenv, swiProlog, makeWrapper, fetchFromGitHub, lexiconPath ? "prolog/lexicon/clex_lexicon.pl", pname ? "ape", description ? "Parser for Attempto Controlled English (ACE)", - license ? with stdenv.lib; licenses.lgpl3 + license ? with lib; licenses.lgpl3 }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeWrapper $out/ape.exe $out/bin/ape --add-flags ace ''; - meta = with stdenv.lib; { + meta = with lib; { description = description; license = license; platforms = platforms.unix; |