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
2021-01-11 10:38:22 +01:00
parent e87aef06e0
commit 4a7f99d55d
6869 changed files with 13585 additions and 13580 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, mysql, mailutils, pbzip2, pigz, bzip2, gzip }:
{ lib, stdenv, fetchurl, makeWrapper, mysql, mailutils, pbzip2, pigz, bzip2, gzip }:
stdenv.mkDerivation rec {
pname = "automysqlbackup";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/automysqlbackup --prefix PATH : ${stdenv.lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]}
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A script to run daily, weekly and monthly backups for your MySQL database";
homepage = "https://sourceforge.net/projects/automysqlbackup/";
platforms = platforms.linux;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline
{ lib, stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline
, CoreFoundation, IOKit
}:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
ln -s $out/sbin/* $out/bin
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Enterprise ready, Network Backup Tool";
homepage = "http://bacula.org/";
license = licenses.gpl2;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
{ lib, stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
, readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
, sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null
, jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
"sbindir=\${out}/bin"
];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://www.bareos.org/";
description = "A fork of the bacula project";
license = licenses.agpl3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub
, openssl
, pandoc
, which
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
install -Dm644 bdsync.1 -t $out/share/man/man1/
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Fast block device synchronizing tool";
homepage = "https://github.com/TargetHolding/bdsync";
license = licenses.gpl2;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }:
{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }:
python3.pkgs.buildPythonApplication rec {
pname = "borgbackup";
@@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec {
# 64 failures, needs pytest-benchmark
doCheck = false;
meta = with stdenv.lib; {
meta = with lib; {
description = "Deduplicating archiver with compression and encryption";
homepage = "https://www.borgbackup.org";
license = licenses.bsd3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
{ lib, stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }:
stdenv.mkDerivation rec {
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
--prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A backup tool for btrfs subvolumes";
homepage = "https://digint.ch/btrbk";
license = licenses.gpl3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, acl, librsync, ncurses, openssl, zlib, uthash }:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
installFlags = [ "localstatedir=/tmp" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "BURP - BackUp and Restore Program";
homepage = "https://burp.grke.org";
license = licenses.agpl3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, lz4, snappy, libsodium
{ lib, stdenv, fetchurl, lz4, snappy, libsodium
# For testing
, coreutils, gawk
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
checkInputs = [ coreutils gawk ];
checkTarget = "test";
meta = with stdenv.lib; {
meta = with lib; {
description = "Data deduplication program";
homepage = "https://git.2f30.org/dedup/file/README.html";
license = with licenses; [ bsd0 isc ];
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, makeWrapper, perl, perlPackages }:
{ fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation rec {
name = "dirvish-1.2.1";
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
done
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Fast, disk based, rotating network backup system";
homepage = "http://dirvish.org/";
license = stdenv.lib.licenses.osl2;
+2 -2
View File
@@ -1,4 +1,4 @@
{ buildGoPackage, fetchFromGitHub, stdenv, openssh, makeWrapper }:
{ buildGoPackage, fetchFromGitHub, lib, stdenv, openssh, makeWrapper }:
buildGoPackage rec {
pname = "diskrsync";
@@ -20,7 +20,7 @@ buildGoPackage rec {
wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Rsync for block devices and disk images";
homepage = "https://github.com/dop251/diskrsync";
license = licenses.mit;
+2 -2
View File
@@ -1,7 +1,7 @@
# Tested with simple dump and restore -i, but complains that
# /nix/store/.../etc/dumpdates doesn't exist.
{ stdenv, fetchurl, pkgconfig,
{ lib, stdenv, fetchurl, pkgconfig,
e2fsprogs, ncurses, readline }:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ e2fsprogs pkgconfig ncurses readline ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://dump.sourceforge.io/";
description = "Linux Ext2 filesystem dump/restore utilities";
license = licenses.bsd3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchzip, mono, sqlite, makeWrapper }:
{ lib, stdenv, fetchzip, mono, sqlite, makeWrapper }:
stdenv.mkDerivation rec {
pname = "duplicati";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sqlite ]}
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers";
homepage = "https://www.duplicati.com/";
license = licenses.lgpl21;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchpatch
, fetchurl
, pythonPackages
@@ -112,7 +112,7 @@ pythonPackages.buildPythonApplication rec {
# > OSError: out of pty devices
doCheck = !stdenv.isDarwin;
meta = with stdenv.lib; {
meta = with lib; {
description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
homepage = "https://www.nongnu.org/duplicity";
license = licenses.gpl2Plus;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg, bash
{ lib, stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg, bash
, gnugrep, txt2man, makeWrapper, which
}:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
"$out/bin/duply" txt2man > "$out/share/man/man1/duply.1"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Shell front end for the duplicity backup tool";
longDescription = ''
Duply is a shell front end for the duplicity backup tool
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, zfs }:
{lib, stdenv, fetchFromGitHub, zfs }:
stdenv.mkDerivation {
pname = "easysnap";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
done
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/sjau/easysnap";
description = "Customizable ZFS Snapshotting tool with zfs send/recv pulling";
license = licenses.gpl3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, runtimeShell }:
{ lib, stdenv, fetchFromGitHub, runtimeShell }:
stdenv.mkDerivation {
pname = "flockit";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
chmod +x $out/bin/flockit
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "LD_PRELOAD shim to add file locking to programs that don't do it (I'm looking at you, rsync!)";
longDescription = ''
This library and tool exists solely because rsync doesn't have file locking.
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, python37, fetchFromGitHub }:
{ lib, stdenv, python37, fetchFromGitHub }:
let
python = python37.override {
self = python;
@@ -40,7 +40,7 @@ with python.pkgs; buildPythonApplication rec {
bash ./tests/offline-tests
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Crawler for web archiving with WARC output";
homepage = "https://github.com/ArchiveTeam/grab-site";
license = licenses.mit;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fuse, icu, pkgconfig, libxml2, libuuid }:
{ lib, stdenv, fetchFromGitHub, fuse, icu, pkgconfig, libxml2, libuuid }:
stdenv.mkDerivation rec {
version = "3.4.2_Z7550-02501";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
fuse icu libxml2 libuuid
];
meta = with stdenv.lib; {
meta = with lib; {
description = "HPE's implementation of the open-source tape filesystem standard ltfs";
homepage = "https://support.hpe.com/hpesc/public/km/product/1009214665/Product";
license = licenses.lgpl21;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, openssl, libiconv }:
{ lib, stdenv, fetchurl, zlib, openssl, libiconv }:
stdenv.mkDerivation rec {
version = "3.49.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "Easy-to-use offline browser / website mirroring utility";
homepage = "http://www.httrack.com";
license = licenses.gpl3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, makeWrapper
{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig, makeWrapper
, httrack, qtbase, qtmultimedia }:
mkDerivation rec {
@@ -28,7 +28,7 @@ mkDerivation rec {
--replace /usr/share/httraqt/ $out/share/httraqt
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Easy-to-use offline browser / website mirroring utility - QT frontend";
homepage = "http://www.httrack.com";
license = licenses.gpl3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }:
{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }:
stdenv.mkDerivation rec {
pname = "lvmsync";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
passthru.updateScript = bundlerUpdateScript "lvmsync";
meta = with stdenv.lib; {
meta = with lib; {
description = "Optimised synchronisation of LVM snapshots over a network";
homepage = "https://theshed.hezmatt.org/lvmsync/";
license = licenses.gpl3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
checkFlagsArray = [ "--skip=tests::cli" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Bundle any web page into a single HTML file";
homepage = "https://github.com/Y2Z/monolith";
license = licenses.unlicense;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig
, glib, zlib, pcre, libmysqlclient, libressl }:
let inherit (stdenv.lib) getDev; in
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DMYSQL_INCLUDE_DIR=${getDev libmysqlclient}/include/mysql" ];
meta = with stdenv.lib; {
meta = with lib; {
description = ''High-perfomance MySQL backup tool'';
homepage = "https://github.com/maxbube/mydumper";
license = licenses.gpl3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, pkgconfig, scons, util-linux, fuse, libevent, openssl, zlib }:
{ lib, stdenv, fetchurl, boost, pkgconfig, scons, util-linux, fuse, libevent, openssl, zlib }:
stdenv.mkDerivation {
version = "0.8.1";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
installPhase = ":";
meta = with stdenv.lib; {
meta = with lib; {
description = "A secure distributed file system";
homepage = "http://ori.scs.stanford.edu/";
license = licenses.mit;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkgconfig
{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkgconfig
, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpgerror, lz4
, ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib
, perlPackages
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
rm -r "$out"/lib/plugin/debug
'' + extraPostInstall;
meta = with stdenv.lib; {
meta = with lib; {
description = "Non-blocking backup tool for MySQL";
homepage = "http://www.percona.com/software/percona-xtrabackup";
license = licenses.lgpl2;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium
, llvmPackages, clang, lzma
, Security }:
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Data deduplication with compression and public key encryption";
homepage = "https://github.com/dpc/rdedup";
license = licenses.mpl20;
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, perl, openssh, rsync, logger }:
{ fetchurl, lib, stdenv, perl, openssh, rsync, logger }:
stdenv.mkDerivation rec {
name = "rsnapshot-1.4.3";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"/usr/bin/pod2man" "${perl}/bin/pod2man"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A filesystem snapshot utility for making backups of local and remote systems";
homepage = "https://rsnapshot.org/";
license = stdenv.lib.licenses.gpl2Plus;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3Packages, sqlite, which }:
{ lib, stdenv, fetchFromGitHub, python3Packages, sqlite, which }:
python3Packages.buildPythonApplication rec {
pname = "s3ql";
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
pytest tests
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A full-featured file system for online data storage";
homepage = "https://github.com/s3ql/s3ql/";
license = licenses.gpl3;
@@ -1,4 +1,4 @@
{ pkgs, stdenv, eggDerivation, fetchegg }:
{ pkgs, lib, stdenv, eggDerivation, fetchegg }:
let
eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
in with pkgs; eggDerivation rec {
@@ -21,7 +21,7 @@ in with pkgs; eggDerivation rec {
numbers
];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/";
description = "A tool for generating import manifests for Ugarit";
license = licenses.bsd3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, stdenv, eggDerivation, fetchegg }:
{ pkgs, lib, stdenv, eggDerivation, fetchegg }:
let
eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
in with pkgs; eggDerivation rec {
@@ -31,7 +31,7 @@ in with pkgs; eggDerivation rec {
z3
];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://www.kitten-technologies.co.uk/project/ugarit/";
description = "A backup/archival system based around content-addressible storage";
license = licenses.bsd3;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, go-md2man }:
{ lib, stdenv, fetchFromGitHub, go-md2man }:
stdenv.mkDerivation rec {
version = "1.1.0";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
install -m 644 -D man/zfs-prune-snapshots.1 $out/share/man/man1/zfs-prune-snapshots.1
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Remove snapshots from one or more zpools that match given criteria";
homepage = "https://github.com/bahamas10/zfs-prune-snapshots";
license = licenses.mit;
+2 -2
View File
@@ -1,5 +1,5 @@
{ buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest
, pytestcov, pytestrunner, stdenv, stringcase
, pytestcov, pytestrunner, lib, stdenv, stringcase
}:
buildPythonApplication rec {
@@ -33,7 +33,7 @@ buildPythonApplication rec {
pytest --doctest-modules
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/alunduil/zfs-replicate";
description = "ZFS Snapshot Replication";
license = licenses.bsd2;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, coreutils, installShellFiles }:
{ lib, stdenv, fetchFromGitHub, coreutils, installShellFiles }:
stdenv.mkDerivation rec {
version = "2.0.0-beta3";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
installShellCompletion completion/*.{bash,zsh}
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A portable, performant script to make rolling ZFS snapshots easy";
homepage = "https://github.com/zfsnap/zfsnap";
license = licenses.bsd3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake, autoreconfHook }:
{ lib, stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake, autoreconfHook }:
let
# when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/cpanfile
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "High performance open source ZFS backup with mbuffer and ssh support";
homepage = "http://www.znapzend.org";
license = licenses.gpl3;