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/misc/screensavers | |
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/misc/screensavers')
-rw-r--r-- | pkgs/misc/screensavers/alock/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/betterlockscreen/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/electricsheep/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/i3lock-pixeled/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/light-locker/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/multilockscreen/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/physlock/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/pipes/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/vlock/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/xautolock/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/xss-lock/default.nix | 4 |
11 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index c9340b2503e8f..3457454575053 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, autoreconfHook +{ lib, stdenv, fetchgit, pkgconfig, autoreconfHook , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pam libgcrypt libXrender imlib2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Arkq/alock"; description = "Simple screen lock application for X server"; longDescription = '' diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index f090156a85c0d..a62aeda9f5069 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -1,5 +1,5 @@ { - stdenv, makeWrapper, fetchFromGitHub, + lib, stdenv, makeWrapper, fetchFromGitHub, imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${PATH}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed"; homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 0d772da679059..b9aa087283956 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl , libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL , glee }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { sed -i "s|/usr|$out|" Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; homepage = "https://electricsheep.org/"; maintainers = with maintainers; [ nand0p fpletz ]; diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 39497917755f1..cb7a2fd1e1845 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -1,4 +1,4 @@ -{ stdenv, i3lock, imagemagick, scrot, playerctl, fetchFromGitLab }: +{ lib, stdenv, i3lock, imagemagick, scrot, playerctl, fetchFromGitLab }: stdenv.mkDerivation rec { pname = "i3lock-pixeled"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --replace playerctl "${playerctl}/bin/playerctl" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active"; homepage = "https://gitlab.com/Ma27/i3lock-pixeled"; license = licenses.mit; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index c4915bec8959a..0853a25a3eb1f 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/the-cavalry/light-locker"; description = "A simple session-locker for LightDM"; longDescription = '' diff --git a/pkgs/misc/screensavers/multilockscreen/default.nix b/pkgs/misc/screensavers/multilockscreen/default.nix index 3fa6dbc725e94..4d4e7609d9367 100644 --- a/pkgs/misc/screensavers/multilockscreen/default.nix +++ b/pkgs/misc/screensavers/multilockscreen/default.nix @@ -1,5 +1,5 @@ { - stdenv, makeWrapper, fetchFromGitHub, writeShellScriptBin, + lib, stdenv, makeWrapper, fetchFromGitHub, writeShellScriptBin, imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb, xset, gnused, gnugrep, coreutils }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/multilockscreen" --prefix PATH : "${binPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper script for i3lock-color"; longDescription = '' multilockscreen is a wrapper script for i3lock-color. diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index c27ac344e0550..d25a777e650be 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pam, systemd }: +{ lib, stdenv, fetchFromGitHub, pam, systemd }: stdenv.mkDerivation rec { version = "v13"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "SESSION=systemd" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A secure suspend/hibernate-friendly alternative to `vlock -an`"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 94d6299d38328..a4e40fd77efe3 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, coreutils, ncurses }: +{ lib, stdenv, fetchurl, makeWrapper, coreutils, ncurses }: stdenv.mkDerivation rec { pname = "pipes"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --set PATH "${stdenv.lib.makeBinPath [ coreutils ncurses ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pipeseroni/pipes.sh"; description = "Animated pipes terminal screensaver"; license = licenses.mit; diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index 83d82e2b3b34c..243d582bdcee7 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam }: +{ lib, stdenv, fetchurl, pam }: stdenv.mkDerivation { name = "vlock-2.2.2"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ pam ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual console locking program"; license = licenses.gpl2; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index d46f772e49539..cdb12b5546472 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xlibsWrapper +{ lib, stdenv, fetchFromGitHub, xlibsWrapper , imake, gccmakedep, libXScrnSaver, xorgproto }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Launch a given program when your X session has been idle for a given time"; homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; maintainers = with maintainers; [ peti ]; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index fcd2e877b267d..c6dafd2a81272 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, docutils, pkg-config, glib, libpthreadstubs +{ lib, stdenv, fetchFromGitHub, cmake, docutils, pkg-config, glib, libpthreadstubs , libXau, libXdmcp, xcbutil }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config docutils ]; buildInputs = [ glib libpthreadstubs libXau libXdmcp xcbutil ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Use external locker (such as i3lock) as X screen saver"; license = licenses.mit; maintainers = with maintainers; [ malyn offline ]; |