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/cd-dvd | |
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/cd-dvd')
23 files changed, 45 insertions, 45 deletions
diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix index 0acf55da7fe2..d9664f1072fb 100644 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/pkgs/tools/cd-dvd/bashburn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, util-linux +{ lib, stdenv, fetchurl, util-linux , cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize , vorbis-tools, xorriso }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sh Install.sh --prefix $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bash script CD Burner Writer"; longDescription = '' It might not be the best looking application out there, but it works. diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index df63ced882fe..d5c3a30e7aea 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "bchunk"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -Dt $out/share/man/man1 bchunk.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://he.fi/bchunk/"; description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; platforms = platforms.unix; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index c9c71a99deb8..727c092e3aac 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : "${binpath}") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Gnome CD/DVD Burner"; homepage = "https://wiki.gnome.org/Apps/Brasero"; maintainers = [ maintainers.bdimcheff ]; diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index a6ba7fd332f3..10f8d9701d40 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "ccd2iso-0.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "CloneCD to ISO converter"; homepage = "https://sourceforge.net/projects/ccd2iso/"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix index 9d7336663a8e..9df7ab7657f1 100644 --- a/pkgs/tools/cd-dvd/cdi2iso/default.nix +++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "cdi2iso"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp cdi2iso $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A very simple utility for converting DiscJuggler images to the standard ISO-9660 format"; homepage = "https://sourceforge.net/projects/cdi2iso.berlios"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix index fde9eb1a3320..5f8d6016aa21 100644 --- a/pkgs/tools/cd-dvd/cdimgtools/default.nix +++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }: +{ lib, stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }: stdenv.mkDerivation { pname = "cdimgtools"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install-doc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html"; description = "Tools to inspect and manipulate CD/DVD optical disc images"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index d0d12c34c059..85bebad2723a 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}: +{lib, stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}: stdenv.mkDerivation { name = "cdrdao-1.2.3"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { # Needed on gcc >= 6. NIX_CFLAGS_COMPILE = "-Wno-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = "http://cdrdao.sourceforge.net/"; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix index f4f07143a207..bca1a1c689c3 100644 --- a/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, acl, libcap, Carbon, IOKit }: +{ lib, stdenv, fetchurl, m4, acl, libcap, Carbon, IOKit }: stdenv.mkDerivation rec { pname = "cdrtools"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # parallel building fails on some linux machines - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cdrtools.sourceforge.net/private/cdrecord.html"; description = "Highly portable CD/DVD/BluRay command line recording software"; license = with licenses; [ cddl gpl2 lgpl21 ]; diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix index ebc631521773..a6cf5506138b 100644 --- a/pkgs/tools/cd-dvd/cuetools/default.nix +++ b/pkgs/tools/cd-dvd/cuetools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , bison, flac, flex, id3v2, vorbis-tools }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/cuetag.sh $out/bin/cuetag ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of utilities for working with cue files and toc files"; homepage = "https://github.com/svend/cuetools"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix index 40925a14537a..d396bf030ca6 100644 --- a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix +++ b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cdrtools, m4 }: +{ lib, stdenv, fetchurl, fetchpatch, cdrtools, m4 }: stdenv.mkDerivation rec { pname = "dvd+rw-tools"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"; description = "Tools for mastering Blu-ray and DVD+-RW/+-R media"; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index aef0c3a636f9..4375aebe2990 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dvd-vr"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.pixelbeat.org/programs/dvd-vr/"; downloadPage = "https://www.pixelbeat.org/programs/dvd-vr/"; description = "A utility to identify and optionally copy recordings from a DVD-VR format disc"; diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 5a3828d80131..1087bb94b432 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, which +{ lib, stdenv, fetchurl, pkgconfig, gettext, which , glib, gtk2 , enableSoftening ? true }: @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dvdisaster.net/"; description = "Data loss/scratch/aging protection for CD/DVD media"; longDescription = '' diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/pkgs/tools/cd-dvd/ecm-tools/default.nix index 2ebf8e655517..18ef6f02d80c 100644 --- a/pkgs/tools/cd-dvd/ecm-tools/default.nix +++ b/pkgs/tools/cd-dvd/ecm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ecm-tools"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { (cd $out/bin; ln -s bin2ecm ecm2bin) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility to uncompress ECM files to BIN CD format"; homepage = "https://github.com/alucryd/ecm-tools"; license = licenses.gpl3; diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/tools/cd-dvd/isolyzer/default.nix index 1fd704d90f19..477fa337da84 100644 --- a/pkgs/tools/cd-dvd/isolyzer/default.nix +++ b/pkgs/tools/cd-dvd/isolyzer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3 , fetchFromGitHub }: @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ setuptools six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/KBNLresearch/isolyzer"; description = "Verify size of ISO 9660 image against Volume Descriptor fields"; license = licenses.asl20; diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 0c30f0fe9801..2ca14cc4d603 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , python3 , popt }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # we don't install python stuff as it borks up directories installTargets = [ "install-bin" "install-devel" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rhinstaller/isomd5sum"; description = "Utilities for working with md5sum implanted in ISO images"; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 39d0ab5fc2d6..7847720dc6d5 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libdvdread, pkgconfig }: +{ lib, stdenv, fetchurl, libdvdread, pkgconfig }: let version = "0.17"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ libdvdread ]; nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/lsdvd/"; description = "Display information about audio, video, and subtitle tracks on a DVD"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix index dbad9d362478..e737e38d1bd6 100644 --- a/pkgs/tools/cd-dvd/mdf2iso/default.nix +++ b/pkgs/tools/cd-dvd/mdf2iso/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit}: +{lib, stdenv, fetchgit}: stdenv.mkDerivation rec { pname = "mdf2iso"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0xg43jlvrk8adfjgbjir15nxwcj0nhz4gxpqx7jdfvhg0kwliq0n"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Small utility that converts MDF images to ISO format"; homepage = src.url; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix index 357992d72916..596164f13ffa 100644 --- a/pkgs/tools/cd-dvd/mkcue/default.nix +++ b/pkgs/tools/cd-dvd/mkcue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mkcue"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -pv $out/bin"; postInstall = "chmod -v +w $out/bin/mkcue"; - meta = with stdenv.lib; { + meta = with lib; { description = "Generates CUE sheets from a CD TOC"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix index 082dada85fde..e57948a80dd6 100644 --- a/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "nrg2iso"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp -v nrg2iso $out/bin/nrg2iso ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format"; homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix index a3ce3d361824..23bf808c50fe 100644 --- a/pkgs/tools/cd-dvd/sacd/default.nix +++ b/pkgs/tools/cd-dvd/sacd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams. "; longDescription = '' Super Audio CD decoder. Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix index 8efc50c44935..70fcedde858a 100644 --- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix +++ b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll }: +{ lib, stdenv, fetchFromGitHub, substituteAll }: stdenv.mkDerivation rec { pname = "srt-to-vtt-cl"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp bin/$(uname -s)/$(uname -m)/srt-vtt $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert SRT files to VTT"; license = licenses.mit; maintainers = with maintainers; [ ericdallo ]; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index b935bc02d150..5ccb4b49d7e8 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook +{ lib, stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook , p7zip, mtools, syslinux }: stdenv.mkDerivation rec { @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://unetbootin.sourceforge.net/"; description = "A tool to create bootable live USB drives from ISO images"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index b3f268214db3..b40808a5a8cc 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }: +{ fetchurl, lib, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }: stdenv.mkDerivation rec { name = "xorriso-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libcdio zlib bzip2 readline libiconv ] ++ stdenv.lib.optionals stdenv.isLinux [ acl attr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ISO 9660 Rock Ridge file system manipulator"; longDescription = |