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/graphics | |
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/graphics')
76 files changed, 148 insertions, 148 deletions
diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/tools/graphics/amber/default.nix index 1b8c90c8fb70..f5156dd08abf 100644 --- a/pkgs/tools/graphics/amber/default.nix +++ b/pkgs/tools/graphics/amber/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin amber image_diff ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-API shader test framework"; homepage = "https://github.com/google/amber"; license = licenses.asl20; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index 578ee093c05e..a0d659efb3e8 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile, +{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile, eigen, libpng, python, libGLU, qt4, openexr, openimageio, opencolorio, xercesc, ilmbase, osl, seexpr, makeWrapper }: @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { "-DUSE_SSE42=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source, physically-based global illumination rendering engine"; homepage = "https://appleseedhq.net/"; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 115a9a3e4a56..727aa1dc56e3 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { mv $out/ref $out/share/argyllcms ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.argyllcms.com"; description = "Color management system (compatible with ICC)"; license = licenses.gpl3; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 6b8c6870a668..a7c6d6eb4394 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch , autoreconfHook, bison, glm, yacc, flex , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for programming graphics intended to replace Metapost"; license = licenses.gpl3Plus; maintainers = [ maintainers.raskin maintainers.peti ]; diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 48558d022597..2906304a6d2a 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "0.99"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU barcode generator"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; # Maybe other non-darwin Unix diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index b4f99a9192cd..3ea88053d9e3 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }: +{ lib, stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }: stdenv.mkDerivation rec { pname = "blockhash"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python pkgconfig wafHook ]; buildInputs = [ imagemagick ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://blockhash.io/"; description = '' This is a perceptual image hash calculation tool based on algorithm diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix index b22a2e8970b6..7ccda815e1ca 100644 --- a/pkgs/tools/graphics/blur-effect/default.nix +++ b/pkgs/tools/graphics/blur-effect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, gdk-pixbuf, libGL, mesa }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, gdk-pixbuf, libGL, mesa }: stdenv.mkDerivation rec { pname = "blur-effect"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mesa ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sonald/blur-effect"; description = "Off-screen image blurring utility using OpenGL ES 3.0"; license = licenses.gpl3; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 2cbf43407ffe..9295bbe28d56 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg_3, icu }: +{ lib, stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg_3, icu }: stdenv.mkDerivation rec { pname = "cfdg"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp *.txt $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Context-free design grammar - a tool for graphics generation"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 5213245b7d4b..ac6481cc6251 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, imagemagick }: +{ lib, stdenv, fetchurl, cmake, imagemagick }: stdenv.mkDerivation { pname = "cuneiform"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-language OCR system"; homepage = "https://launchpad.net/cuneiform-linux"; license = licenses.bsd3; diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix index 4e74d2c443f1..6bab32ff27fa 100644 --- a/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, git }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, git }: stdenv.mkDerivation rec { pname = "directx-shader-compiler"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cp -r $src/include/dxc $dev/include/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A compiler to compile HLSL programs into DXIL and SPIR-V"; homepage = "https://github.com/microsoft/DirectXShaderCompiler"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index 89a18ae1fe2a..79a24ed3841c 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { name = "ditaa-0.11.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/ditaa" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert ascii art diagrams into proper bitmap graphics"; homepage = "https://github.com/stathissideris/ditaa"; license = licenses.lgpl3; diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index ea65f3dbb55c..c0dc7661715d 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dpic"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # The prefix passed to configure is not used. makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the pic little language for creating drawings"; homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/"; license = licenses.bsd2; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 1dc4891d6423..2c9eadea8bfb 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }: +{ lib, stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }: stdenv.mkDerivation rec { name = "editres-1.0.7"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cgit.freedesktop.org/xorg/app/editres/"; description = "A dynamic resource editor for X Toolkit applications"; license = licenses.mit; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 89c861267f0b..d071b2441672 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU, libGL, vigra , help2man, pkgconfig, perl, texlive }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://enblend.sourceforge.net/"; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/tools/graphics/eplot/default.nix index de729e38662d..b4dd9cd36d8d 100644 --- a/pkgs/tools/graphics/eplot/default.nix +++ b/pkgs/tools/graphics/eplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnuplot, ruby }: +{ lib, stdenv, fetchurl, gnuplot, ruby }: stdenv.mkDerivation { name = "eplot-2.07"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { sed -i -e "s|gnuplot -persist|${gnuplot}/bin/gnuplot -persist|" "$out/bin/eplot" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Create plots quickly with gnuplot"; longDescription = '' eplot ("easy gnuplot") is a ruby script which allows to pipe data easily diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index aed49158599a..8052434ff0b8 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/de |