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/tools/archivers | |
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/tools/archivers')
22 files changed, 42 insertions, 42 deletions
diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index 76eb9a7fccbc..dcd5243d7135 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libjpeg, zlib +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libjpeg, zlib , openssl, libwebp, catch }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to extract files from visual novel archives"; homepage = "https://github.com/vn-tools/arc_unpacker"; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/bomutils/default.nix b/pkgs/tools/archivers/bomutils/default.nix index fc68184be319..9ace81a5ec2c 100644 --- a/pkgs/tools/archivers/bomutils/default.nix +++ b/pkgs/tools/archivers/bomutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hogliux/bomutils"; description = "Open source tools to create bill-of-materials files used in macOS installers"; platforms = platforms.all; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 14c4ede50041..3ed07544bb2b 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "cabextract-1.9.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19qwhl2r8ip95q4vxzxg2kp4p125hjmc9762sns1dwwf7ikm7hmg"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.cabextract.org.uk/"; description = "Free Software for extracting Microsoft cabinet files"; platforms = platforms.all; diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index a196ddcaa306..5b88e10b1c37 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "2.13"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/cpio/"; description = "A program to create or extract from cpio archives"; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index e0eb11aa9a6f..145a66a31315 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, perl }: +{ lib, stdenv, fetchurl, pkgconfig, fuse, perl }: stdenv.mkDerivation rec { name = "cromfs-1.5.10.2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fuse perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "FUSE Compressed ROM filesystem with lzma"; homepage = "https://bisqwit.iki.fi/source/cromfs.html"; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix index 4b8eb4dfab2e..4743f7ded3e8 100644 --- a/pkgs/tools/archivers/ctrtool/default.nix +++ b/pkgs/tools/archivers/ctrtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ctrtool"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp ctrtool${stdenv.hostPlatform.extensions.executable} $out/bin/ "; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; description = "A tool to extract data from a 3ds rom"; platforms = platforms.linux; diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index 721accd93f03..5196ccf668f2 100644 --- a/pkgs/tools/archivers/fsarchiver/default.nix +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , zlib, bzip2, lzma, lzo, lz4, zstd, xz , libgcrypt, e2fsprogs, util-linux, libgpgerror }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation { libgcrypt e2fsprogs util-linux libgpgerror ]; - meta = with stdenv.lib; { + meta = with lib; { description = "File system archiver for linux"; longDescription = '' FSArchiver is a system tool that allows you to save the contents of a diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 4f6137a42114..d5d35a38251f 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, makeWrapper, python +{ lib, stdenv, fetchurl, cmake, makeWrapper, python , boost, lzma , withGog ? false, unar ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to unpack installers created by Inno Setup"; homepage = "https://constexpr.org/innoextract/"; license = licenses.zlib; diff --git a/pkgs/tools/archivers/maxcso/default.nix b/pkgs/tools/archivers/maxcso/default.nix index 333b0dcabc3d..ed81a1825257 100644 --- a/pkgs/tools/archivers/maxcso/default.nix +++ b/pkgs/tools/archivers/maxcso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libuv, lz4, zlib }: +{ lib, stdenv, fetchFromGitHub, libuv, lz4, zlib }: stdenv.mkDerivation rec { pname = "maxcso"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/unknownbrackets/maxcso"; description = "A fast ISO to CSO compression program for use with PSP and PS2 emulators, which uses multiple algorithms for best compression ratio"; diff --git a/pkgs/tools/archivers/pax/default.nix b/pkgs/tools/archivers/pax/default.nix index aa457b976d0d..d554ea4dade3 100644 --- a/pkgs/tools/archivers/pax/default.nix +++ b/pkgs/tools/archivers/pax/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "pax"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -Dm444 mans/pax{,cpio,tar}.1 -t $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "POSIX standard archive tool from MirBSD"; homepage = "https://www.mirbsd.org/pax.htm"; license = licenses.bsd3; diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index 59ff67e3eefb..d4bbbe77a2d8 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpm, cpio, substituteAll }: +{ lib, stdenv, rpm, cpio, substituteAll }: stdenv.mkDerivation { name = "rpmextract"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { inherit (stdenv) shell; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Script to extract RPM archives"; platforms = platforms.all; license = licenses.gpl2; diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index aefe4f87eb4a..c785211e682f 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, coreutils }: +{ lib, stdenv, fetchurl, gettext, coreutils }: stdenv.mkDerivation rec { name = "sharutils-4.15.2"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for remote synchronization and `shell archives'"; longDescription = '' GNU shar makes so-called shell archives out of many files, preparing diff --git a/pkgs/tools/archivers/snzip/default.nix b/pkgs/tools/archivers/snzip/default.nix index 031cac64b759..1f4a0f12ff2f 100644 --- a/pkgs/tools/archivers/snzip/default.nix +++ b/pkgs/tools/archivers/snzip/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # run. That's why we generate it. nativeBuildInputs = [ autoreconfHook pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A compression/decompression tool based on snappy"; homepage = "https://github.com/kubo/snzip"; maintainers = with maintainers; [ doronbehar ]; diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 6e75ee720e80..d0d0ef90e68d 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles, gnustep, bzip2, zlib, icu, openssl, wavpack }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, gnustep, bzip2, zlib, icu, openssl, wavpack }: stdenv.mkDerivation rec { pname = "unar"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://theunarchiver.com"; description = "An archive unpacker program"; longDescription = '' diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 0eaabdb627da..0bbf725d191b 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, bzip2, lzfse, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, bzip2, lzfse, pkg-config }: stdenv.mkDerivation rec { version = "1.1.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/matthewbauer/undmg"; description = "Extract a DMG file"; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index afe00972141c..34f8cb1c40e6 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { --prefix PATH : ${lib.makeBinPath runtime_bins} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool for unpacking archives easily"; homepage = "https://packages.qa.debian.org/u/unp.html"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 9396267b3a10..b06242a98c04 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "unrar"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix index dbcb2b24f100..2c58b546b63c 100644 --- a/pkgs/tools/archivers/unshield/default.nix +++ b/pkgs/tools/archivers/unshield/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib, openssl }: stdenv.mkDerivation rec { pname = "unshield"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool and library to extract CAB files from InstallShield installers"; homepage = "https://github.com/twogood/unshield"; license = licenses.mit; diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 51f75ee923d3..16e93470e892 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , pkgconfig, openssl, fuse, libxml2 , cabextract ? null , cdrkit ? null @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { patchShebangs tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wimlib.net"; description = "A library and program to extract, create, and modify WIM files"; platforms = platforms.unix; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 173f48121090..74f1982a425e 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, enableNLS ? false, libnatspec ? null, libiconv }: +{ lib, stdenv, fetchurl, enableNLS ? false, libnatspec ? null, libiconv }: assert enableNLS -> libnatspec != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional enableNLS libnatspec ++ stdenv.lib.optional stdenv.isCygwin libiconv; - meta = with stdenv.lib; { + meta = with lib; { description = "Compressor/archiver for creating and modifying zipfiles"; homepage = "http://www.info-zip.org"; license = licenses.bsdOriginal; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index dbdcdf5cada8..7c9f9ac7d632 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, unzip }: +{ lib, stdenv, fetchFromGitHub, perl, unzip }: stdenv.mkDerivation rec { pname = "zpaq"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Incremental journaling backup utility and archiver"; homepage = "http://mattmahoney.net/dc/zpaq.html"; license = licenses.gpl3Plus ; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 611654331c3b..6abad5a17be4 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let # Generated upstream information @@ -39,7 +39,7 @@ stdenv.mkDerivation { cp readme_zpaqd.txt "$out/share/doc/zpaq" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ZPAQ archive (de)compressor and algorithm development tool"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; |