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:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, buildPythonApplication, fuse
|
||||
{ lib, stdenv, fetchFromGitHub, buildPythonApplication, fuse
|
||||
, appdirs, colorama, dateutil, requests, requests_toolbelt
|
||||
, fusepy, sqlalchemy }:
|
||||
|
||||
@@ -30,7 +30,7 @@ buildPythonApplication rec {
|
||||
lnOverBin acd_cli.py acdcli
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A command line interface and FUSE filesystem for Amazon Cloud Drive";
|
||||
homepage = "https://github.com/yadayada/acd_cli";
|
||||
license = licenses.gpl2;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkgconfig, python3, sphinx
|
||||
, acl, curl, fuse, libselinux, udev, xz, zstd
|
||||
, fuseSupport ? true
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
|
||||
export LC_ALL="en_US.utf-8"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Content-Addressable Data Synchronizer";
|
||||
homepage = "https://github.com/systemd/casync";
|
||||
license = licenses.lgpl21;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "desync";
|
||||
@@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
# nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad.
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Content-addressed binary distribution system";
|
||||
longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness";
|
||||
homepage = "https://github.com/folbricht/desync";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync,
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync,
|
||||
asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/axkibe/lsyncd";
|
||||
description = "A utility that synchronizes local directories with remote targets";
|
||||
license = licenses.gpl2;
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
installShellCompletion --zsh --name _${pname} contrib/completions/complete.zsh
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A complete tool to interact with OneDrive on Linux";
|
||||
homepage = "https://github.com/abraunegg/onedrive";
|
||||
license = licenses.gpl3;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rclone-browser";
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Graphical Frontend to Rclone written in Qt";
|
||||
license = licenses.unlicense;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rclone";
|
||||
@@ -36,7 +36,7 @@ buildGoModule rec {
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Command line program to sync files and directories to and from major cloud storage";
|
||||
homepage = "https://rclone.org";
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
rec {
|
||||
version = "3.2.3";
|
||||
@@ -13,7 +13,7 @@ rec {
|
||||
sha256 = "1wj21v57v135n6fnmlm2dxmb9lhrrg62jgkggldp1gb7d6s4arny";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Fast incremental file transfer utility";
|
||||
homepage = "https://rsync.samba.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, perl, libiconv, zlib, popt
|
||||
{ lib, stdenv, fetchurl, perl, libiconv, zlib, popt
|
||||
, enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null
|
||||
, enableLZ4 ? true, lz4 ? null
|
||||
, enableOpenSSL ? true, openssl ? null
|
||||
@@ -15,7 +15,7 @@ assert enableXXHash -> xxHash != null;
|
||||
assert enableZstd -> zstd != null;
|
||||
|
||||
let
|
||||
base = import ./base.nix { inherit stdenv fetchurl; };
|
||||
base = import ./base.nix { inherit lib stdenv fetchurl; };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rsync-${base.version}";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, perl, rsync }:
|
||||
{ lib, stdenv, fetchurl, perl, rsync }:
|
||||
|
||||
let
|
||||
base = import ./base.nix { inherit stdenv fetchurl; };
|
||||
base = import ./base.nix { inherit stdenv lib fetchurl; };
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "rrsync-${base.version}";
|
||||
|
||||
Reference in New Issue
Block a user