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, 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