Merge pull request #109434 from siraben/pkgs-tools-stdenv
pkgs/tools: stdenv.lib -> lib
commit147270c1c938a416b1966a976ebe52f547cda43d
authorJörg Thalheim <Mic92@users.noreply.github.com>
dateFri 15 Jan 2021, 10:48 (6 years ago)
parentdc7dd238c5d371
916 files changed+2510−2510
pkgs/tools/X11/arandr/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python3Packages
1+{ lib, stdenv, fetchurl, python3Packages
22, gobject-introspection, gsettings-desktop-schemas, gtk3
33, wrapGAppsHook, xrandr
44}:
@@ -34,7 +34,7 @@ in buildPythonApplication rec {
3434 meta = {
3535 homepage = "http://christian.amsuess.com/tools/arandr/";
3636 description = "A simple visual front end for XRandR";
37− license = stdenv.lib.licenses.gpl3;
38− maintainers = [ stdenv.lib.maintainers.domenkozar ];
37+ license = lib.licenses.gpl3;
38+ maintainers = [ lib.maintainers.domenkozar ];
3939 };
4040}
pkgs/tools/X11/autocutsel/default.nix+5−5
@@ -1,14 +1,14 @@
1−{stdenv, fetchurl, libX11, libXaw}:
1+{lib, stdenv, fetchurl, libX11, libXaw}:
22
33stdenv.mkDerivation rec {
44 version = "0.10.0";
55 pname = "autocutsel";
6−
6+
77 src = fetchurl {
88 url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${pname}-${version}.tar.gz";
99 sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2";
1010 };
11−
11+
1212 buildInputs = [ libX11 libXaw ];
1313 installPhase = ''
1414 mkdir -p $out/bin
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919 inherit version;
2020 homepage = "https://www.nongnu.org/autocutsel/";
2121 description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection";
22− license = stdenv.lib.licenses.gpl2Plus;
23− platforms = with stdenv.lib.platforms; all;
22+ license = lib.licenses.gpl2Plus;
23+ platforms = with lib.platforms; all;
2424 updateWalker = true;
2525 };
2626}
pkgs/tools/X11/ckbcomp/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys";
3131 homepage = "https://salsa.debian.org/installer-team/console-setup";
3232 license = licenses.gpl2Plus;
33− maintainers = with stdenv.lib.maintainers; [ dezgeg ];
33+ maintainers = with lib.maintainers; [ dezgeg ];
3434 platforms = platforms.unix;
3535 };
3636}
pkgs/tools/X11/go-sct/default.nix+1−1
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 pname = "go-sct";
5− version = "20180605-${stdenv.lib.strings.substring 0 7 rev}";
5+ version = "20180605-${lib.strings.substring 0 7 rev}";
66 rev = "eb1e851f2d5017038d2b8e3653645c36d3a279f4";
77
88 goPackagePath = "github.com/d4l3k/go-sct";
pkgs/tools/X11/icon-slicer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, gdk-pixbuf, popt }:
1+{ lib, stdenv, fetchurl, pkg-config, gdk-pixbuf, popt }:
22stdenv.mkDerivation rec {
33 pname = "icon-slicer";
44 version = "0.3";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 nativeBuildInputs = [ popt pkg-config ];
2020 buildInputs = [ gdk-pixbuf ];
2121
22− meta = with stdenv.lib; {
22+ meta = with lib; {
2323 description = "Utility for generating icon themes and libXcursor cursor themes";
2424 homepage = "https://www.freedesktop.org/wiki/Software/icon-slicer/";
2525 license = licenses.mit;
pkgs/tools/X11/nitrogen/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
1+{ lib, stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
22
33let version = "1.6.1";
44in
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828 and settings are stored in a human-readable config file.
2929 '';
3030 homepage = "https://github.com/l3ib/nitrogen";
31− license = stdenv.lib.licenses.gpl2;
32− platforms = stdenv.lib.platforms.linux;
33− maintainers = [ stdenv.lib.maintainers.auntie ];
31+ license = lib.licenses.gpl2;
32+ platforms = lib.platforms.linux;
33+ maintainers = [ lib.maintainers.auntie ];
3434 };
3535}
pkgs/tools/X11/nx-libs/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo
1+{ lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo
22, libpng, libtool, libxml2, pkgconfig, which, xorg
33, libtirpc
44}:
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
4141 meta = {
4242 description = "NX X server based on Xnest";
4343 homepage = "https://github.com/ArcticaProject/nx-libs";
44− license = stdenv.lib.licenses.gpl2;
45− maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ];
46− platforms = stdenv.lib.platforms.linux;
44+ license = lib.licenses.gpl2;
45+ maintainers = with lib.maintainers; [ jD91mZM2 ];
46+ platforms = lib.platforms.linux;
4747 };
4848}
pkgs/tools/X11/obconf/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox,
1+{ lib, stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox,
22 imlib2, libstartup_notification, makeWrapper, libSM }:
33
44stdenv.mkDerivation rec {
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
2323 meta = {
2424 description = "GUI configuration tool for openbox";
2525 homepage = "http://openbox.org/wiki/ObConf";
26− license = stdenv.lib.licenses.gpl2;
27− maintainers = [ stdenv.lib.maintainers.lhvwb ];
28− platforms = stdenv.lib.platforms.linux;
26+ license = lib.licenses.gpl2;
27+ maintainers = [ lib.maintainers.lhvwb ];
28+ platforms = lib.platforms.linux;
2929 };
3030}
pkgs/tools/X11/ratmen/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, perl, xorgproto, libX11}:
1+{lib, stdenv, fetchurl, perl, xorgproto, libX11}:
22let
33 s = # Generated upstream information
44 rec {
@@ -25,9 +25,9 @@ stdenv.mkDerivation {
2525 meta = {
2626 inherit (s) version;
2727 description = ''A minimalistic X11 menu creator'';
28− license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license
29− maintainers = [stdenv.lib.maintainers.raskin];
30− platforms = stdenv.lib.platforms.linux;
28+ license = lib.licenses.free ; # 9menu derivative with 9menu license
29+ maintainers = [lib.maintainers.raskin];
30+ platforms = lib.platforms.linux;
3131 homepage = "http://www.update.uu.se/~zrajm/programs/";
3232 downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/";
3333 updateWalker = true;
pkgs/tools/X11/run-scaled/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
1717 mkdir -p $out/bin
1818 cp run_scaled $out/bin
1919 wrapProgram $out/bin/run_scaled --prefix PATH ":" \
20− ${stdenv.lib.makeBinPath [ bc xorgserver xpra xrandr ]}
20+ ${lib.makeBinPath [ bc xorgserver xpra xrandr ]}
2121 '';
2222
2323 meta = with lib; {
pkgs/tools/X11/runningx/default.nix+5−5
@@ -1,9 +1,9 @@
1−{ stdenv, fetchurl, pkgconfig, libX11 }:
1+{ lib, stdenv, fetchurl, pkgconfig, libX11 }:
22
33stdenv.mkDerivation {
44 pname = "runningx";
55 version = "1.0";
6−
6+
77 src = fetchurl {
88 url = "http://www.fiction.net/blong/programs/mutt/autoview/RunningX.c";
99 sha256 = "1mikkhrx6jsx716041qdy3nwjac08pxxvxyq2yablm8zg9hrip0d";
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
2727 meta = {
2828 homepage = "http://www.fiction.net/blong/programs/mutt/";
2929 description = "A program for testing if X is running";
30− license = stdenv.lib.licenses.free;
31− platforms = stdenv.lib.platforms.unix;
32− maintainers = [ stdenv.lib.maintainers.romildo ];
30+ license = lib.licenses.free;
31+ platforms = lib.platforms.unix;
32+ maintainers = [ lib.maintainers.romildo ];
3333 };
3434}
pkgs/tools/X11/screen-message/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }:
1+{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }:
22
33stdenv.mkDerivation rec {
44 pname = "screen-message";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 homepage = "https://www.joachim-breitner.de/en/projects#screen-message";
2020 description = "Displays a short text fullscreen in an X11 window";
21− license = stdenv.lib.licenses.gpl2Plus;
22− maintainers = [ stdenv.lib.maintainers.fpletz ];
23− platforms = stdenv.lib.platforms.unix;
21+ license = lib.licenses.gpl2Plus;
22+ maintainers = [ lib.maintainers.fpletz ];
23+ platforms = lib.platforms.unix;
2424 };
2525}
pkgs/tools/X11/setroot/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 };
1717
1818 buildInputs = [ libX11 imlib2 ]
19− ++ stdenv.lib.optional enableXinerama libXinerama;
19+ ++ lib.optional enableXinerama libXinerama;
2020
2121 buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ;
2222
pkgs/tools/X11/skippy-xd/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage
1+{lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage
22, libXext, libXinerama, libjpeg, giflib, pkgconfig
33}:
44let
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
2323 meta = {
2424 inherit version;
2525 description = ''Expose-style compositing-based standalone window switcher'';
26− license = stdenv.lib.licenses.gpl2Plus ;
27− maintainers = [stdenv.lib.maintainers.raskin];
28− platforms = stdenv.lib.platforms.linux;
26+ license = lib.licenses.gpl2Plus ;
27+ maintainers = [lib.maintainers.raskin];
28+ platforms = lib.platforms.linux;
2929 };
3030}
pkgs/tools/X11/sselp/default.nix+6−6
@@ -1,14 +1,14 @@
1−{ stdenv, fetchurl, libX11 }:
1+{ lib, stdenv, fetchurl, libX11 }:
22
33stdenv.mkDerivation rec {
44 version = "0.2";
55 pname = "sselp";
6−
6+
77 src = fetchurl {
88 url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
99 sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
1010 };
11−
11+
1212 buildInputs = [ libX11 ];
1313
1414 patchPhase = ''
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 homepage = "https://tools.suckless.org/sselp";
2222 description = "Prints the X selection to stdout, useful in scripts";
23− license = stdenv.lib.licenses.mit;
24− maintainers = [stdenv.lib.maintainers.magnetophon ];
25− platforms = stdenv.lib.platforms.linux;
23+ license = lib.licenses.mit;
24+ maintainers = [lib.maintainers.magnetophon ];
25+ platforms = lib.platforms.linux;
2626 };
2727}
pkgs/tools/X11/virtualgl/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 '';
1919
2020 meta = {
21− platforms = stdenv.lib.platforms.linux;
21+ platforms = lib.platforms.linux;
2222 inherit (virtualglLib.meta) license;
2323 };
2424}
pkgs/tools/X11/wayv/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, libX11}:
1+{lib, stdenv, fetchFromGitHub, libX11}:
22stdenv.mkDerivation rec {
33 pname = "wayv";
44 version = "0.3";
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
2424 meta = {
2525 inherit version;
2626 description = "A gesture control for X11";
27− license = stdenv.lib.licenses.gpl2Plus ;
28− maintainers = [stdenv.lib.maintainers.raskin];
29− platforms = stdenv.lib.platforms.linux;
27+ license = lib.licenses.gpl2Plus ;
28+ maintainers = [lib.maintainers.raskin];
29+ platforms = lib.platforms.linux;
3030 homepage = "https://github.com/mikemb/wayV";
3131 };
3232}
pkgs/tools/X11/wmctrl/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, libX11
44, glib
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
2525 meta = {
2626 homepage = "https://sites.google.com/site/tstyblo/wmctrl";
2727 description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers";
28− license = stdenv.lib.licenses.gpl2;
29− platforms = with stdenv.lib.platforms; all;
30− maintainers = [ stdenv.lib.maintainers.Anton-Latukha ];
28+ license = lib.licenses.gpl2;
29+ platforms = with lib.platforms; all;
30+ maintainers = [ lib.maintainers.Anton-Latukha ];
3131 };
3232
3333}
pkgs/tools/X11/xannotate/default.nix+5−5
@@ -1,8 +1,8 @@
1−{stdenv, fetchFromBitbucket, libX11}:
1+{lib, stdenv, fetchFromBitbucket, libX11}:
22stdenv.mkDerivation rec {
33 pname = "xannotate";
44 version = "20150301";
5−
5+
66 src = fetchFromBitbucket {
77 owner = "blais";
88 repo = pname;
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
1515 meta = {
1616 inherit version;
1717 description = "A tool to scribble over X windows";
18− license = stdenv.lib.licenses.gpl2Plus ;
19− maintainers = [stdenv.lib.maintainers.raskin];
20− platforms = stdenv.lib.platforms.linux;
18+ license = lib.licenses.gpl2Plus ;
19+ maintainers = [lib.maintainers.raskin];
20+ platforms = lib.platforms.linux;
2121 homepage = "https://bitbucket.org/blais/xannotate";
2222 };
2323}
pkgs/tools/X11/xautomation/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }:
1+{ lib, stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }:
22
33let version = "1.09"; in
44stdenv.mkDerivation {
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
1515 meta = {
1616 homepage = "https://www.hoopajoo.net/projects/xautomation.html";
1717 description = "Control X from the command line for scripts, and do \"visual scraping\" to find things on the screen";
18− license = stdenv.lib.licenses.gpl2Plus;
19− maintainers = with stdenv.lib.maintainers; [ vaibhavsagar ];
20− platforms = with stdenv.lib.platforms; linux;
18+ license = lib.licenses.gpl2Plus;
19+ maintainers = with lib.maintainers; [ vaibhavsagar ];
20+ platforms = with lib.platforms; linux;
2121 };
2222}
pkgs/tools/X11/xbanish/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, libX11, libXi, libXt, libXfixes, libXext}:
1+{lib, stdenv, fetchFromGitHub, libX11, libXi, libXt, libXfixes, libXext}:
22
33stdenv.mkDerivation rec {
44 version = "1.7";
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
3535 The name comes from ratpoison's "banish" command that sends the cursor to the
3636 corner of the screen.
3737 '';
38− license = stdenv.lib.licenses.bsd3;
39− maintainers = [stdenv.lib.maintainers.choochootrain];
40− platforms = stdenv.lib.platforms.linux;
38+ license = lib.licenses.bsd3;
39+ maintainers = [lib.maintainers.choochootrain];
40+ platforms = lib.platforms.linux;
4141 };
4242}
pkgs/tools/X11/xbindkeys-config/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
1+{ lib, stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
22
33stdenv.mkDerivation rec {
44 pname = "xbindkeys-config";
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
1717 meta = {
1818 homepage = "https://packages.debian.org/source/xbindkeys-config";
1919 description = "Graphical interface for configuring xbindkeys";
20− license = stdenv.lib.licenses.gpl2Plus;
21− maintainers = with stdenv.lib.maintainers; [benley];
22− platforms = with stdenv.lib.platforms; linux;
20+ license = lib.licenses.gpl2Plus;
21+ maintainers = with lib.maintainers; [benley];
22+ platforms = with lib.platforms; linux;
2323 };
2424
2525 patches = [ ./xbindkeys-config-patch1.patch ];
pkgs/tools/X11/xbindkeys/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libX11, guile }:
1+{ lib, stdenv, fetchurl, pkgconfig, libX11, guile }:
22
33let version = "1.8.7"; in
44stdenv.mkDerivation {
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
1515 meta = {
1616 homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html";
1717 description = "Launch shell commands with your keyboard or your mouse under X Window";
18− license = stdenv.lib.licenses.gpl2Plus;
19− maintainers = with stdenv.lib.maintainers; [viric];
20− platforms = with stdenv.lib.platforms; linux;
18+ license = lib.licenses.gpl2Plus;
19+ maintainers = with lib.maintainers; [viric];
20+ platforms = with lib.platforms; linux;
2121 };
2222}
pkgs/tools/X11/xbrightness/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, imake, gccmakedep
1+{ lib, stdenv, fetchurl, imake, gccmakedep
22, libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm }:
33
44stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 meta = {
1919 description = "X11 brigthness and gamma software control";
2020 homepage = "http://shallowsky.com/software";
21− license = stdenv.lib.licenses.mit;
22− platforms = stdenv.lib.platforms.linux;
21+ license = lib.licenses.mit;
22+ platforms = lib.platforms.linux;
2323 };
2424}
pkgs/tools/X11/xchainkeys/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libX11 }:
1+{ lib, stdenv, fetchurl, libX11 }:
22
33stdenv.mkDerivation rec {
44 name = "xchainkeys-0.11";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 meta = {
1414 homepage = "http://henning-bekel.de/xchainkeys/";
1515 description = "A standalone X11 program to create chained key bindings";
16− license = stdenv.lib.licenses.gpl3;
17− platforms = stdenv.lib.platforms.unix;
16+ license = lib.licenses.gpl3;
17+ platforms = lib.platforms.unix;
1818 };
1919}
pkgs/tools/X11/xdg-utils/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 # just needed when built from git
3333 buildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ];
3434
35− postInstall = stdenv.lib.optionalString mimiSupport ''
35+ postInstall = lib.optionalString mimiSupport ''
3636 cp ${mimisrc}/xdg-open $out/bin/xdg-open
3737 '' + ''
3838 sed '2s#.#\
pkgs/tools/X11/xdotool/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
1+{ lib, stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
22
33stdenv.mkDerivation rec {
44 pname = "xdotool";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121 meta = {
2222 homepage = "https://www.semicomplete.com/projects/xdotool/";
2323 description = "Fake keyboard/mouse input, window management, and more";
24− license = stdenv.lib.licenses.bsd3;
25− maintainers = with stdenv.lib.maintainers; [viric];
26− platforms = with stdenv.lib.platforms; linux;
24+ license = lib.licenses.bsd3;
25+ maintainers = with lib.maintainers; [viric];
26+ platforms = with lib.platforms; linux;
2727 };
2828}
pkgs/tools/X11/xinput_calibrator/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }:
1+{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }:
22
33stdenv.mkDerivation rec {
44 pname = "xinput_calibrator";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
1616 meta = {
1717 homepage = "https://github.com/tias/xinput_calibrator";
1818 description = "A generic touchscreen calibration program for X.Org";
19− license = stdenv.lib.licenses.mit;
20− maintainers = [ stdenv.lib.maintainers.flosse ];
21− platforms = stdenv.lib.platforms.linux;
19+ license = lib.licenses.mit;
20+ maintainers = [ lib.maintainers.flosse ];
21+ platforms = lib.platforms.linux;
2222 };
2323}
pkgs/tools/X11/xloadimage/default.nix+7−7
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, libX11
44, libXt
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
3535
3636 buildInputs = [
3737 libX11 libXt
38− ] ++ stdenv.lib.optionals withJpegSupport [
38+ ] ++ lib.optionals withJpegSupport [
3939 libjpeg
40− ] ++ stdenv.lib.optionals withPngSupport [
40+ ] ++ lib.optionals withPngSupport [
4141 libpng
42− ] ++ stdenv.lib.optionals withTiffSupport [
42+ ] ++ lib.optionals withTiffSupport [
4343 libtiff
4444 ];
4545
@@ -80,9 +80,9 @@ stdenv.mkDerivation rec {
8080 zoom, brightening/darkening and merging.
8181 '';
8282
83− license = stdenv.lib.licenses.gpl2Plus;
83+ license = lib.licenses.gpl2Plus;
8484
85− maintainers = with stdenv.lib.maintainers; [ andrew-d ];
86− platforms = stdenv.lib.platforms.linux; # arbitrary choice
85+ maintainers = with lib.maintainers; [ andrew-d ];
86+ platforms = lib.platforms.linux; # arbitrary choice
8787 };
8888}
pkgs/tools/X11/xmacro/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }:
1+{ lib, stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }:
22
33stdenv.mkDerivation rec {
44 pname = "xmacro";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 buildInputs = [ libX11 libXtst xorgproto libXi ];
1515
1616 meta = {
17− platforms = stdenv.lib.platforms.linux;
18− license = stdenv.lib.licenses.gpl2;
17+ platforms = lib.platforms.linux;
18+ license = lib.licenses.gpl2;
1919 };
2020}
pkgs/tools/X11/xmousepasteblock/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 meta = with lib; {
1616 description = "Middle mouse button primary X selection/clipboard paste disabler";
1717 homepage = "https://github.com/milaq/XMousePasteBlock";
18− license = stdenv.lib.licenses.gpl2;
18+ license = lib.licenses.gpl2;
1919 maintainers = [ maintainers.petercommand ];
2020 };
2121}
pkgs/tools/X11/xnee/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, libX11, xorgproto, libXext, libXtst
1+{ fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst
22, gtk2, libXi, pkgconfig, texinfo }:
33
44stdenv.mkDerivation rec {
@@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
4545 "macros", retype a file.
4646 '';
4747
48− license = stdenv.lib.licenses.gpl3Plus;
48+ license = lib.licenses.gpl3Plus;
4949
5050 homepage = "https://www.gnu.org/software/xnee/";
5151
52− maintainers = with stdenv.lib.maintainers; [ ];
53− platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
52+ maintainers = with lib.maintainers; [ ];
53+ platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
5454 };
5555}
pkgs/tools/X11/xpointerbarrier/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, xorg, fetchgit }:
1+{ lib, stdenv, xorg, fetchgit }:
22stdenv.mkDerivation rec {
33 pname = "xpointerbarrier";
44 version = "18.06";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
1515 meta = {
1616 homepage = "https://uninformativ.de/git/xpointerbarrier";
1717 description = "Create X11 pointer barriers around your working area";
18− license = stdenv.lib.licenses.mit;
19− maintainers = [ stdenv.lib.maintainers.xzfc ];
20− platforms = stdenv.lib.platforms.linux;
18+ license = lib.licenses.mit;
19+ maintainers = [ lib.maintainers.xzfc ];
20+ platforms = lib.platforms.linux;
2121 };
2222}
pkgs/tools/X11/xpra/default.nix+1−1
@@ -97,7 +97,7 @@ in buildPythonApplication rec {
9797 --set XPRA_INSTALL_PREFIX "$out"
9898 --set XPRA_COMMAND "$out/bin/xpra"
9999 --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
100− --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}
100+ --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}
101101 )
102102 '';
103103
pkgs/tools/X11/xprintidle-ng/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib
1+{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib
22 , autoconf, automake, libtool, gettext, pkgconfig
33 , git, perl, texinfo, help2man
44}:
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
3737 inherit version;
3838 description = ''A command-line tool to print idle time from libXss'';
3939 homepage = "http://taktoa.me/xprintidle-ng/";
40− license = stdenv.lib.licenses.gpl2;
41− maintainers = [stdenv.lib.maintainers.raskin];
42− platforms = stdenv.lib.platforms.linux;
40+ license = lib.licenses.gpl2;
41+ maintainers = [lib.maintainers.raskin];
42+ platforms = lib.platforms.linux;
4343 };
4444}
pkgs/tools/X11/xrestop/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, xorg, pkgconfig, ncurses }:
1+{ lib, stdenv, fetchurl, xorg, pkgconfig, ncurses }:
22stdenv.mkDerivation {
33
44 pname = "xrestop";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 buildInputs = [ xorg.libX11 xorg.libXres xorg.libXext ncurses ];
1414
1515 meta = {
16− platforms = stdenv.lib.platforms.unix;
17− license = stdenv.lib.licenses.gpl2;
16+ platforms = lib.platforms.unix;
17+ license = lib.licenses.gpl2;
1818 };
1919}
pkgs/tools/X11/xwinmosaic/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }:
1+{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }:
22
33stdenv.mkDerivation rec {
44 version = "0.4.2";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
1717 meta = {
1818 inherit version;
1919 description = ''X window switcher drawing a colourful grid'';
20− license = stdenv.lib.licenses.bsd2 ;
21− maintainers = [stdenv.lib.maintainers.raskin];
22− platforms = stdenv.lib.platforms.linux;
20+ license = lib.licenses.bsd2 ;
21+ maintainers = [lib.maintainers.raskin];
22+ platforms = lib.platforms.linux;
2323 };
2424}
pkgs/tools/X11/xzoom/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}:
1+{ lib, stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}:
22
33stdenv.mkDerivation rec {
44 name = "${pname}-${version}";
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
3131 meta = {
3232 inherit version;
3333 description = "An X11 screen zoom tool";
34− license = stdenv.lib.licenses.free ;
35− maintainers = [stdenv.lib.maintainers.raskin];
36− platforms = stdenv.lib.platforms.linux;
34+ license = lib.licenses.free ;
35+ maintainers = [lib.maintainers.raskin];
36+ platforms = lib.platforms.linux;
3737 };
3838}
pkgs/tools/admin/daemontools/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, bash, glibc, stdenv }:
1+{ fetchurl, bash, glibc, lib, stdenv }:
22
33stdenv.mkDerivation rec {
44 name = "daemontools-0.76";
@@ -34,11 +34,11 @@ stdenv.mkDerivation rec {
3434 '';
3535
3636 meta = {
37− license = stdenv.lib.licenses.publicDomain;
37+ license = lib.licenses.publicDomain;
3838 homepage = "https://cr.yp.to/daemontools.html";
3939 description = "A collection of tools for managing UNIX services";
4040
41− maintainers = with stdenv.lib.maintainers; [ kevincox ];
42− platforms = stdenv.lib.platforms.unix;
41+ maintainers = with lib.maintainers; [ kevincox ];
42+ platforms = lib.platforms.unix;
4343 };
4444}
pkgs/tools/admin/dehydrated/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 mkdir -p $out/bin
2424 cp -a dehydrated $out/bin
25− wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}"
25+ wrapProgram "$out/bin/dehydrated" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}"
2626 '';
2727
2828 meta = with lib; {
pkgs/tools/admin/docker-credential-helpers/default.nix+2−2
@@ -13,9 +13,9 @@ buildGoPackage rec {
1313 sha256 = "0xgmwjva3j1s0cqkbajbamj13bgzh5jkf2ir54m9a7w8gjnsh6dx";
1414 };
1515
16− nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
16+ nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
1717
18− buildInputs = stdenv.lib.optionals stdenv.isLinux [ libsecret ];
18+ buildInputs = lib.optionals stdenv.isLinux [ libsecret ];
1919
2020 buildPhase =
2121 if stdenv.isDarwin
pkgs/tools/admin/exoscale-cli/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub }:
1+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
22
33buildGoPackage rec {
44 pname = "exoscale-cli";
@@ -27,7 +27,7 @@ buildGoPackage rec {
2727 meta = {
2828 description = "Command-line tool for everything at Exoscale: compute, storage, dns";
2929 homepage = "https://github.com/exoscale/cli";
30− license = stdenv.lib.licenses.asl20;
31− maintainers = with stdenv.lib.maintainers; [ dramaturg ];
30+ license = lib.licenses.asl20;
31+ maintainers = with lib.maintainers; [ dramaturg ];
3232 };
3333}
pkgs/tools/admin/fbvnc/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub}:
1+{lib, stdenv, fetchFromGitHub}:
22stdenv.mkDerivation rec {
33 name = "${pname}-${version}";
44 pname = "fbvnc";
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
2222
2323 meta = {
2424 description = "Framebuffer VNC client";
25− license = stdenv.lib.licenses.bsd3;
26− maintainers = [stdenv.lib.maintainers.raskin];
27− platforms = stdenv.lib.platforms.linux;
25+ license = lib.licenses.bsd3;
26+ maintainers = [lib.maintainers.raskin];
27+ platforms = lib.platforms.linux;
2828 homepage = "https://github.com/zohead/fbvnc/";
2929 };
3030}
pkgs/tools/admin/gtk-vnc/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 outputs = [ "out" "bin" "man" "dev" ];
2828
2929 src = fetchurl {
30− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
30+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
3131 sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8";
3232 };
3333
pkgs/tools/admin/lxd/default.nix+1−1
@@ -46,7 +46,7 @@ buildGoPackage rec {
4646 # test binaries, code generation
4747 rm $out/bin/{deps,macaroon-identity,generate}
4848
49− wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath (
49+ wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (
5050 networkPkgs
5151 ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ]
5252 ++ [ (writeShellScriptBin "apparmor_parser" ''
pkgs/tools/admin/procs/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "13wfz0ig9dsl0h085rzlrx0dg9la957c50xyzjfxq1ybw2qr266b";
1515
16− buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
16+ buildInputs = lib.optional stdenv.isDarwin Security;
1717
1818 meta = with lib; {
1919 description = "A modern replacement for ps written in Rust";
pkgs/tools/admin/sec/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, perl, stdenv }:
1+{ fetchFromGitHub, perl, lib, stdenv }:
22
33stdenv.mkDerivation rec {
44 name = "sec-${meta.version}";
@@ -23,10 +23,10 @@ stdenv.mkDerivation rec {
2323
2424 meta = {
2525 homepage = "https://simple-evcorr.github.io";
26− license = stdenv.lib.licenses.gpl2;
26+ license = lib.licenses.gpl2;
2727 description = "Simple Event Correlator";
28− maintainers = [ stdenv.lib.maintainers.tv ];
29− platforms = stdenv.lib.platforms.all;
28+ maintainers = [ lib.maintainers.tv ];
29+ platforms = lib.platforms.all;
3030 version = "2.8.3";
3131 };
3232}
pkgs/tools/admin/ssl-cert-check/default.nix+1−1
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 mkdir -p $out/bin
4444 cp $pname $out/bin/$pname
4545 wrapProgram $out/bin/$pname \
46− --set PATH "${stdenv.lib.makeBinPath buildInputs}"
46+ --set PATH "${lib.makeBinPath buildInputs}"
4747 '';
4848
4949 meta = with lib; {
pkgs/tools/admin/tigervnc/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub
1+{ lib, stdenv, fetchFromGitHub
22, xorg, xkeyboard_config, zlib
33, libjpeg_turbo, pixman, fltk
44, fontDirectories
@@ -9,7 +9,7 @@
99, makeWrapper
1010}:
1111
12−with stdenv.lib;
12+with lib;
1313
1414stdenv.mkDerivation rec {
1515 version = "1.11.0";
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
8181 rm -f $out/lib/xorg/protocol.txt
8282
8383 wrapProgram $out/bin/vncserver \
84− --prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) }
84+ --prefix PATH : ${lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) }
8585 '';
8686
8787 buildInputs = with xorg; [
@@ -100,10 +100,10 @@ stdenv.mkDerivation rec {
100100
101101 meta = {
102102 homepage = "https://tigervnc.org/";
103− license = stdenv.lib.licenses.gpl2Plus;
103+ license = lib.licenses.gpl2Plus;
104104 description = "Fork of tightVNC, made in cooperation with VirtualGL";
105− maintainers = with stdenv.lib.maintainers; [viric];
106− platforms = with stdenv.lib.platforms; linux;
105+ maintainers = with lib.maintainers; [viric];
106+ platforms = with lib.platforms; linux;
107107 # Prevent a store collision.
108108 priority = 4;
109109 };
pkgs/tools/admin/tightvnc/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu
1+{ lib, stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu
22, libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }:
33
44stdenv.mkDerivation {
@@ -68,7 +68,7 @@ stdenv.mkDerivation {
6868 '';
6969
7070 meta = {
71− license = stdenv.lib.licenses.gpl2Plus;
71+ license = lib.licenses.gpl2Plus;
7272 homepage = "http://vnc-tight.sourceforge.net/";
7373 description = "Improved version of VNC";
7474
@@ -80,6 +80,6 @@ stdenv.mkDerivation {
8080 '';
8181
8282 maintainers = [];
83− platforms = stdenv.lib.platforms.unix;
83+ platforms = lib.platforms.unix;
8484 };
8585}
pkgs/tools/archivers/afio/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub } :
1+{ lib, stdenv, fetchFromGitHub } :
22
33stdenv.mkDerivation rec {
44 version = "2.5.2";
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
2222 meta = {
2323 homepage = "https://github.com/kholtman/afio";
2424 description = "Fault tolerant cpio archiver targeting backups";
25− platforms = stdenv.lib.platforms.all;
25+ platforms = lib.platforms.all;
2626 /*
2727 * Licensing is complicated due to the age of the code base, but
2828 * generally free. See the file ``afio_license_issues_v5.txt`` for
2929 * a comprehensive discussion.
3030 */
31− license = stdenv.lib.licenses.free;
31+ license = lib.licenses.free;
3232 };
3333}
pkgs/tools/archivers/atool/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, perl, bash}:
1+{lib, stdenv, fetchurl, perl, bash}:
22
33stdenv.mkDerivation {
44 name = "atool-0.39.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 meta = {
1414 homepage = "https://www.nongnu.org/atool";
1515 description = "Archive command line helper";
16− platforms = stdenv.lib.platforms.unix;
17− license = stdenv.lib.licenses.gpl3;
16+ platforms = lib.platforms.unix;
17+ license = lib.licenses.gpl3;
1818 };
1919}
pkgs/tools/archivers/gnutar/default.nix+8−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, acl }:
1+{ lib, stdenv, fetchurl, autoreconfHook, acl }:
22
33# Note: this package is used for bootstrapping fetchurl, and thus
44# cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616
1717 # avoid retaining reference to CF during stdenv bootstrap
18− configureFlags = stdenv.lib.optionals stdenv.isDarwin [
18+ configureFlags = lib.optionals stdenv.isDarwin [
1919 "gt_cv_func_CFPreferencesCopyAppValue=no"
2020 "gt_cv_func_CFLocaleCopyCurrent=no"
2121 "gt_cv_func_CFLocaleCopyPreferredLanguages=no"
@@ -24,19 +24,19 @@ stdenv.mkDerivation rec {
2424 # gnutar tries to call into gettext between `fork` and `exec`,
2525 # which is not safe on darwin.
2626 # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882
27− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
27+ postPatch = lib.optionalString stdenv.isDarwin ''
2828 substituteInPlace src/system.c --replace '_(' 'N_('
2929 '';
3030
3131 outputs = [ "out" "info" ];
3232
3333 buildInputs = [ ]
34− ++ stdenv.lib.optional stdenv.isLinux acl
35− ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
34+ ++ lib.optional stdenv.isLinux acl
35+ ++ lib.optional stdenv.isDarwin autoreconfHook;
3636
3737 # May have some issues with root compilation because the bootstrap tool
3838 # cannot be used as a login shell for now.
39− FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1";
39+ FORCE_UNSAFE_CONFIGURE = lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1";
4040
4141 preConfigure = if stdenv.isCygwin then ''
4242 sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
@@ -64,10 +64,10 @@ stdenv.mkDerivation rec {
6464 archives).
6565 '';
6666
67− license = stdenv.lib.licenses.gpl3Plus;
67+ license = lib.licenses.gpl3Plus;
6868
6969 maintainers = [ ];
70− platforms = stdenv.lib.platforms.all;
70+ platforms = lib.platforms.all;
7171
7272 priority = 10;
7373 };
pkgs/tools/archivers/innoextract/default.nix+2−2
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ cmake makeWrapper ];
1616
1717 # we need unar to for multi-archive extraction
18− postFixup = stdenv.lib.optionalString withGog ''
18+ postFixup = lib.optionalString withGog ''
1919 wrapProgram $out/bin/innoextract \
20− --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]}
20+ --prefix PATH : ${lib.makeBinPath [ unar ]}
2121 '';
2222
2323 meta = with lib; {
pkgs/tools/archivers/ndstool/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake }:
1+{ lib, stdenv, fetchFromGitHub, autoconf, automake }:
22
33stdenv.mkDerivation rec {
44 pname = "ndstool";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 homepage = "https://github.com/devkitPro/ndstool";
2020 description = "A tool to unpack and repack nds rom";
21− maintainers = [ stdenv.lib.maintainers.marius851000 ];
22− license = stdenv.lib.licenses.gpl3;
21+ maintainers = [ lib.maintainers.marius851000 ];
22+ license = lib.licenses.gpl3;
2323 };
2424}
pkgs/tools/archivers/p7zip/default.nix+5−5
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 # I think this is a typo and should be CXX? Either way let's kill it
2020 sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits
21− '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
21+ '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
2222 substituteInPlace makefile.machine \
2323 --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \
2424 --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++'
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333
3434 preConfigure = ''
3535 buildFlags=all3
36− '' + stdenv.lib.optionalString stdenv.isDarwin ''
36+ '' + lib.optionalString stdenv.isDarwin ''
3737 cp makefile.macosx_llvm_64bits makefile.machine
3838 '';
3939
@@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
4141
4242 setupHook = ./setup-hook.sh;
4343
44− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
44+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
4545
4646 meta = {
4747 homepage = "https://github.com/szcnick/p7zip";
4848 description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)";
49− platforms = stdenv.lib.platforms.unix;
50− maintainers = [ stdenv.lib.maintainers.raskin ];
49+ platforms = lib.platforms.unix;
50+ maintainers = [ lib.maintainers.raskin ];
5151 # RAR code is under non-free UnRAR license, but we remove it
5252 license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus;
5353 };
pkgs/tools/archivers/pxattr/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gcc }:
1+{ lib, stdenv, fetchurl, gcc }:
22
33stdenv.mkDerivation {
44 name = "pxattr-2.1.0";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
1818 meta = {
1919 homepage = "https://www.lesbonscomptes.com/pxattr/index.html";
2020 description = "Provides a single interface to extended file attributes";
21− maintainers = [ stdenv.lib.maintainers.vrthra ];
22− license = [ stdenv.lib.licenses.mit ];
23− platforms = stdenv.lib.platforms.unix;
21+ maintainers = [ lib.maintainers.vrthra ];
22+ license = [ lib.licenses.mit ];
23+ platforms = lib.platforms.unix;
2424 };
2525}
pkgs/tools/archivers/runzip/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, libzip, autoreconfHook }:
1+{ lib, stdenv, fetchFromGitHub, libzip, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 version = "1.4";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
1616
1717 meta = {
1818 description = "A tool to convert filename encoding inside a ZIP archive";
19− license = stdenv.lib.licenses.bsd2 ;
20− maintainers = [stdenv.lib.maintainers.raskin];
21− platforms = stdenv.lib.platforms.linux;
19+ license = lib.licenses.bsd2 ;
20+ maintainers = [lib.maintainers.raskin];
21+ platforms = lib.platforms.linux;
2222 };
2323}
pkgs/tools/archivers/s-tar/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "s-tar";
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828 Note that unpacking tar archives may be a security risk because star may overwrite existing files.
2929 '';
3030 homepage = "http://cdrtools.sourceforge.net/private/star.html";
31− license = stdenv.lib.licenses.cddl;
32− maintainers = [ stdenv.lib.maintainers.wucke13 ];
31+ license = lib.licenses.cddl;
32+ maintainers = [ lib.maintainers.wucke13 ];
3333 platforms = [ "x86_64-linux" ];
3434 };
3535}
pkgs/tools/archivers/unzip/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl
1+{ lib, stdenv, fetchurl
22, bzip2
33, enableNLS ? false, libnatspec
44}:
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
4141 name = "CVE-2019-13232-3.patch";
4242 sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf";
4343 })
44− ] ++ stdenv.lib.optional enableNLS
44+ ] ++ lib.optional enableNLS
4545 (fetchurl {
4646 url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";
4747 name = "unzip-6.0-natspec.patch";
@@ -49,11 +49,11 @@ stdenv.mkDerivation {
4949 });
5050
5151 nativeBuildInputs = [ bzip2 ];
52− buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec;
52+ buildInputs = [ bzip2 ] ++ lib.optional enableNLS libnatspec;
5353
5454 makefile = "unix/Makefile";
5555
56− NIX_LDFLAGS = "-lbz2" + stdenv.lib.optionalString enableNLS " -lnatspec";
56+ NIX_LDFLAGS = "-lbz2" + lib.optionalString enableNLS " -lnatspec";
5757
5858 buildFlags = [
5959 "generic"
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
7474 meta = {
7575 homepage = "http://www.info-zip.org";
7676 description = "An extraction utility for archives compressed in .zip format";
77− license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html
78− platforms = stdenv.lib.platforms.all;
77+ license = lib.licenses.free; # http://www.info-zip.org/license.html
78+ platforms = lib.platforms.all;
7979 };
8080}
pkgs/tools/archivers/wimlib/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 '';
2626
2727 postInstall = let
28− path = stdenv.lib.makeBinPath [ cabextract cdrkit mtools ntfs3g syslinux ];
28+ path = lib.makeBinPath [ cabextract cdrkit mtools ntfs3g syslinux ];
2929 in ''
3030 for prog in $out/bin/*; do
3131 wrapProgram $prog --prefix PATH : ${path}
pkgs/tools/archivers/xarchive/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gtk2, pkgconfig }:
1+{ lib, stdenv, fetchurl, gtk2, pkgconfig }:
22
33stdenv.mkDerivation rec {
44 version = "0.2.8-6";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
1616
1717 meta = {
1818 description = "A GTK front-end for command line archiving tools";
19− maintainers = [ stdenv.lib.maintainers.domenkozar ];
20− license = stdenv.lib.licenses.gpl2;
21− platforms = stdenv.lib.platforms.all;
19+ maintainers = [ lib.maintainers.domenkozar ];
20+ license = lib.licenses.gpl2;
21+ platforms = lib.platforms.all;
2222 };
2323}
pkgs/tools/archivers/xarchiver/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper,
1+{ lib, stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper,
22 coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }:
33
44stdenv.mkDerivation rec {
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
1717
1818 postFixup = ''
1919 wrapProgram $out/bin/xarchiver \
20− --prefix PATH : ${stdenv.lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]}
20+ --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]}
2121 '';
2222
2323 meta = {
2424 description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
2525 homepage = "https://github.com/ib/xarchiver";
26− maintainers = [ stdenv.lib.maintainers.domenkozar ];
27− license = stdenv.lib.licenses.gpl2;
28− platforms = stdenv.lib.platforms.all;
26+ maintainers = [ lib.maintainers.domenkozar ];
27+ license = lib.licenses.gpl2;
28+ platforms = lib.platforms.all;
2929 };
3030}
pkgs/tools/archivers/zip/default.nix+2−2
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
2727
2828 patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else [];
2929
30− buildInputs = stdenv.lib.optional enableNLS libnatspec
31− ++ stdenv.lib.optional stdenv.isCygwin libiconv;
30+ buildInputs = lib.optional enableNLS libnatspec
31+ ++ lib.optional stdenv.isCygwin libiconv;
3232
3333 meta = with lib; {
3434 description = "Compressor/archiver for creating and modifying zipfiles";
pkgs/tools/archivers/zpaq/zpaqd.nix+3−3
@@ -11,9 +11,9 @@ let
1111 sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk";
1212 };
1313
14− compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ]
15− ++ stdenv.lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread"
16− ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT");
14+ compileFlags = lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ]
15+ ++ lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread"
16+ ++ lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT");
1717in
1818stdenv.mkDerivation {
1919 inherit (s) name version;
pkgs/tools/audio/acoustid-fingerprinter/default.nix+2−2
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 nativeBuildInputs = [ cmake pkg-config ];
1414 buildInputs = [ qt4 taglib chromaprint ffmpeg ];
1515
16− cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${stdenv.lib.getVersion taglib}" ];
16+ cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ];
1717
1818 patches = [
1919 (fetchpatch {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 meta = with lib; {
2727 homepage = "https://acoustid.org/fingerprinter";
2828 description = "Audio fingerprinting tool using chromaprint";
29− license = stdenv.lib.licenses.gpl2Plus;
29+ license = lib.licenses.gpl2Plus;
3030 maintainers = with maintainers; [ ehmry ];
3131 platforms = with platforms; linux;
3232 };
pkgs/tools/audio/beets/plugins/alternatives.nix+2−2
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
1919 meta = {
2020 description = "Beets plugin to manage external files";
2121 homepage = "https://github.com/geigerzaehler/beets-alternatives";
22− maintainers = [ stdenv.lib.maintainers.aszlig ];
23− license = stdenv.lib.licenses.mit;
22+ maintainers = [ lib.maintainers.aszlig ];
23+ license = lib.licenses.mit;
2424 };
2525}
pkgs/tools/audio/beets/plugins/copyartifacts.nix+1−1
@@ -28,6 +28,6 @@ pythonPackages.buildPythonApplication {
2828 meta = {
2929 description = "Beets plugin to move non-music files during the import process";
3030 homepage = "https://github.com/sbarakat/beets-copyartifacts";
31− license = stdenv.lib.licenses.mit;
31+ license = lib.licenses.mit;
3232 };
3333}
pkgs/tools/audio/beets/plugins/extrafiles.nix+1−1
@@ -25,6 +25,6 @@ pythonPackages.buildPythonApplication rec {
2525 meta = {
2626 homepage = "https://github.com/Holzhaus/beets-extrafiles";
2727 description = "A plugin for beets that copies additional files and directories during the import process";
28− license = stdenv.lib.licenses.mit;
28+ license = lib.licenses.mit;
2929 };
3030}
pkgs/tools/audio/bpm-tools/default.nix+1−1
@@ -10,7 +10,7 @@
1010}:
1111
1212let
13− path = stdenv.lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ];
13+ path = lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ];
1414in
1515stdenv.mkDerivation rec {
1616 pname = "bpm-tools";
pkgs/tools/audio/darkice/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkgconfig
22, libjack2, alsaLib, libpulseaudio
33, faac, lame, libogg, libopus, libvorbis, libsamplerate
44}:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 meta = {
3232 homepage = "http://darkice.org/";
3333 description = "Live audio streamer";
34− license = stdenv.lib.licenses.gpl3;
35− maintainers = with stdenv.lib.maintainers; [ ikervagyok fpletz ];
34+ license = lib.licenses.gpl3;
35+ maintainers = with lib.maintainers; [ ikervagyok fpletz ];
3636 };
3737}
pkgs/tools/audio/gvolicon/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
1+{ lib, stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
22
33stdenv.mkDerivation {
44 name = "gvolicon-2014-04-28";
@@ -21,8 +21,8 @@ stdenv.mkDerivation {
2121 meta = {
2222 description = "A simple and lightweight volume icon that sits in your system tray";
2323 homepage = "https://github.com/Unia/gvolicon";
24− platforms = stdenv.lib.platforms.linux;
25− license = stdenv.lib.licenses.gpl3Plus;
26− maintainers = [ stdenv.lib.maintainers.bennofs ];
24+ platforms = lib.platforms.linux;
25+ license = lib.licenses.gpl3Plus;
26+ maintainers = [ lib.maintainers.bennofs ];
2727 };
2828}
pkgs/tools/audio/mididings/default.nix+1−1
@@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication {
2323 # so mididings knows where to look for config files
2424 ++ [ pyxdg ];
2525
26− preBuild = with stdenv.lib.versions; ''
26+ preBuild = with lib.versions; ''
2727 substituteInPlace setup.py \
2828 --replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}"
2929 '';
pkgs/tools/audio/picotts/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }:
1+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }:
22
33stdenv.mkDerivation {
44 name = "picotts-unstable-2018-10-19";
@@ -15,9 +15,9 @@ stdenv.mkDerivation {
1515 meta = {
1616 description = "Text to speech voice sinthesizer from SVox";
1717 homepage = "https://github.com/naggety/picotts";
18− license = stdenv.lib.licenses.asl20;
19− maintainers = [ stdenv.lib.maintainers.canndrew ];
20− platforms = stdenv.lib.platforms.linux;
18+ license = lib.licenses.asl20;
19+ maintainers = [ lib.maintainers.canndrew ];
20+ platforms = lib.platforms.linux;
2121 };
2222}
2323
pkgs/tools/backup/automysqlbackup/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 cp automysqlbackup $out/bin/
2020 cp automysqlbackup.conf $out/etc/
2121
22− wrapProgram $out/bin/automysqlbackup --prefix PATH : ${stdenv.lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]}
22+ wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]}
2323 '';
2424
2525 meta = with lib; {
pkgs/tools/backup/bacula/default.nix+3−3
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
15− ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
15+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
1616 CoreFoundation
1717 IOKit
1818 ]
1919 # acl relies on attr, which I can't get to build on darwin
20− ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
20+ ++ lib.optional (!stdenv.isDarwin) acl;
2121
2222 configureFlags = [
2323 "--with-sqlite3=${sqlite.dev}"
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 "--with-logdir=/var/log/bacula"
2626 "--with-working-dir=/var/lib/bacula"
2727 "--mandir=\${out}/share/man"
28− ] ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes";
28+ ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes";
2929
3030 installFlags = [
3131 "logdir=\${out}/logdir"
pkgs/tools/backup/bareos/default.nix+1−1
@@ -6,7 +6,7 @@
66
77assert sqlite != null || postgresql != null || libmysqlclient != null;
88
9−with stdenv.lib;
9+with lib;
1010let
1111 withGlusterfs = "\${with_glusterfs_directory}";
1212in
pkgs/tools/backup/borg/default.nix+1−1
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
1515 ];
1616 buildInputs = [
1717 libb2 lz4 zstd openssl python3.pkgs.setuptools_scm
18− ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ];
18+ ] ++ lib.optionals stdenv.isLinux [ acl ];
1919 propagatedBuildInputs = with python3.pkgs; [
2020 cython llfuse
2121 ];
pkgs/tools/backup/btar/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, librsync }:
1+{ lib, stdenv, fetchurl, librsync }:
22
33stdenv.mkDerivation rec {
44 name = "btar-1.1.1";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
1313
1414 meta = {
1515 description = "Tar-compatible block-based archiver";
16− license = stdenv.lib.licenses.gpl3Plus;
16+ license = lib.licenses.gpl3Plus;
1717 homepage = "http://viric.name/cgi-bin/btar";
18− platforms = with stdenv.lib.platforms; all;
19− maintainers = with stdenv.lib.maintainers; [viric];
18+ platforms = with lib.platforms; all;
19+ maintainers = with lib.maintainers; [viric];
2020 };
2121}
pkgs/tools/backup/btrbk/default.nix+1−1
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 preFixup = ''
3939 wrapProgram $out/sbin/btrbk \
4040 --set PERL5LIB $PERL5LIB \
41− --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}"
41+ --prefix PATH ':' "${lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}"
4242 '';
4343
4444 meta = with lib; {
pkgs/tools/backup/bup/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, makeWrapper
1+{ lib, stdenv, fetchFromGitHub, makeWrapper
22, perl, pandoc, python3Packages, git
33, par2cmdline ? null, par2Support ? true
44}:
@@ -7,7 +7,7 @@ assert par2Support -> par2cmdline != null;
77
88let version = "0.31"; in
99
10−with stdenv.lib;
10+with lib;
1111
1212stdenv.mkDerivation {
1313 pname = "bup";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
2424 git
2525 (python3Packages.python.withPackages
2626 (p: with p; [ setuptools tornado ]
27− ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))
27+ ++ lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))
2828 ];
2929 nativeBuildInputs = [ pandoc perl makeWrapper ];
3030
pkgs/tools/backup/bupstash/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
1+{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
22rustPlatform.buildRustPackage rec {
33 pname = "bupstash";
44 version = "0.6.4";
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
2323 installManPage doc/man/*.[1-9]
2424 '';
2525
26− meta = with stdenv.lib; {
26+ meta = with lib; {
2727 description = "Easy and efficient encrypted backups";
2828 homepage = "https://bupstash.io";
2929 license = licenses.mit;
pkgs/tools/backup/burp/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 nativeBuildInputs = [ autoreconfHook pkgconfig ];
1616 buildInputs = [ librsync ncurses openssl zlib uthash ]
17− ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
17+ ++ lib.optional (!stdenv.isDarwin) acl;
1818
1919 configureFlags = [ "--localstatedir=/var" ];
2020
pkgs/tools/backup/chunksync/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, openssl, perl }:
1+{ lib, stdenv, fetchurl, openssl, perl }:
22
33stdenv.mkDerivation rec {
44 version = "0.4";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 meta = {
2727 description = "Space-efficient incremental backups of large files or block devices";
2828 homepage = "http://chunksync.florz.de/";
29− license = stdenv.lib.licenses.gpl2;
30− platforms = with stdenv.lib.platforms; linux;
29+ license = lib.licenses.gpl2;
30+ platforms = with lib.platforms; linux;
3131 };
3232}
pkgs/tools/backup/dar/default.nix+2−2
@@ -1,11 +1,11 @@
1−{ stdenv, fetchurl
1+{ lib, stdenv, fetchurl
22, attr, e2fsprogs
33, curl, librsync, libthreadar
44, gpgme, libgcrypt, openssl
55, bzip2, lzo, xz, zlib
66}:
77
8−with stdenv.lib;
8+with lib;
99
1010stdenv.mkDerivation rec {
1111 version = "2.6.13";
pkgs/tools/backup/dirvish/default.nix+1−1
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
5555 meta = with lib; {
5656 description = "Fast, disk based, rotating network backup system";
5757 homepage = "http://dirvish.org/";
58− license = stdenv.lib.licenses.osl2;
58+ license = lib.licenses.osl2;
5959 platforms = platforms.linux;
6060 maintainers = [ maintainers.winpat ];
6161 };
pkgs/tools/backup/duplicati/default.nix+2−2
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
1919 cp -r * $out/share/${pname}-${version}
2020 makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \
2121 --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \
22− --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
22+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
2323 sqlite ]}
2424 makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \
2525 --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \
26− --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
26+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
2727 sqlite ]}
2828 '';
2929
pkgs/tools/backup/duplicity/default.nix+7−7
@@ -14,8 +14,8 @@
1414, gettext
1515}:
1616let
17− inherit (stdenv.lib.versions) majorMinor splitVersion;
18− majorMinorPatch = v: builtins.concatStringsSep "." (stdenv.lib.take 3 (splitVersion v));
17+ inherit (lib.versions) majorMinor splitVersion;
18+ majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v));
1919in
2020pythonPackages.buildPythonApplication rec {
2121 pname = "duplicity";
@@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec {
3333 # Our Python infrastructure runs test in installCheckPhase so we need
3434 # to make the testing code stop assuming it is run from the source directory.
3535 ./use-installed-scripts-in-test.patch
36− ] ++ stdenv.lib.optionals stdenv.isLinux [
36+ ] ++ lib.optionals stdenv.isLinux [
3737 ./linux-disable-timezone-test.patch
3838 ];
3939
@@ -63,7 +63,7 @@ pythonPackages.buildPythonApplication rec {
6363 pycrypto
6464 pydrive
6565 future
66− ] ++ stdenv.lib.optionals (!isPy3k) [
66+ ] ++ lib.optionals (!isPy3k) [
6767 enum
6868 ];
6969
@@ -72,7 +72,7 @@ pythonPackages.buildPythonApplication rec {
7272 gnutar # Add 'tar' to PATH.
7373 librsync # Add 'rdiff' to PATH.
7474 par2cmdline # Add 'par2' to PATH.
75− ] ++ stdenv.lib.optionals stdenv.isLinux [
75+ ] ++ lib.optionals stdenv.isLinux [
7676 util-linux # Add 'setsid' to PATH.
7777 ] ++ (with pythonPackages; [
7878 lockfile
@@ -84,7 +84,7 @@ pythonPackages.buildPythonApplication rec {
8484
8585 postInstall = ''
8686 wrapProgram $out/bin/duplicity \
87− --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}"
87+ --prefix PATH : "${lib.makeBinPath [ gnupg ncftp rsync ]}"
8888 '';
8989
9090 preCheck = ''
@@ -100,7 +100,7 @@ pythonPackages.buildPythonApplication rec {
100100
101101 # Don't run developer-only checks (pep8, etc.).
102102 export RUN_CODE_TESTS=0
103− '' + stdenv.lib.optionalString stdenv.isDarwin ''
103+ '' + lib.optionalString stdenv.isDarwin ''
104104 # Work around the following error when running tests:
105105 # > Max open files of 256 is too low, should be >= 1024.
106106 # > Use 'ulimit -n 1024' or higher to correct.
pkgs/tools/backup/duply/default.nix+2−2
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 mkdir -p "$out/share/man/man1"
2121 install -vD duply "$out/bin"
2222 wrapProgram "$out/bin/duply" --set PATH \
23− ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]}
23+ ${lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]}
2424 "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1"
2525 '';
2626
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
3535 homepage = "https://duply.net/";
3636 license = licenses.gpl2;
3737 maintainers = [ maintainers.bjornfor ];
38− platforms = stdenv.lib.platforms.unix;
38+ platforms = lib.platforms.unix;
3939 };
4040}
pkgs/tools/backup/httrack/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl";
1010 };
1111
12− buildInputs = [ zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
12+ buildInputs = [ zlib openssl ] ++ lib.optional stdenv.isDarwin libiconv;
1313
1414 enableParallelBuilding = true;
1515
pkgs/tools/backup/luckybackup/default.nix+6−6
@@ -1,9 +1,9 @@
1−{ mkDerivation, stdenv, fetchurl
1+{ mkDerivation, lib, stdenv, fetchurl
22, pkgconfig, libtool, qmake
33, rsync, ssh
44}:
55
6−with stdenv.lib;
6+with lib;
77mkDerivation rec {
88 pname = "luckybackup";
99 version = "0.5.0";
@@ -16,7 +16,7 @@ mkDerivation rec {
1616 buildInputs = [ rsync ssh ];
1717
1818 nativeBuildInputs = [ pkgconfig libtool qmake ];
19−
19+
2020 prePatch = ''
2121 for File in luckybackup.pro menu/luckybackup-pkexec \
2222 menu/luckybackup-su.desktop menu/luckybackup.desktop \
@@ -29,12 +29,12 @@ mkDerivation rec {
2929 meta = {
3030 description = "A powerful, fast and reliable backup & sync tool";
3131 longDescription = ''
32− luckyBackup is an application for data back-up and synchronization
32+ luckyBackup is an application for data back-up and synchronization
3333 powered by the rsync tool.
34−
34+
3535 It is simple to use, fast (transfers over only changes made and not
3636 all data), safe (keeps your data safe by checking all declared directories
37− before proceeding in any data manipulation), reliable and fully
37+ before proceeding in any data manipulation), reliable and fully
3838 customizable.
3939 '';
4040 homepage = "http://luckybackup.sourceforge.net/";
pkgs/tools/backup/monolith/default.nix+3−3
@@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec {
1919
2020 cargoSha256 = "0s5mv8mymycz4ga4zh9kbrhwmhgl4j01pw1sdzxy49l9waryk9p3";
2121
22− nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
23− buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
24− ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
22+ nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
23+ buildInputs = lib.optionals stdenv.isLinux [ openssl ]
24+ ++ lib.optionals stdenv.isDarwin [ Security ];
2525
2626 checkFlagsArray = [ "--skip=tests::cli" ];
2727
pkgs/tools/backup/mt-st/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 name = "mt-st-1.3";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
1616 Fork of the standard "mt" tool with additional Linux-specific IOCTLs.
1717 '';
1818 homepage = "https://github.com/iustin/mt-st";
19− license = stdenv.lib.licenses.gpl2;
20− maintainers = [ stdenv.lib.maintainers.redvers ];
21− platforms = stdenv.lib.platforms.linux;
19+ license = lib.licenses.gpl2;
20+ maintainers = [ lib.maintainers.redvers ];
21+ platforms = lib.platforms.linux;
2222 };
2323}
pkgs/tools/backup/mtx/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 name = "mtx-1.3.12";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
2020 specification.
2121 '';
2222 homepage = "https://sourceforge.net/projects/mtx/";
23− license = stdenv.lib.licenses.gpl2;
24− maintainers = [ stdenv.lib.maintainers.redvers ];
25− platforms = stdenv.lib.platforms.linux;
23+ license = lib.licenses.gpl2;
24+ maintainers = [ lib.maintainers.redvers ];
25+ platforms = lib.platforms.linux;
2626 };
2727}
pkgs/tools/backup/mydumper/default.nix+1−1
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig
22, glib, zlib, pcre, libmysqlclient, libressl }:
33
4−let inherit (stdenv.lib) getDev; in
4+let inherit (lib) getDev; in
55
66stdenv.mkDerivation rec {
77 version = "0.9.5";
pkgs/tools/backup/partclone/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook
22, pkgconfig, libuuid, e2fsprogs, nilfs-utils, ntfs3g
33}:
44
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [ autoreconfHook pkgconfig ];
1717 buildInputs = [
18− e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g
19− (stdenv.lib.getOutput "static" stdenv.cc.libc)
18+ e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g
19+ (lib.getOutput "static" stdenv.cc.libc)
2020 ];
2121
2222 configureFlags = [
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
4343 ext2 partition.
4444 '';
4545 homepage = "https://partclone.org";
46− license = stdenv.lib.licenses.gpl2;
47− maintainers = [stdenv.lib.maintainers.marcweber];
48− platforms = stdenv.lib.platforms.linux;
46+ license = lib.licenses.gpl2;
47+ maintainers = [lib.maintainers.marcweber];
48+ platforms = lib.platforms.linux;
4949 };
5050}
pkgs/tools/backup/partimage/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv
1+{lib, stdenv
22, fetchurl
33, fetchpatch
44, bzip2
@@ -40,8 +40,8 @@ stdenv.mkDerivation {
4040 meta = {
4141 description = "Opensource disk backup software";
4242 homepage = "http://www.partimage.org";
43− license = stdenv.lib.licenses.gpl2;
44− maintainers = [stdenv.lib.maintainers.marcweber];
45− platforms = stdenv.lib.platforms.linux;
43+ license = lib.licenses.gpl2;
44+ maintainers = [lib.maintainers.marcweber];
45+ platforms = lib.platforms.linux;
4646 };
4747}
pkgs/tools/backup/rdedup/default.nix+1−1
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
2121
2222 nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang ];
2323 buildInputs = [ openssl libsodium lzma ]
24− ++ (stdenv.lib.optional stdenv.isDarwin Security);
24+ ++ (lib.optional stdenv.isDarwin Security);
2525
2626 configurePhase = ''
2727 export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
pkgs/tools/backup/rdiff-backup/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, python2Packages, librsync, gnused }:
1+{lib, stdenv, fetchurl, python2Packages, librsync, gnused }:
22
33python2Packages.buildPythonApplication {
44 name = "rdiff-backup-1.3.3";
@@ -17,7 +17,7 @@ python2Packages.buildPythonApplication {
1717 meta = {
1818 description = "Backup system trying to combine best a mirror and an incremental backup system";
1919 homepage = "http://rdiff-backup.nongnu.org/";
20− license = stdenv.lib.licenses.gpl2;
21− platforms = stdenv.lib.platforms.all;
20+ license = lib.licenses.gpl2;
21+ platforms = lib.platforms.all;
2222 };
2323}
pkgs/tools/backup/rdup/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }:
1+{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }:
22
33stdenv.mkDerivation {
44 pname = "rdup";
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
1717 meta = {
1818 description = "The only backup program that doesn't make backups";
1919 homepage = "https://github.com/miekg/rdup";
20− license = stdenv.lib.licenses.gpl3;
21− platforms = stdenv.lib.platforms.linux;
22− maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
20+ license = lib.licenses.gpl3;
21+ platforms = lib.platforms.linux;
22+ maintainers = with lib.maintainers; [ sternenseemann ];
2323 };
2424}
pkgs/tools/backup/rsnapshot/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 meta = with lib; {
2222 description = "A filesystem snapshot utility for making backups of local and remote systems";
2323 homepage = "https://rsnapshot.org/";
24− license = stdenv.lib.licenses.gpl2Plus;
24+ license = lib.licenses.gpl2Plus;
2525 platforms = platforms.linux;
2626 };
2727}
pkgs/tools/backup/stenc/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
44 version = "1.0.7";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
1414 meta = {
1515 description = "SCSI Tape Encryption Manager";
1616 homepage = "https://github.com/scsitape/stenc";
17− license = stdenv.lib.licenses.gpl2;
18− maintainers = with stdenv.lib.maintainers; [ woffs ];
19− platforms = stdenv.lib.platforms.linux;
17+ license = lib.licenses.gpl2;
18+ maintainers = with lib.maintainers; [ woffs ];
19+ platforms = lib.platforms.linux;
2020 };
2121}
pkgs/tools/backup/store-backup/default.nix+5−5
@@ -1,4 +1,4 @@
1−{stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, bzip2}:
1+{lib, stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, bzip2}:
22
33# quick usage:
44# storeBackup.pl --sourceDir /home/user --backupDir /tmp/my_backup_destination
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 for p in $out/bin/*
4242 do wrapProgram "$p" \
4343 --prefix PERL5LIB ":" "${perlPackages.DBFile}/${perlPackages.perl.libPrefix}" \
44− --prefix PATH ":" "${stdenv.lib.makeBinPath [ which bzip2 ]}"
44+ --prefix PATH ":" "${lib.makeBinPath [ which bzip2 ]}"
4545 done
4646
4747 patchShebangs $out
@@ -104,8 +104,8 @@ stdenv.mkDerivation rec {
104104 meta = {
105105 description = "A backup suite that stores files on other disks";
106106 homepage = "https://savannah.nongnu.org/projects/storebackup";
107− license = stdenv.lib.licenses.gpl3Plus;
108− maintainers = [stdenv.lib.maintainers.marcweber];
109− platforms = stdenv.lib.platforms.linux;
107+ license = lib.licenses.gpl3Plus;
108+ maintainers = [lib.maintainers.marcweber];
109+ platforms = lib.platforms.linux;
110110 };
111111}
pkgs/tools/backup/tarsnap/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, openssl, zlib, e2fsprogs }:
1+{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs }:
22
33let
44 zshCompletion = fetchurl {
@@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
2929 install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap
3030 '';
3131
32− buildInputs = [ openssl zlib ] ++ stdenv.lib.optional stdenv.isLinux e2fsprogs ;
32+ buildInputs = [ openssl zlib ] ++ lib.optional stdenv.isLinux e2fsprogs ;
3333
3434 meta = {
3535 description = "Online backups for the truly paranoid";
3636 homepage = "http://www.tarsnap.com/";
37− license = stdenv.lib.licenses.unfree;
38− platforms = stdenv.lib.platforms.unix;
39− maintainers = with stdenv.lib.maintainers; [ thoughtpolice roconnor ];
37+ license = lib.licenses.unfree;
38+ platforms = lib.platforms.unix;
39+ maintainers = with lib.maintainers; [ thoughtpolice roconnor ];
4040 };
4141}
pkgs/tools/backup/wal-e/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python3Packages, lzop, postgresql, pv }:
1+{ lib, stdenv, fetchurl, python3Packages, lzop, postgresql, pv }:
22
33python3Packages.buildPythonApplication rec {
44 pname = "wal-e";
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
2828 description = "A Postgres WAL-shipping disaster recovery and replication toolkit";
2929 homepage = "https://github.com/wal-e/wal-e";
3030 maintainers = [];
31− license = stdenv.lib.licenses.bsd3;
32− platforms = stdenv.lib.platforms.linux;
31+ license = lib.licenses.bsd3;
32+ platforms = lib.platforms.linux;
3333 };
3434}
pkgs/tools/backup/zbackup/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } :
1+{ lib, stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } :
22stdenv.mkDerivation {
33 pname = "zbackup";
44 version = "1.4.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 meta = {
1212 description = "A versatile deduplicating backup tool";
1313 homepage = "http://zbackup.org/";
14− platforms = stdenv.lib.platforms.linux;
15− license = stdenv.lib.licenses.gpl2Plus;
14+ platforms = lib.platforms.linux;
15+ license = lib.licenses.gpl2Plus;
1616 };
1717}
pkgs/tools/bluetooth/bluez-alsa/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
1+{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
22, alsaLib, bluez, glib, sbc, dbus
33
44# optional, but useful utils
@@ -9,7 +9,7 @@
99# TODO: aptxSupport
1010}:
1111
12−with stdenv.lib;
12+with lib;
1313
1414stdenv.mkDerivation rec {
1515 pname = "bluez-alsa";
pkgs/tools/cd-dvd/bchunk/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
1010 };
1111
12− makeFlags = stdenv.lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ];
12+ makeFlags = lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ];
1313
1414 installPhase = ''
1515 install -Dt $out/bin bchunk
pkgs/tools/cd-dvd/cdrkit/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}:
1+{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}:
22
33stdenv.mkDerivation rec {
44 name = "cdrkit-1.1.11";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 '';
4040
4141 homepage = "http://cdrkit.org/";
42− license = stdenv.lib.licenses.gpl2;
43− platforms = stdenv.lib.platforms.linux;
42+ license = lib.licenses.gpl2;
43+ platforms = lib.platforms.linux;
4444 };
4545}
pkgs/tools/cd-dvd/cue2pops/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, stdenv, fetchFromGitHub }:
22
3−with stdenv.lib;
3+with lib;
44stdenv.mkDerivation {
55 pname = "cue2pops";
66 version = "git-2018-01-04";
pkgs/tools/cd-dvd/dvdisaster/default.nix+2−2
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ gettext pkgconfig which ];
1616 buildInputs = [ glib gtk2 ];
1717
18− patches = stdenv.lib.optional enableSoftening [
18+ patches = lib.optional enableSoftening [
1919 ./encryption.patch
2020 ./dvdrom.patch
2121 ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 "--docdir=share/doc"
3434 "--with-nls=yes"
3535 "--with-embedded-src-path=no"
36− ] ++ stdenv.lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes";
36+ ] ++ lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes";
3737
3838 # fatal error: inlined-icons.h: No such file or directory
3939 enableParallelBuilding = false;
pkgs/tools/cd-dvd/uif2iso/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip, zlib }:
1+{ lib, stdenv, fetchurl, unzip, zlib }:
22
33stdenv.mkDerivation rec {
44 nameNoVer = "uif2iso";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "Tool for converting single/multi part UIF image files to ISO";
2020 homepage = "http://aluigi.org/mytoolz.htm#uif2iso";
21− license = stdenv.lib.licenses.gpl1Plus;
22− platforms = stdenv.lib.platforms.linux;
21+ license = lib.licenses.gpl1Plus;
22+ platforms = lib.platforms.linux;
2323 };
2424}
pkgs/tools/cd-dvd/unetbootin/default.nix+1−1
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
5151 install -Dm644 -t $out/share/applications unetbootin.desktop
5252
5353 wrapProgram $out/bin/unetbootin \
54− --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \
54+ --prefix PATH : ${lib.makeBinPath [ mtools p7zip which ]} \
5555 --set QT_X11_NO_MITSHM 1
5656
5757 runHook postInstall
pkgs/tools/cd-dvd/vobcopy/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libdvdread, libdvdcss }:
1+{ lib, stdenv, fetchurl, libdvdread, libdvdcss }:
22
33stdenv.mkDerivation rec {
44 name = "vobcopy-1.2.0";
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
1414 meta = {
1515 description = "Copies DVD .vob files to harddisk, decrypting them on the way";
1616 homepage = "http://vobcopy.org/projects/c/c.shtml";
17− license = stdenv.lib.licenses.gpl2;
17+ license = lib.licenses.gpl2;
1818
19− maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
20− platforms = stdenv.lib.platforms.all;
19+ maintainers = [ lib.maintainers.bluescreen303 ];
20+ platforms = lib.platforms.all;
2121 };
2222}
pkgs/tools/cd-dvd/vobsub2srt/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }:
1+{ lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }:
22
33let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
44 shortRev = builtins.substring 0 7 rev;
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
1919 meta = {
2020 homepage = "https://github.com/ruediger/VobSub2SRT";
2121 description = "Converts VobSub subtitles into SRT subtitles";
22− license = stdenv.lib.licenses.gpl3Plus;
23− platforms = stdenv.lib.platforms.unix;
24− maintainers = [ stdenv.lib.maintainers.ttuegel ];
22+ license = lib.licenses.gpl3Plus;
23+ platforms = lib.platforms.unix;
24+ maintainers = [ lib.maintainers.ttuegel ];
2525 };
2626}
pkgs/tools/cd-dvd/xorriso/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 doCheck = true;
1313
1414 buildInputs = [ libcdio zlib bzip2 readline libiconv ]
15− ++ stdenv.lib.optionals stdenv.isLinux [ acl attr ];
15+ ++ lib.optionals stdenv.isLinux [ acl attr ];
1616
1717 meta = with lib; {
1818 description = "ISO 9660 Rock Ridge file system manipulator";
pkgs/tools/compression/brotli/default.nix+2−2
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 nativeBuildInputs = [ cmake ];
1919
20− patches = stdenv.lib.optional staticOnly (fetchpatch {
20+ patches = lib.optional staticOnly (fetchpatch {
2121 # context from https://github.com/google/brotli/pull/655
2222 # updated patch from https://github.com/google/brotli/pull/655
2323 url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 });
2626
2727 cmakeFlags = []
28− ++ stdenv.lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF";
28+ ++ lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF";
2929
3030 outputs = [ "out" "dev" "lib" ];
3131
pkgs/tools/compression/bsc/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 enableParallelBuilding = true;
1313
14− buildInputs = stdenv.lib.optional stdenv.isDarwin openmp;
14+ buildInputs = lib.optional stdenv.isDarwin openmp;
1515
1616 prePatch = ''
1717 substituteInPlace makefile \
pkgs/tools/compression/bsdiff/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, bzip2 }:
1+{ lib, stdenv, fetchurl, bzip2 }:
22
33stdenv.mkDerivation rec {
44 pname = "bsdiff";
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
3030 meta = {
3131 description = "An efficient binary diff/patch tool";
3232 homepage = "http://www.daemonology.net/bsdiff";
33− license = stdenv.lib.licenses.bsd2;
34− platforms = stdenv.lib.platforms.unix;
35− maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
33+ license = lib.licenses.bsd2;
34+ platforms = lib.platforms.unix;
35+ maintainers = [ lib.maintainers.thoughtpolice ];
3636 };
3737}
pkgs/tools/compression/bzip2/default.nix+1−1
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 outputs = [ "bin" "dev" "out" "man" ];
4141
4242 configureFlags =
43− stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];
43+ lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];
4444
4545 enableParallelBuilding = true;
4646
pkgs/tools/compression/gzip/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, xz
44, writeText
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
5757 is just a bonus.
5858 '';
5959
60− platforms = stdenv.lib.platforms.all;
60+ platforms = lib.platforms.all;
6161
62− license = stdenv.lib.licenses.gpl3Plus;
62+ license = lib.licenses.gpl3Plus;
6363 };
6464}
pkgs/tools/compression/gzrt/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, zlib }:
1+{ lib, stdenv, fetchurl, zlib }:
22
33stdenv.mkDerivation rec {
44 name = "gzrt-0.8";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/";
2020 description = "The gzip Recovery Toolkit";
21− license = stdenv.lib.licenses.gpl2Plus;
22− platforms = stdenv.lib.platforms.unix;
21+ license = lib.licenses.gpl2Plus;
22+ platforms = lib.platforms.unix;
2323 };
2424}
pkgs/tools/compression/hactool/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 mv config.mk.template config.mk
1616 '';
1717
18− makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
18+ makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
1919
2020 installPhase = ''
2121 install -D hactool $out/bin/hactool
pkgs/tools/compression/kzipmix/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation {
44 name = "kzipmix-20091108";
@@ -11,15 +11,15 @@ stdenv.mkDerivation {
1111 installPhase = ''
1212 mkdir -p $out/bin
1313 cp kzip zipmix $out/bin
14−
14+
1515 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip
1616 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix
1717 '';
1818
1919 meta = {
2020 description = "A tool that aggressively optimizes the sizes of Zip archives";
21− license = stdenv.lib.licenses.unfree;
21+ license = lib.licenses.unfree;
2222 homepage = "http://advsys.net/ken/utils.htm";
23− maintainers = [ stdenv.lib.maintainers.sander ];
23+ maintainers = [ lib.maintainers.sander ];
2424 };
2525}
pkgs/tools/compression/lhasa/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation {
44 name = "lhasa-0.3.1";
@@ -13,9 +13,9 @@ stdenv.mkDerivation {
1313 decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for
1414 the tool is a library, so that it can be reused for other purposes.
1515 '';
16− license = stdenv.lib.licenses.isc;
16+ license = lib.licenses.isc;
1717 homepage = "http://fragglet.github.io/lhasa";
18− maintainers = with stdenv.lib; [ maintainers.sander ];
19− platforms = with stdenv.lib.platforms; linux ++ darwin;
18+ maintainers = with lib; [ maintainers.sander ];
19+ platforms = with lib.platforms; linux ++ darwin;
2020 };
2121}
pkgs/tools/compression/lrzip/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}:
1+{lib, stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}:
22
33stdenv.mkDerivation rec {
44 version = "0.631";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
1414 meta = {
1515 homepage = "http://ck.kolivas.org/apps/lrzip/";
1616 description = "The CK LRZIP compression program (LZMA + RZIP)";
17− license = stdenv.lib.licenses.gpl2Plus;
17+ license = lib.licenses.gpl2Plus;
1818 inherit version;
19− platforms = stdenv.lib.platforms.unix;
19+ platforms = lib.platforms.unix;
2020 };
2121}
pkgs/tools/compression/lz4/default.nix+3−3
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 # TODO(@Ericson2314): Separate binaries and libraries
1818 outputs = [ "bin" "out" "dev" ];
1919
20− buildInputs = stdenv.lib.optional doCheck valgrind;
20+ buildInputs = lib.optional doCheck valgrind;
2121
2222 enableParallelBuilding = true;
2323
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 "WINDRES:=${stdenv.cc.bintools.targetPrefix}windres"
3030 ]
3131 # TODO make full dictionary
32− ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW "TARGET_OS=MINGW"
32+ ++ lib.optional stdenv.hostPlatform.isMinGW "TARGET_OS=MINGW"
3333 ;
3434
3535 doCheck = false; # tests take a very long time
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737
3838 # TODO(@Ericson2314): Make resusable setup hook for this issue on Windows.
3939 postInstall =
40− stdenv.lib.optionalString stdenv.hostPlatform.isWindows ''
40+ lib.optionalString stdenv.hostPlatform.isWindows ''
4141 mv $out/bin/*.dll $out/lib
4242 ln -s $out/lib/*.dll
4343 ''
pkgs/tools/compression/lzip/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, texinfo }:
1+{ lib, stdenv, fetchurl, texinfo }:
22
33# Note: this package is used for bootstrapping fetchurl, and thus
44# cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 "CPPFLAGS=-DNDEBUG"
2121 "CFLAGS=-O3"
2222 "CXXFLAGS=-O3"
23− ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
23+ ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
2424 "CXX=${stdenv.cc.targetPrefix}c++";
2525
2626 setupHook = ./lzip-setup-hook.sh;
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 meta = {
3232 homepage = "https://www.nongnu.org/lzip/lzip.html";
3333 description = "A lossless data compressor based on the LZMA algorithm";
34− license = stdenv.lib.licenses.gpl3Plus;
35− platforms = stdenv.lib.platforms.all;
34+ license = lib.licenses.gpl3Plus;
35+ platforms = lib.platforms.all;
3636 };
3737}
pkgs/tools/compression/mozlz4a/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python3, runtimeShell }:
1+{ lib, stdenv, fetchurl, python3, runtimeShell }:
22
33stdenv.mkDerivation rec {
44 pname = "mozlz4a";
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
2626 meta = {
2727 inherit version;
2828 description = "A script to handle Mozilla's mozlz4 files";
29− license = stdenv.lib.licenses.bsd2;
30− maintainers = [stdenv.lib.maintainers.raskin];
31− platforms = stdenv.lib.platforms.linux;
29+ license = lib.licenses.bsd2;
30+ maintainers = [lib.maintainers.raskin];
31+ platforms = lib.platforms.linux;
3232 homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5";
3333 };
3434}
pkgs/tools/compression/ncompress/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
44 name = "ncompress-4.2.4.5";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
1414
1515 meta = {
1616 homepage = "http://ncompress.sourceforge.net/";
17− license = stdenv.lib.licenses.publicDomain;
17+ license = lib.licenses.publicDomain;
1818 description = "A fast, simple LZW file compressor";
19− platforms = stdenv.lib.platforms.unix;
19+ platforms = lib.platforms.unix;
2020 };
2121}
pkgs/tools/compression/pbzip2/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 installFlags = [ "PREFIX=$(out)" ];
2020
21− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal";
21+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal";
2222
2323 meta = with lib; {
2424 homepage = "http://compression.ca/pbzip2/";
pkgs/tools/compression/pigz/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313
1414 enableParallelBuilding = true;
1515
16− buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux util-linux;
16+ buildInputs = [zlib] ++ lib.optional stdenv.isLinux util-linux;
1717
1818 makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ];
1919
pkgs/tools/compression/pixz/default.nix+4−4
@@ -1,5 +1,5 @@
11{
2− stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
2+ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
33 , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl
44 , libarchive, lzma
55}:
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
3030 meta = {
3131 inherit version;
3232 description = ''A parallel compressor/decompressor for xz format'';
33− license = stdenv.lib.licenses.bsd2;
34− maintainers = [stdenv.lib.maintainers.raskin];
35− platforms = stdenv.lib.platforms.unix;
33+ license = lib.licenses.bsd2;
34+ maintainers = [lib.maintainers.raskin];
35+ platforms = lib.platforms.unix;
3636 };
3737}
pkgs/tools/compression/pxz/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, xz, lzma }:
1+{ lib, stdenv, fetchgit, xz, lzma }:
22
33let name = "pxz";
44 version = "4.999.9beta+git";
@@ -32,13 +32,13 @@ stdenv.mkDerivation {
3232
3333 meta = {
3434 homepage = "https://jnovy.fedorapeople.org/pxz/";
35− license = stdenv.lib.licenses.gpl2Plus;
36− maintainers = with stdenv.lib.maintainers; [pashev];
35+ license = lib.licenses.gpl2Plus;
36+ maintainers = with lib.maintainers; [pashev];
3737 description = ''Parallel XZ is a compression utility that takes advantage of
3838 running LZMA compression of different parts of an input file on multiple
3939 cores and processors simultaneously. Its primary goal is to utilize all
4040 resources to speed up compression time with minimal possible influence
4141 on compression ratio'';
42− platforms = with stdenv.lib.platforms; linux;
42+ platforms = with lib.platforms; linux;
4343 };
4444}
pkgs/tools/compression/rzip/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, fetchpatch, bzip2}:
1+{lib, stdenv, fetchurl, fetchpatch, bzip2}:
22
33stdenv.mkDerivation {
44 name = "rzip-2.1";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 meta = {
2020 homepage = "https://rzip.samba.org/";
2121 description = "Compression program";
22− license = stdenv.lib.licenses.gpl2Plus;
23− platforms = stdenv.lib.platforms.unix;
22+ license = lib.licenses.gpl2Plus;
23+ platforms = lib.platforms.unix;
2424 };
2525}
pkgs/tools/compression/xar/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }:
1+{ lib, stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }:
22
33stdenv.mkDerivation rec {
44 version = "1.6.1";
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
3535 of content's rich meta-data.
3636 '';
3737
38− license = stdenv.lib.licenses.bsd3;
39− maintainers = with stdenv.lib.maintainers; [ copumpkin ];
40− platforms = stdenv.lib.platforms.all;
38+ license = lib.licenses.bsd3;
39+ maintainers = with lib.maintainers; [ copumpkin ];
40+ platforms = lib.platforms.all;
4141 };
4242}
pkgs/tools/compression/xdelta/default.nix+1−1
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121
2222 nativeBuildInputs = [ autoreconfHook ];
2323 buildInputs = []
24− ++ stdenv.lib.optionals lzmaSupport [ xz ];
24+ ++ lib.optionals lzmaSupport [ xz ];
2525
2626 postPatch = ''
2727 cd xdelta3
pkgs/tools/compression/xdelta/unstable.nix+1−1
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121
2222 nativeBuildInputs = [ autoreconfHook ];
2323 buildInputs = []
24− ++ stdenv.lib.optionals lzmaSupport [ xz ];
24+ ++ lib.optionals lzmaSupport [ xz ];
2525
2626 postPatch = ''
2727 cd xdelta3
pkgs/tools/compression/xz/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 outputs = [ "bin" "dev" "out" "man" "doc" ];
1919
20− configureFlags = stdenv.lib.optional enableStatic "--disable-shared";
20+ configureFlags = lib.optional enableStatic "--disable-shared";
2121
2222 doCheck = true;
2323
pkgs/tools/compression/zstd/default.nix+6−6
@@ -17,22 +17,22 @@ stdenv.mkDerivation rec {
1717 };
1818
1919 nativeBuildInputs = [ cmake ]
20− ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
21− buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix bash;
20+ ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
21+ buildInputs = lib.optional stdenv.hostPlatform.isUnix bash;
2222
2323 patches = [
2424 ./playtests-darwin.patch
2525 ] # This I didn't upstream because if you use posix threads with MinGW it will
2626 # work fine, and I'm not sure how to write the condition.
27− ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch;
27+ ++ lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch;
2828
29− postPatch = stdenv.lib.optionalString (!static) ''
29+ postPatch = lib.optionalString (!static) ''
3030 substituteInPlace build/cmake/CMakeLists.txt \
3131 --replace 'message(SEND_ERROR "You need to build static library to build tests")' ""
3232 substituteInPlace build/cmake/tests/CMakeLists.txt \
3333 --replace 'libzstd_static' 'libzstd_shared'
3434 sed -i \
35− "1aexport ${stdenv.lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \
35+ "1aexport ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \
3636 tests/playTests.sh
3737 '';
3838
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
6969 '';
7070
7171 outputs = [ "bin" "dev" ]
72− ++ stdenv.lib.optional stdenv.hostPlatform.isUnix "man"
72+ ++ lib.optional stdenv.hostPlatform.isUnix "man"
7373 ++ [ "out" ];
7474
7575 meta = with lib; {
pkgs/tools/compression/zsync/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
44 name = "zsync-0.6.2";
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
1313 meta = {
1414 homepage = "http://zsync.moria.org.uk/";
1515 description = "File distribution system using the rsync algorithm";
16− license = stdenv.lib.licenses.free;
17− maintainers = with stdenv.lib.maintainers; [viric];
18− platforms = with stdenv.lib.platforms; all;
16+ license = lib.licenses.free;
17+ maintainers = with lib.maintainers; [viric];
18+ platforms = with lib.platforms; all;
1919 };
2020}
pkgs/tools/filesystems/archivemount/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, fuse, libarchive }:
1+{ lib, stdenv, fetchurl, pkgconfig, fuse, libarchive }:
22
33let
44 name = "archivemount-0.9.1";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616
1717 meta = {
1818 description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives";
19− license = stdenv.lib.licenses.gpl2;
20− platforms = stdenv.lib.platforms.linux;
19+ license = lib.licenses.gpl2;
20+ platforms = lib.platforms.linux;
2121 };
2222}
pkgs/tools/filesystems/avfs/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, fuse, xz }:
1+{ lib, stdenv, fetchurl, pkgconfig, fuse, xz }:
22
33stdenv.mkDerivation rec {
44 pname = "avfs";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 homepage = "http://avf.sourceforge.net/";
2222 description = "Virtual filesystem that allows browsing of compressed files";
23− platforms = stdenv.lib.platforms.linux;
24− license = stdenv.lib.licenses.gpl2;
23+ platforms = lib.platforms.linux;
24+ license = lib.licenses.gpl2;
2525 };
2626}
pkgs/tools/filesystems/bcachefs-tools/default.nix+2−2
@@ -27,13 +27,13 @@ stdenv.mkDerivation {
2727 buildInputs = [
2828 libuuid libscrypt libsodium keyutils liburcu zlib libaio
2929 zstd lz4 python3Packages.pytest udev valgrind
30− ] ++ stdenv.lib.optional fuseSupport fuse3;
30+ ] ++ lib.optional fuseSupport fuse3;
3131
3232 doCheck = false; # needs bcachefs module loaded on builder
3333 checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ];
3434 checkInputs = [ valgrind ];
3535
36− preCheck = stdenv.lib.optionalString fuseSupport ''
36+ preCheck = lib.optionalString fuseSupport ''
3737 rm tests/test_fuse.py
3838 '';
3939
pkgs/tools/filesystems/bindfs/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fuse, pkgconfig }:
1+{ lib, stdenv, fetchurl, fuse, pkgconfig }:
22
33stdenv.mkDerivation rec {
44 version = "1.14.8";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 description = "A FUSE filesystem for mounting a directory to another location";
2222 homepage = "https://bindfs.org";
23− license = stdenv.lib.licenses.gpl2;
24− maintainers = with stdenv.lib.maintainers; [ lovek323 ];
25− platforms = stdenv.lib.platforms.unix;
23+ license = lib.licenses.gpl2;
24+ maintainers = with lib.maintainers; [ lovek323 ];
25+ platforms = lib.platforms.unix;
2626 };
2727}
pkgs/tools/filesystems/bonnie/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl }:
1+{ lib, stdenv, fetchurl, perl }:
22
33stdenv.mkDerivation rec {
44 name = "bonnie++-1.98";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 meta = {
1515 homepage = "http://www.coker.com.au/bonnie++/";
1616 description = "Hard drive and file system benchmark suite";
17− license = stdenv.lib.licenses.gpl2;
18− platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
17+ license = lib.licenses.gpl2;
18+ platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
1919 };
2020}
pkgs/tools/filesystems/btrfs-progs/default.nix+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs
3030 '';
3131
32− configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace";
32+ configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace";
3333
3434 meta = with lib; {
3535 description = "Utilities for the btrfs filesystem";
pkgs/tools/filesystems/ceph/default.nix+1−1
@@ -36,7 +36,7 @@
3636# We must have one crypto library
3737assert cryptopp != null || (nss != null && nspr != null);
3838
39−with stdenv; with stdenv.lib;
39+with stdenv; with lib;
4040let
4141 shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
4242
pkgs/tools/filesystems/chunkfs/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl, fuse }:
1+{ lib, stdenv, fetchurl, perl, fuse }:
22
33stdenv.mkDerivation rec {
44 version = "0.7";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 meta = {
2525 description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa";
2626 homepage = "http://chunkfs.florz.de/";
27− license = stdenv.lib.licenses.gpl2;
28− platforms = with stdenv.lib.platforms; linux;
27+ license = lib.licenses.gpl2;
28+ platforms = with lib.platforms; linux;
2929 };
3030}
pkgs/tools/filesystems/ciopfs/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, fuse, glib, attr }:
1+{ lib, stdenv, fetchurl, pkgconfig, fuse, glib, attr }:
22
33stdenv.mkDerivation rec {
44 name = "ciopfs-0.4";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 meta = {
1717 homepage = "https://www.brain-dump.org/projects/ciopfs/";
1818 description = "A case-insensitive filesystem layered on top of any other filesystem";
19− license = stdenv.lib.licenses.gpl2;
20− platforms = stdenv.lib.platforms.linux;
19+ license = lib.licenses.gpl2;
20+ platforms = lib.platforms.linux;
2121 };
2222}
pkgs/tools/filesystems/davfs2/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, fetchpatch
44, neon
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 meta = {
4141 homepage = "https://savannah.nongnu.org/projects/davfs2";
4242 description = "Mount WebDAV shares like a typical filesystem";
43− license = stdenv.lib.licenses.gpl3Plus;
43+ license = lib.licenses.gpl3Plus;
4444
4545 longDescription = ''
4646 Web Distributed Authoring and Versioning (WebDAV), an extension to
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
5050 with no built-in support for WebDAV.
5151 '';
5252
53− platforms = stdenv.lib.platforms.linux;
53+ platforms = lib.platforms.linux;
5454 };
5555}
pkgs/tools/filesystems/djmount/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, fuse }:
1+{ lib, stdenv, fetchurl, pkgconfig, fuse }:
22
33stdenv.mkDerivation rec {
44 pname = "djmount";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
1414 meta = {
1515 homepage = "http://djmount.sourceforge.net/";
1616 description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices";
17− platforms = stdenv.lib.platforms.linux;
18− maintainers = [ stdenv.lib.maintainers.jagajaga ];
19− license = stdenv.lib.licenses.gpl2;
17+ platforms = lib.platforms.linux;
18+ maintainers = [ lib.maintainers.jagajaga ];
19+ license = lib.licenses.gpl2;
2020 };
2121}
pkgs/tools/filesystems/dosfstools/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }:
22
33stdenv.mkDerivation rec {
44 pname = "dosfstools";
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook pkgconfig ]
15− ++ stdenv.lib.optional stdenv.isDarwin libiconv;
15+ ++ lib.optional stdenv.isDarwin libiconv;
1616
1717 configureFlags = [ "--enable-compat-symlinks" ];
1818
1919 meta = {
2020 description = "Utilities for creating and checking FAT and VFAT file systems";
2121 homepage = "https://github.com/dosfstools/dosfstools";
22− platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
23− license = stdenv.lib.licenses.gpl3;
22+ platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
23+ license = lib.licenses.gpl3;
2424 };
2525}
pkgs/tools/filesystems/e2tools/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, e2fsprogs }:
1+{ lib, stdenv, fetchurl, pkgconfig, e2fsprogs }:
22
33stdenv.mkDerivation rec {
44 pname = "e2tools";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
1717 meta = {
1818 homepage = "http://home.earthlink.net/~k_sheff/sw/e2tools/";
1919 description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem";
20− license = stdenv.lib.licenses.gpl2;
21− platforms = stdenv.lib.platforms.linux;
22− maintainers = [ stdenv.lib.maintainers.leenaars ];
20+ license = lib.licenses.gpl2;
21+ platforms = lib.platforms.linux;
22+ maintainers = [ lib.maintainers.leenaars ];
2323 };
2424}
pkgs/tools/filesystems/fsfs/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, openssl, fuse}:
1+{lib, stdenv, fetchurl, openssl, fuse}:
22
33throw "It still does not build"
44
@@ -25,6 +25,6 @@ stdenv.mkDerivation {
2525 meta = {
2626 homepage = "http://fsfs.sourceforge.net/";
2727 description = "Secure distributed file system in user space";
28− license = stdenv.lib.licenses.gpl2Plus;
28+ license = lib.licenses.gpl2Plus;
2929 };
3030}
pkgs/tools/filesystems/fuse-7z-ng/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 preConfigure = "./autogen.sh";
1818
19− libs = stdenv.lib.makeLibraryPath [ p7zip ]; # 'cause 7z.so is loaded manually
19+ libs = lib.makeLibraryPath [ p7zip ]; # 'cause 7z.so is loaded manually
2020 postInstall = ''
2121 wrapProgram $out/bin/${pname} --suffix LD_LIBRARY_PATH : "${libs}/p7zip"
2222
pkgs/tools/filesystems/gitfs/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python3Packages }:
1+{ lib, stdenv, fetchFromGitHub, python3Packages }:
22
33python3Packages.buildPythonApplication rec {
44 pname = "gitfs";
@@ -30,8 +30,8 @@ python3Packages.buildPythonApplication rec {
3030 automatically committed to the remote.
3131 '';
3232 homepage = "https://github.com/PressLabs/gitfs";
33− license = stdenv.lib.licenses.asl20;
34− platforms = stdenv.lib.platforms.linux;
35− maintainers = [ stdenv.lib.maintainers.robbinch ];
33+ license = lib.licenses.asl20;
34+ platforms = lib.platforms.linux;
35+ maintainers = [ lib.maintainers.robbinch ];
3636 };
3737}
pkgs/tools/filesystems/glusterfs/default.nix+1−1
@@ -111,7 +111,7 @@ in stdenv.mkDerivation rec {
111111 # It also invokes executable Python scripts in `$out/libexec/glusterfs`, which is why we set up PYTHONPATH accordingly.
112112 # We set up the paths for the main entry point executables.
113113
114− GLUSTER_PATH="${stdenv.lib.makeBinPath runtimePATHdeps}:$out/bin"
114+ GLUSTER_PATH="${lib.makeBinPath runtimePATHdeps}:$out/bin"
115115 GLUSTER_PYTHONPATH="$(toPythonPath $out):$out/libexec/glusterfs"
116116 GLUSTER_LD_LIBRARY_PATH="$out/lib"
117117
pkgs/tools/filesystems/hfsprogs/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, openssl, libbsd }:
1+{ lib, stdenv, fetchurl, openssl, libbsd }:
22
33let version = "332.25";
44 package_name = "hfsprogs"; in
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
4343
4444 meta = {
4545 description = "HFS/HFS+ user space utils";
46− license = stdenv.lib.licenses.apsl20;
47− platforms = stdenv.lib.platforms.linux;
46+ license = lib.licenses.apsl20;
47+ platforms = lib.platforms.linux;
4848 };
4949}
pkgs/tools/filesystems/httpfs/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, fuse, openssl, asciidoc
1+{ fetchurl, lib, stdenv, pkgconfig, fuse, openssl, asciidoc
22, docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }:
33
44stdenv.mkDerivation rec {
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
2727
2828 homepage = "http://httpfs.sourceforge.net/";
2929
30− license = stdenv.lib.licenses.gpl2Plus;
30+ license = lib.licenses.gpl2Plus;
3131
32− platforms = stdenv.lib.platforms.linux;
32+ platforms = lib.platforms.linux;
3333 maintainers = [ ];
3434 };
3535}
pkgs/tools/filesystems/irods/common.nix+3−3
@@ -48,8 +48,8 @@ with stdenv;
4848 testing on supported platforms; plug-in support for microservices, storage resources,
4949 drivers, and databases; and extensive documentation, training and support services.'';
5050 homepage = "https://irods.org";
51− license = stdenv.lib.licenses.bsd3;
52− maintainers = [ stdenv.lib.maintainers.bzizou ];
53− platforms = stdenv.lib.platforms.linux;
51+ license = lib.licenses.bsd3;
52+ maintainers = [ lib.maintainers.bzizou ];
53+ platforms = lib.platforms.linux;
5454 };
5555}
pkgs/tools/filesystems/mergerfs/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }:
1+{ lib, stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }:
22
33stdenv.mkDerivation rec {
44 pname = "mergerfs";
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
3434 meta = {
3535 description = "A FUSE based union filesystem";
3636 homepage = "https://github.com/trapexit/mergerfs";
37− license = stdenv.lib.licenses.isc;
38− platforms = stdenv.lib.platforms.linux;
39− maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ];
37+ license = lib.licenses.isc;
38+ platforms = lib.platforms.linux;
39+ maintainers = with lib.maintainers; [ jfrankenau makefu ];
4040 };
4141}
pkgs/tools/filesystems/mergerfs/tools.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 "PREFIX=${placeholder "out"}"
2121 ];
2222
23− postInstall = with stdenv.lib; ''
23+ postInstall = with lib; ''
2424 wrapProgram $out/bin/mergerfs.balance --prefix PATH : ${makeBinPath [ rsync ]}
2525 wrapProgram $out/bin/mergerfs.dup --prefix PATH : ${makeBinPath [ rsync ]}
2626 wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ pythonPackages.xattr ]}
pkgs/tools/filesystems/mhddfs/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fuse, pkgconfig, attr, uthash }:
1+{ lib, stdenv, fetchurl, fuse, pkgconfig, attr, uthash }:
22
33stdenv.mkDerivation rec {
44 pname = "mhddfs";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 meta = {
3030 homepage = "http://mhddfs.uvw.ru/";
3131 description = "Combines a several mount points into the single one";
32− license = stdenv.lib.licenses.gpl3;
33− maintainers = [ stdenv.lib.maintainers.makefu ];
32+ license = lib.licenses.gpl3;
33+ maintainers = [ lib.maintainers.makefu ];
3434 };
3535}
pkgs/tools/filesystems/mtdutils/default.nix+7−7
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmocka, acl, libuuid, lzo, zlib, zstd }:
1+{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, cmocka, acl, libuuid, lzo, zlib, zstd }:
22
33stdenv.mkDerivation rec {
44 pname = "mtd-utils";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
99 sha256 = "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd";
1010 };
1111
12− nativeBuildInputs = [ autoreconfHook pkgconfig ] ++ stdenv.lib.optional doCheck cmocka;
12+ nativeBuildInputs = [ autoreconfHook pkgconfig ] ++ lib.optional doCheck cmocka;
1313 buildInputs = [ acl libuuid lzo zlib zstd ];
1414
1515 configureFlags = [
16− (stdenv.lib.enableFeature doCheck "unit-tests")
17− (stdenv.lib.enableFeature doCheck "tests")
16+ (lib.enableFeature doCheck "unit-tests")
17+ (lib.enableFeature doCheck "tests")
1818 ];
1919 enableParallelBuilding = true;
2020
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
2222
2323 meta = {
2424 description = "Tools for MTD filesystems";
25− license = stdenv.lib.licenses.gpl2Plus;
25+ license = lib.licenses.gpl2Plus;
2626 homepage = "http://www.linux-mtd.infradead.org/";
27− maintainers = with stdenv.lib.maintainers; [ viric ];
28− platforms = with stdenv.lib.platforms; linux;
27+ maintainers = with lib.maintainers; [ viric ];
28+ platforms = with lib.platforms; linux;
2929 };
3030}
pkgs/tools/filesystems/mtools/default.nix+2−2
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
99 sha256 = "06pabnjc4r2vv3dzfm6q97g6jbp2k5bhmcdwv2cf25ka8y5ir7sk";
1010 };
1111
12− patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
12+ patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
1313
1414 # fails to find X on darwin
15− configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x";
15+ configureFlags = lib.optional stdenv.isDarwin "--without-x";
1616
1717 doCheck = true;
1818
pkgs/tools/filesystems/netatalk/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python
1+{ fetchurl, lib, stdenv, autoreconfHook, pkgconfig, perl, python
22, db, libgcrypt, avahi, libiconv, pam, openssl, acl
33, ed, libtirpc, libevent
44}:
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
5454 meta = {
5555 description = "Apple Filing Protocol Server";
5656 homepage = "http://netatalk.sourceforge.net/";
57− license = stdenv.lib.licenses.gpl3;
58− platforms = stdenv.lib.platforms.linux;
59− maintainers = with stdenv.lib.maintainers; [ jcumming ];
57+ license = lib.licenses.gpl3;
58+ platforms = lib.platforms.linux;
59+ maintainers = with lib.maintainers; [ jcumming ];
6060 };
6161}
pkgs/tools/filesystems/nilfs-utils/default.nix+1−1
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
3737
3838 configureFlags = [
3939 "--with-libmount"
40− ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
40+ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
4141 # AC_FUNC_MALLOC is broken on cross builds.
4242 "ac_cv_func_malloc_0_nonnull=yes"
4343 "ac_cv_func_realloc_0_nonnull=yes"
pkgs/tools/filesystems/nixpart/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, buildPythonApplication, blivet }:
1+{ lib, stdenv, fetchurl, buildPythonApplication, blivet }:
22
33buildPythonApplication rec {
44 pname = "nixpart";
@@ -13,8 +13,8 @@ buildPythonApplication rec {
1313
1414 meta = {
1515 description = "NixOS storage manager/partitioner";
16− license = stdenv.lib.licenses.gpl2Plus;
17− maintainers = [ stdenv.lib.maintainers.aszlig ];
18− platforms = stdenv.lib.platforms.linux;
16+ license = lib.licenses.gpl2Plus;
17+ maintainers = [ lib.maintainers.aszlig ];
18+ platforms = lib.platforms.linux;
1919 };
2020}
pkgs/tools/filesystems/ntfs-3g/default.nix+2−2
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
77
88 outputs = [ "out" "dev" "man" "doc" ];
99
10− buildInputs = [ libuuid ] ++ stdenv.lib.optionals crypto [ gnutls libgcrypt ];
11− nativeBuildInputs = stdenv.lib.optional crypto pkgconfig;
10+ buildInputs = [ libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ];
11+ nativeBuildInputs = lib.optional crypto pkgconfig;
1212
1313 src = fetchurl {
1414 url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
pkgs/tools/filesystems/orangefs/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 "--sysconfdir=/etc/orangefs"
3333 "--enable-shared"
3434 "--enable-fast"
35− "--with-ssl=${stdenv.lib.getDev openssl}"
35+ "--with-ssl=${lib.getDev openssl}"
3636 ];
3737
3838
pkgs/tools/filesystems/rdfind/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 meta = with lib; {
1515 homepage = "https://rdfind.pauldreik.se/";
1616 description = "Removes or hardlinks duplicate files very swiftly";
17− license = stdenv.lib.licenses.gpl2;
17+ license = lib.licenses.gpl2;
1818 maintainers = [ maintainers.wmertens ];
1919 platforms = platforms.all;
2020 };
pkgs/tools/filesystems/reiserfsprogs/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libuuid, autoreconfHook }:
1+{ lib, stdenv, fetchurl, libuuid, autoreconfHook }:
22
33let version = "3.6.24"; in
44stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 inherit version;
2121 homepage = "http://www.namesys.com/";
2222 description = "ReiserFS utilities";
23− license = stdenv.lib.licenses.gpl2;
24− platforms = stdenv.lib.platforms.linux;
23+ license = lib.licenses.gpl2;
24+ platforms = lib.platforms.linux;
2525 };
2626}
pkgs/tools/filesystems/rmount/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 install -D ${src}/rmount.bash $out/bin/rmount
2020 install -D ${src}/config.json $out/share/config.json
2121
22− wrapProgram $out/bin/rmount --prefix PATH : ${stdenv.lib.makeBinPath [ nmap jq cifs-utils sshfs ]}
22+ wrapProgram $out/bin/rmount --prefix PATH : ${lib.makeBinPath [ nmap jq cifs-utils sshfs ]}
2323 '';
2424
2525 meta = with lib; {
pkgs/tools/filesystems/s3fs/default.nix+2−2
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 buildInputs = [ curl openssl libxml2 ]
15− ++ stdenv.lib.optionals stdenv.isLinux [ fuse ]
16− ++ stdenv.lib.optionals stdenv.isDarwin [ osxfuse ];
15+ ++ lib.optionals stdenv.isLinux [ fuse ]
16+ ++ lib.optionals stdenv.isDarwin [ osxfuse ];
1717 nativeBuildInputs = [ autoreconfHook pkgconfig ];
1818
1919 configureFlags = [
pkgs/tools/filesystems/sasquatch/default.nix+2−2
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 };
3030
3131 buildInputs = [ lzma lzo xz zlib ]
32− ++ stdenv.lib.optional lz4Support lz4;
32+ ++ lib.optional lz4Support lz4;
3333
3434 patches = [ patch ];
3535 patchFlags = [ "-p0" ];
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 installFlags = [ "INSTALL_DIR=\${out}/bin" ];
4242
4343 makeFlags = [ "XZ_SUPPORT=1" ]
44− ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";
44+ ++ lib.optional lz4Support "LZ4_SUPPORT=1";
4545
4646 meta = with lib; {
4747 homepage = "https://github.com/devttys0/sasquatch";
pkgs/tools/filesystems/snapraid/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "snapraid";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121 meta = {
2222 homepage = "http://www.snapraid.it/";
2323 description = "A backup program for disk arrays";
24− license = stdenv.lib.licenses.gpl3;
25− maintainers = [ stdenv.lib.maintainers.makefu ];
26− platforms = stdenv.lib.platforms.unix;
24+ license = lib.licenses.gpl3;
25+ maintainers = [ lib.maintainers.makefu ];
26+ platforms = lib.platforms.unix;
2727 };
2828}
pkgs/tools/filesystems/squashfs/default.nix+7−7
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, zlib, xz
1+{ lib, stdenv, fetchFromGitHub, zlib, xz
22, lz4 ? null
33, lz4Support ? false
44, zstd
@@ -22,23 +22,23 @@ stdenv.mkDerivation {
2222 # This patch adds an option to pad filesystems (increasing size) in
2323 # exchange for better chunking / binary diff calculation.
2424 ./4k-align.patch
25− ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
25+ ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
2626
2727 buildInputs = [ zlib xz zstd ]
28− ++ stdenv.lib.optional lz4Support lz4;
28+ ++ lib.optional lz4Support lz4;
2929
3030 preBuild = "cd squashfs-tools";
3131
3232 installFlags = [ "INSTALL_DIR=\${out}/bin" ];
3333
3434 makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" ]
35− ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";
35+ ++ lib.optional lz4Support "LZ4_SUPPORT=1";
3636
3737 meta = {
3838 homepage = "http://squashfs.sourceforge.net/";
3939 description = "Tool for creating and unpacking squashfs filesystems";
40− platforms = stdenv.lib.platforms.unix;
41− license = stdenv.lib.licenses.gpl2Plus;
42− maintainers = with stdenv.lib.maintainers; [ ruuda ];
40+ platforms = lib.platforms.unix;
41+ license = lib.licenses.gpl2Plus;
42+ maintainers = with lib.maintainers; [ ruuda ];
4343 };
4444}
pkgs/tools/filesystems/squashfuse/default.nix+2−2
@@ -1,7 +1,7 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse,
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse,
22 pkgconfig, lz4, xz, zlib, lzo, zstd }:
33
4−with stdenv.lib;
4+with lib;
55
66stdenv.mkDerivation rec {
77
pkgs/tools/filesystems/sshfs-fuse/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 buildInputs = [ fuse3 glib ];
2121 checkInputs = [ which python3Packages.pytest ];
2222
23− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString
23+ NIX_CFLAGS_COMPILE = lib.optionalString
2424 (stdenv.hostPlatform.system == "i686-linux")
2525 "-D_FILE_OFFSET_BITS=64";
2626
pkgs/tools/filesystems/svnfs/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, automake, autoconf, subversion, fuse, apr, perl }:
1+{ lib, stdenv, fetchurl, automake, autoconf, subversion, fuse, apr, perl }:
22
33stdenv.mkDerivation {
44 name = "svnfs-0.4";
@@ -21,8 +21,8 @@ stdenv.mkDerivation {
2121 meta = {
2222 description = "FUSE filesystem for accessing Subversion repositories";
2323 homepage = "http://www.jmadden.eu/index.php/svnfs/";
24− license = stdenv.lib.licenses.gpl2;
25− maintainers = [stdenv.lib.maintainers.marcweber];
26− platforms = stdenv.lib.platforms.linux;
24+ license = lib.licenses.gpl2;
25+ maintainers = [lib.maintainers.marcweber];
26+ platforms = lib.platforms.linux;
2727 };
2828}
pkgs/tools/filesystems/yandex-disk/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }:
1+{ lib, stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }:
22
33let
44 p = if stdenv.is64bit then {
@@ -49,9 +49,9 @@ stdenv.mkDerivation rec {
4949 meta = {
5050 homepage = "https://help.yandex.com/disk/cli-clients.xml";
5151 description = "A free cloud file storage service";
52− maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ];
52+ maintainers = with lib.maintainers; [ smironov jagajaga ];
5353 platforms = ["i686-linux" "x86_64-linux"];
54− license = stdenv.lib.licenses.unfree;
54+ license = lib.licenses.unfree;
5555 longDescription = ''
5656 Yandex.Disk console client for Linux lets you manage files on Disk without
5757 using a window interface or programs that support WebDAV. The advantages
pkgs/tools/filesystems/zerofree/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, e2fsprogs }:
1+{ lib, stdenv, fetchurl, e2fsprogs }:
22
33stdenv.mkDerivation rec {
44 pname = "zerofree";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919 meta = {
2020 homepage = "https://frippery.org/uml/";
2121 description = "Zero free blocks from ext2, ext3 and ext4 file-systems";
22− platforms = stdenv.lib.platforms.linux;
23− license = stdenv.lib.licenses.gpl2;
24− maintainers = [ stdenv.lib.maintainers.theuni ];
22+ platforms = lib.platforms.linux;
23+ license = lib.licenses.gpl2;
24+ maintainers = [ lib.maintainers.theuni ];
2525 };
2626}
pkgs/tools/graphics/asymptote/default.nix+3−3
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 };
2121
2222 patches =
23− (stdenv.lib.optional (stdenv.lib.versionOlder version "2.68")
23+ (lib.optional (stdenv.lib.versionOlder version "2.68")
2424 (fetchpatch {
2525 url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch";
2626 sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm";
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
4747
4848 propagatedBuildInputs = [
4949 glm
50− ] ++ stdenv.lib.optionals stdenv.isLinux [
50+ ] ++ lib.optionals stdenv.isLinux [
5151 freeglut libGLU libGL mesa.osmesa
52− ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
52+ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
5353 OpenGL GLUT Cocoa
5454 ]);
5555
pkgs/tools/graphics/briss/default.nix+3−3
@@ -1,6 +1,6 @@
11# The releases of this project are apparently precompiled to .jar files.
22
3−{ stdenv, fetchurl, jre, makeWrapper }:
3+{ lib, stdenv, fetchurl, jre, makeWrapper }:
44
55let
66
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
2727 meta = {
2828 homepage = "https://sourceforge.net/projects/briss/";
2929 description = "Java application for cropping PDF files";
30− license = stdenv.lib.licenses.gpl3;
31− platforms = stdenv.lib.platforms.unix;
30+ license = lib.licenses.gpl3;
31+ platforms = lib.platforms.unix;
3232 };
3333}
pkgs/tools/graphics/convchain/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, mono}:
1+{lib, stdenv, fetchFromGitHub, mono}:
22stdenv.mkDerivation rec {
33 pname = "convchain";
44 version = "0.0pre20160901";
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
3333 meta = {
3434 inherit version;
3535 description = ''Bitmap generation from a single example with convolutions and MCMC'';
36− license = stdenv.lib.licenses.mit;
37− maintainers = [stdenv.lib.maintainers.raskin];
38− platforms = stdenv.lib.platforms.linux;
36+ license = lib.licenses.mit;
37+ maintainers = [lib.maintainers.raskin];
38+ platforms = lib.platforms.linux;
3939 };
4040}
pkgs/tools/graphics/dcraw/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }:
1+{lib, stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }:
22
33stdenv.mkDerivation rec {
44 name = "dcraw-9.28.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418";
99 };
1010
11− nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
11+ nativeBuildInputs = lib.optional stdenv.isDarwin libiconv;
1212 buildInputs = [ libjpeg lcms2 gettext ];
1313
1414 # Jasper is disabled because the library is abandoned and has many
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828 meta = {
2929 homepage = "https://www.dechifro.org/dcraw/";
3030 description = "Decoder for many camera raw picture formats";
31− license = stdenv.lib.licenses.free;
32− platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
31+ license = lib.licenses.free;
32+ platforms = lib.platforms.unix; # Once had cygwin problems
3333 maintainers = [ ];
3434 knownVulnerabilities = [
3535 "CVE-2018-19655"
pkgs/tools/graphics/diagrams-builder/default.nix+2−2
@@ -10,7 +10,7 @@
1010 ~~~
1111*/
1212
13−{ stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }:
13+{ lib, stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }:
1414
1515let
1616
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
3535
3636 buildInputs = [ makeWrapper ];
3737
38− buildCommand = with stdenv.lib;
38+ buildCommand = with lib;
3939 concatStrings (intersperse "\n" (map exeWrapper backends));
4040
4141 # Will be faster to build the wrapper locally then to fetch it from a binary cache.
pkgs/tools/graphics/dmtx-utils/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libdmtx, pkgconfig, imagemagick}:
1+{lib, stdenv, fetchurl, libdmtx, pkgconfig, imagemagick}:
22let
33 s = # Generated upstream information
44 rec {
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
2323 meta = {
2424 inherit (s) version;
2525 description = "Data matrix command-line utilities";
26− license = stdenv.lib.licenses.lgpl2 ;
27− maintainers = [stdenv.lib.maintainers.raskin];
28− platforms = stdenv.lib.platforms.unix;
26+ license = lib.licenses.lgpl2 ;
27+ maintainers = [lib.maintainers.raskin];
28+ platforms = lib.platforms.unix;
2929 };
3030}
pkgs/tools/graphics/exiftags/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation {
44 name = "exiftags-1.01";
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
1919 meta = {
2020 homepage = "http://johnst.org/sw/exiftags/";
2121 description = "Displays EXIF data from JPEG files";
22− license = stdenv.lib.licenses.free;
23− maintainers = with stdenv.lib.maintainers; [viric];
24− platforms = with stdenv.lib.platforms; unix;
22+ license = lib.licenses.free;
23+ maintainers = with lib.maintainers; [viric];
24+ platforms = with lib.platforms; unix;
2525 };
2626}
pkgs/tools/graphics/fgallery/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 wrapProgram "$out/share/fgallery/fgallery" \
3434 --set PERL5LIB "$PERL5LIB" \
35− --set PATH "${stdenv.lib.makeBinPath
35+ --set PATH "${lib.makeBinPath
3636 [ coreutils zip imagemagick pngcrush lcms2 facedetect fbida ]}"
3737 '';
3838
pkgs/tools/graphics/flam3/default.nix+1−1
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "flam3";
5− version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}";
5+ version = "3.1.1-${lib.strings.substring 0 7 rev}";
66 rev = "e0801543538451234d7a8a240ba3b417cbda5b21";
77
88 src = fetchFromGitHub {
pkgs/tools/graphics/gifsicle/default.nix+4−4
@@ -1,9 +1,9 @@
1−{ stdenv, fetchurl, xorgproto, libXt, libX11
1+{ lib, stdenv, fetchurl, xorgproto, libXt, libX11
22, gifview ? false
33, static ? stdenv.hostPlatform.isStatic
44}:
55
6−with stdenv.lib;
6+with lib;
77
88stdenv.mkDerivation rec {
99 pname = "gifsicle";
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828 meta = {
2929 description = "Command-line tool for creating, editing, and getting information about GIF images and animations";
3030 homepage = "https://www.lcdf.org/gifsicle/";
31− license = stdenv.lib.licenses.gpl2;
31+ license = lib.licenses.gpl2;
3232 platforms = platforms.all;
33− maintainers = with stdenv.lib.maintainers; [ zimbatm ];
33+ maintainers = with lib.maintainers; [ zimbatm ];
3434 };
3535}
pkgs/tools/graphics/glee/default.nix+1−1
@@ -3,7 +3,7 @@
33stdenv.mkDerivation rec {
44 pname = "glee";
55 rev = "f727ec7463d514b6279981d12833f2e11d62b33d";
6− version = "20170205-${stdenv.lib.strings.substring 0 7 rev}";
6+ version = "20170205-${lib.strings.substring 0 7 rev}";
77
88 src = fetchgit {
99 inherit rev;
pkgs/tools/graphics/graphviz/base.nix+5−5
@@ -7,7 +7,7 @@
77assert stdenv.isDarwin -> ApplicationServices != null;
88
99let
10− inherit (stdenv.lib) optional optionals optionalString;
10+ inherit (lib) optional optionals optionalString;
1111 raw_patch =
1212 # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196
1313 fetchpatch {
@@ -17,13 +17,13 @@ let
1717 excludes = ["tests/*"]; # we don't run them and they don't apply
1818 };
1919 # the patch needs a small adaption for older versions
20− patchToUse = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else
20+ patchToUse = if lib.versionAtLeast version "2.37" then raw_patch else
2121 stdenv.mkDerivation {
2222 inherit (raw_patch) name;
2323 buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out";
2424 };
2525 # 2.42 has the patch included
26− patches = optional (stdenv.lib.versionOlder version "2.42") patchToUse;
26+ patches = optional (lib.versionOlder version "2.42") patchToUse;
2727in
2828
2929stdenv.mkDerivation {
@@ -46,13 +46,13 @@ stdenv.mkDerivation {
4646
4747 hardeningDisable = [ "fortify" ];
4848
49− CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin)
49+ CPPFLAGS = lib.optionalString (xorg != null && stdenv.isDarwin)
5050 "-I${cairo.dev}/include/cairo";
5151
5252 configureFlags = [
5353 "--with-ltdl-lib=${libtool.lib}/lib"
5454 "--with-ltdl-include=${libtool}/include"
55− ] ++ stdenv.lib.optional (xorg == null) "--without-x";
55+ ] ++ lib.optional (xorg == null) "--without-x";
5656
5757 inherit patches;
5858
pkgs/tools/graphics/guff/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
44 pname = "guff";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 doCheck = true;
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 description = "A plot device";
2020 homepage = "https://github.com/silentbicycle/guff";
2121 license = licenses.isc;
pkgs/tools/graphics/icoutils/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }:
1+{ lib, stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 name = "icoutils-0.32.3";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 meta = {
2727 homepage = "https://www.nongnu.org/icoutils/";
2828 description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files";
29− license = stdenv.lib.licenses.gpl3Plus;
30− platforms = with stdenv.lib.platforms; linux ++ darwin;
29+ license = lib.licenses.gpl3Plus;
30+ platforms = with lib.platforms; linux ++ darwin;
3131 };
3232}
pkgs/tools/graphics/imgur-screenshot/default.nix+1−1
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, jq, gnugrep, libnotify, scrot, which, xclip }:
22
3−let deps = stdenv.lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ];
3+let deps = lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ];
44in stdenv.mkDerivation rec {
55 version = "2.0.0";
66 pname = "imgur-screenshot";
pkgs/tools/graphics/imgurbash2/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 mkdir -p $out/bin
1616 cat <<EOF >$out/bin/imgurbash2
1717 #!${bash}/bin/bash
18− PATH=${stdenv.lib.makeBinPath [curl xsel]}:\$PATH
18+ PATH=${lib.makeBinPath [curl xsel]}:\$PATH
1919 EOF
2020 cat imgurbash2 >> $out/bin/imgurbash2
2121 chmod +x $out/bin/imgurbash2
pkgs/tools/graphics/jbig2enc/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
1+{ lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
22
33stdenv.mkDerivation {
44 name = "jbig2enc-0.28";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
2626
2727 meta = {
2828 description = "Encoder for the JBIG2 image compression format";
29− license = stdenv.lib.licenses.asl20;
30− platforms = stdenv.lib.platforms.all;
29+ license = lib.licenses.asl20;
30+ platforms = lib.platforms.all;
3131 };
3232}
pkgs/tools/graphics/ldgallery/compiler/default.nix+3−3
@@ -1,7 +1,7 @@
11# generated with cabal2nix by ./generate.sh
22{ mkDerivation, aeson, base, cmdargs, containers, data-ordlist
33, directory, fetchgit, filepath, Glob, hpack, parallel-io, process
4−, safe, stdenv, text, time, yaml
4+, safe, lib, stdenv, text, time, yaml
55}:
66mkDerivation {
77 pname = "ldgallery-compiler";
@@ -32,6 +32,6 @@ mkDerivation {
3232 prePatch = "hpack";
3333 homepage = "https://ldgallery.pacien.org";
3434 description = "A static generator which turns a collection of tagged pictures into a searchable web gallery";
35− license = stdenv.lib.licenses.agpl3;
36− maintainers = with stdenv.lib.maintainers; [ pacien ];
35+ license = lib.licenses.agpl3;
36+ maintainers = with lib.maintainers; [ pacien ];
3737}
pkgs/tools/graphics/leela/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, poppler }:
1+{ lib, stdenv, fetchFromGitHub, pkgconfig, poppler }:
22
33stdenv.mkDerivation {
44 name = "leela-12.fe7a35a";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
1818 meta = {
1919 description = "CLI frontend to the poppler-glib libary of PDF tools";
2020 homepage = "https://github.com/TrilbyWhite/Leela";
21− license = stdenv.lib.licenses.gpl3;
22− maintainers = [ stdenv.lib.maintainers.puffnfresh ];
23− platforms = stdenv.lib.platforms.linux;
21+ license = lib.licenses.gpl3;
22+ maintainers = [ lib.maintainers.puffnfresh ];
23+ platforms = lib.platforms.linux;
2424 };
2525}
pkgs/tools/graphics/lepton/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [ cmake git ];
15− buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ];
15+ buildInputs = lib.optionals stdenv.isLinux [ glibc.static ];
1616
1717 meta = with lib; {
1818 homepage = "https://github.com/dropbox/lepton";
pkgs/tools/graphics/lprof/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }:
1+{ lib, stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }:
22
33/* how to calibrate your monitor:
44 Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
3131 meta = {
3232 description = "Little CMS ICC profile construction set";
3333 homepage = "https://sourceforge.net/projects/lprof";
34− license = stdenv.lib.licenses.gpl2;
35− platforms = stdenv.lib.platforms.linux;
34+ license = lib.licenses.gpl2;
35+ platforms = lib.platforms.linux;
3636 };
3737}
pkgs/tools/graphics/luxcorerender/default.nix+4−4
@@ -41,8 +41,8 @@ in stdenv.mkDerivation {
4141 gsettings-desktop-schemas glib gtk3
4242 # needed for XDG_ICON_DIRS
4343 gnome3.adwaita-icon-theme
44− (stdenv.lib.getLib dconf)
45− ] ++ stdenv.lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ];
44+ (lib.getLib dconf)
45+ ] ++ lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ];
4646
4747 cmakeFlags = [
4848 "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
5454 "-DEMBREE_INCLUDE_PATH=${embree2}/include"
5555 "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so"
5656 "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so"
57− ] ++ stdenv.lib.optional withOpenCL
57+ ] ++ lib.optional withOpenCL
5858 "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include";
5959
6060 preConfigure = ''
@@ -73,7 +73,7 @@ in stdenv.mkDerivation {
7373 wrapProgram "$out/bin/luxcoreui" \
7474 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
7575 --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \
76− --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
76+ --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
7777 '';
7878
7979 meta = with lib; {
pkgs/tools/graphics/maim/default.nix+2−2
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
3030 supposed to be an improved scrot.
3131 '';
3232 changelog = "https://github.com/naelstrof/maim/releases/tag/v${version}";
33− platforms = stdenv.lib.platforms.all;
34− license = stdenv.lib.licenses.gpl3Plus;
33+ platforms = lib.platforms.all;
34+ license = lib.licenses.gpl3Plus;
3535 maintainers = with maintainers; [ primeos mbakke ];
3636 };
3737}
pkgs/tools/graphics/mscgen/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, bison
33, fetchurl
44, flex
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
3636 meta = {
3737 homepage = "http://www.mcternan.me.uk/mscgen/";
3838 description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";
39− license = stdenv.lib.licenses.gpl2;
39+ license = lib.licenses.gpl2;
4040
4141 longDescription = ''
4242 Mscgen is a small program that parses Message Sequence Chart
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
5151 printing.
5252 '';
5353
54− platforms = stdenv.lib.platforms.unix;
55− maintainers = [ stdenv.lib.maintainers.peti ];
54+ platforms = lib.platforms.unix;
55+ maintainers = [ lib.maintainers.peti ];
5656 };
5757}
pkgs/tools/graphics/netpbm/default.nix+5−5
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
5151 enableParallelBuilding = true;
5252
5353 # Environment variables
54− STRIPPROG = "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip";
54+ STRIPPROG = "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip";
5555
5656 postPatch = ''
5757 # Install libnetpbm.so symlink to correct destination
@@ -68,12 +68,12 @@ stdenv.mkDerivation {
6868 echo "STATICLIB_TOO = N" >> config.mk
6969
7070 # Enable cross-compilation
71− echo 'AR = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk
71+ echo 'AR = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk
7272 echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk
7373 echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk
7474 echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk
7575 echo 'PKG_CONFIG = ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config' >> config.mk
76− echo 'RANLIB = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
76+ echo 'RANLIB = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
7777
7878 # Use libraries from Nixpkgs
7979 echo "TIFFLIB = libtiff.so" >> config.mk
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
8686
8787 # Fix path to rgb.txt
8888 echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk
89− '' + stdenv.lib.optionalString stdenv.isDarwin ''
89+ '' + lib.optionalString stdenv.isDarwin ''
9090 echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
9191 echo "NETPBMLIBTYPE = dylib" >> config.mk
9292 echo "NETPBMLIBSUFFIX = dylib" >> config.mk
@@ -120,6 +120,6 @@ stdenv.mkDerivation {
120120 homepage = "http://netpbm.sourceforge.net/";
121121 description = "Toolkit for manipulation of graphic images";
122122 license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary
123− platforms = with stdenv.lib.platforms; linux ++ darwin;
123+ platforms = with lib.platforms; linux ++ darwin;
124124 };
125125}
pkgs/tools/graphics/nifskope/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
2323 url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch";
2424 sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj";
2525 })
26− ] ++ (stdenv.lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch);
26+ ] ++ (lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch);
2727
2828 buildInputs = [ qtbase qttools libGLU.dev ];
2929 nativeBuildInputs = [ qmake wrapQtAppsHook ];
pkgs/tools/graphics/optar/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 --replace /usr/local $out
1919
2020 substituteInPlace pgm2ps \
21− --replace 'convert ' "${stdenv.lib.getBin imagemagick}/bin/convert "
21+ --replace 'convert ' "${lib.getBin imagemagick}/bin/convert "
2222 '';
2323
2424 preInstall = ''
pkgs/tools/graphics/optipng/default.nix+2−2
@@ -4,7 +4,7 @@
44
55# This package comes with its own copy of zlib, libpng and pngxtern
66
7−with stdenv.lib;
7+with lib;
88
99stdenv.mkDerivation rec {
1010 name = "optipng-0.7.7";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 configureFlags = [
2727 "--with-system-zlib"
2828 "--with-system-libpng"
29− ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
29+ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
3030 #"-prefix=$out"
3131 ];
3232
pkgs/tools/graphics/pdfread/default.nix+1−1
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
3939 cp -R *.py pylrs $PYDIR
4040
4141 wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \
42− --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]}
42+ --prefix PATH : ${lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]}
4343 '';
4444
4545 meta = with lib; {
pkgs/tools/graphics/pfstools/default.nix+3−3
@@ -18,9 +18,9 @@ mkDerivation rec {
1818
1919 preConfigure = ''
2020 rm cmake/FindNETPBM.cmake
21− echo "SET(NETPBM_LIBRARY `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
22− echo "SET(NETPBM_LIBRARIES `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
23− echo "SET(NETPBM_INCLUDE_DIR ${stdenv.lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake
21+ echo "SET(NETPBM_LIBRARY `find ${lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
22+ echo "SET(NETPBM_LIBRARIES `find ${lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
23+ echo "SET(NETPBM_INCLUDE_DIR ${lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake
2424 echo "INCLUDE(FindPackageHandleStandardArgs)" >> cmake/FindNETPBM.cmake
2525 echo "FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETPBM DEFAULT_MSG NETPBM_LIBRARY NETPBM_INCLUDE_DIR)" >> cmake/FindNETPBM.cmake
2626 '';
pkgs/tools/graphics/pgf/default.nix+4−4
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }:
1+{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }:
22
3−with stdenv.lib;
3+with lib;
44
55let
66 version = "6.14.12";
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
2929 meta = {
3030 homepage = "https://www.libpgf.org/";
3131 description = "Progressive Graphics Format command line program";
32− license = stdenv.lib.licenses.lgpl21Plus;
33− platforms = stdenv.lib.platforms.linux;
32+ license = lib.licenses.lgpl21Plus;
33+ platforms = lib.platforms.linux;
3434 };
3535}
pkgs/tools/graphics/piglit/default.nix+1−1
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
6363
6464 postInstall = ''
6565 wrapProgram $out/bin/piglit \
66− --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} \
66+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libglvnd ]} \
6767 --prefix PATH : "${waffle}/bin"
6868 '';
6969
pkgs/tools/graphics/plotutils/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, libpng, autoreconfHook }:
1+{ fetchurl, lib, stdenv, libpng, autoreconfHook }:
22
33# debian splits this package into plotutils and libplot2c2
44
@@ -51,8 +51,8 @@ stdenv.mkDerivation rec {
5151
5252 homepage = "https://www.gnu.org/software/plotutils/";
5353
54− license = stdenv.lib.licenses.gpl2Plus;
55− maintainers = [ stdenv.lib.maintainers.marcweber ];
56− platforms = stdenv.lib.platforms.unix;
54+ license = lib.licenses.gpl2Plus;
55+ maintainers = [ lib.maintainers.marcweber ];
56+ platforms = lib.platforms.unix;
5757 };
5858}
pkgs/tools/graphics/pngcheck/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, zlib }:
1+{ lib, stdenv, fetchurl, zlib }:
22
33stdenv.mkDerivation rec {
44 name = "pngcheck-2.3.0";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 meta = {
2424 homepage = "http://pmt.sourceforge.net/pngcrush";
2525 description = "Verifies the integrity of PNG, JNG and MNG files";
26− license = stdenv.lib.licenses.free;
27− platforms = with stdenv.lib.platforms; linux;
26+ license = lib.licenses.free;
27+ platforms = with lib.platforms; linux;
2828 };
2929}
pkgs/tools/graphics/pngcrush/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libpng }:
1+{ lib, stdenv, fetchurl, libpng }:
22
33stdenv.mkDerivation rec {
44 name = "pngcrush-1.8.13";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 meta = {
2020 homepage = "http://pmt.sourceforge.net/pngcrush";
2121 description = "A PNG optimizer";
22− license = stdenv.lib.licenses.free;
23− platforms = with stdenv.lib.platforms; linux ++ darwin;
22+ license = lib.licenses.free;
23+ platforms = with lib.platforms; linux ++ darwin;
2424 };
2525}
pkgs/tools/graphics/pngout/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33let
44 folder = if stdenv.hostPlatform.system == "i686-linux" then "i686"
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 installPhase = ''
1717 mkdir -p $out/bin
1818 cp ${folder}/pngout $out/bin
19−
19+
2020 ${if stdenv.hostPlatform.system == "i686-linux" then ''
2121 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/pngout
2222 '' else if stdenv.hostPlatform.system == "x86_64-linux" then ''
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
2626
2727 meta = {
2828 description = "A tool that aggressively optimizes the sizes of PNG images";
29− license = stdenv.lib.licenses.unfree;
29+ license = lib.licenses.unfree;
3030 homepage = "http://advsys.net/ken/utils.htm";
31− maintainers = [ stdenv.lib.maintainers.sander ];
31+ maintainers = [ lib.maintainers.sander ];
3232 };
3333}
pkgs/tools/graphics/pngtoico/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libpng }:
1+{ lib, stdenv, fetchurl, libpng }:
22
33stdenv.mkDerivation {
44 name = "pngtoico-1.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
1717 meta = {
1818 homepage = "https://www.kernel.org/pub/software/graphics/pngtoico/";
1919 description = "Small utility to convert a set of PNG images to Microsoft ICO format";
20− license = stdenv.lib.licenses.gpl2Plus;
21− platforms = with stdenv.lib.platforms; linux;
20+ license = lib.licenses.gpl2Plus;
21+ platforms = with lib.platforms; linux;
2222 };
2323}
pkgs/tools/graphics/quirc/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkgconfig}:
1+{lib, stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkgconfig}:
22let
33 s =
44 rec {
@@ -32,8 +32,8 @@ stdenv.mkDerivation {
3232 meta = {
3333 inherit (s) version;
3434 description = ''A small QR code decoding library'';
35− license = stdenv.lib.licenses.isc;
36− maintainers = [stdenv.lib.maintainers.raskin];
37− platforms = stdenv.lib.platforms.linux;
35+ license = lib.licenses.isc;
36+ maintainers = [lib.maintainers.raskin];
37+ platforms = lib.platforms.linux;
3838 };
3939}
pkgs/tools/graphics/s2png/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }:
22
33stdenv.mkDerivation rec {
44 pname = "s2png";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
1717 meta = {
1818 homepage = "https://github.com/dbohdan/s2png/";
1919 description = "Store any data in PNG images";
20− license = stdenv.lib.licenses.gpl2;
21− maintainers = [ stdenv.lib.maintainers.dbohdan ];
22− platforms = stdenv.lib.platforms.unix;
20+ license = lib.licenses.gpl2;
21+ maintainers = [ lib.maintainers.dbohdan ];
22+ platforms = lib.platforms.unix;
2323 };
2424}
pkgs/tools/graphics/syntex/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, mono}:
1+{lib, stdenv, fetchFromGitHub, mono}:
22stdenv.mkDerivation rec {
33 pname = "syntex";
44 version = "0.0pre20160915";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
2727 meta = {
2828 inherit version;
2929 description = ''Texture synthesis from examples'';
30− license = stdenv.lib.licenses.mit;
31− maintainers = [stdenv.lib.maintainers.raskin];
32− platforms = stdenv.lib.platforms.linux;
30+ license = lib.licenses.mit;
31+ maintainers = [lib.maintainers.raskin];
32+ platforms = lib.platforms.linux;
3333 };
3434}
pkgs/tools/graphics/transfig/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }:
1+{ lib, stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }:
22
33stdenv.mkDerivation {
44 name = "transfig-3.2.4";
@@ -56,6 +56,6 @@ stdenv.mkDerivation {
5656 hardeningDisable = [ "format" ];
5757
5858 meta = {
59− platforms = stdenv.lib.platforms.unix;
59+ platforms = lib.platforms.unix;
6060 };
6161}
pkgs/tools/graphics/vips/default.nix+1−1
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
6868 python27
6969 libpng
7070 expat
71− ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
71+ ] ++ lib.optional stdenv.isDarwin ApplicationServices;
7272
7373 # Required by .pc file
7474 propagatedBuildInputs = [
pkgs/tools/graphics/waifu2x-converter-cpp/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ cmake, fetchFromGitHub, makeWrapper, opencv3, stdenv, ocl-icd, opencl-headers
1+{ cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers
22, cudaSupport ? false, cudatoolkit ? null
33}:
44
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 buildInputs = [
2222 ocl-icd opencv3 opencl-headers
23− ] ++ stdenv.lib.optional cudaSupport cudatoolkit;
23+ ] ++ lib.optional cudaSupport cudatoolkit;
2424
2525 nativeBuildInputs = [ cmake makeWrapper ];
2626
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
3131 meta = {
3232 description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV";
3333 homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp";
34− license = stdenv.lib.licenses.mit;
35− maintainers = [ stdenv.lib.maintainers.xzfc ];
36− platforms = stdenv.lib.platforms.linux;
34+ license = lib.licenses.mit;
35+ maintainers = [ lib.maintainers.xzfc ];
36+ platforms = lib.platforms.linux;
3737 };
3838}
pkgs/tools/graphics/wavefunctioncollapse/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, mono}:
1+{lib, stdenv, fetchFromGitHub, mono}:
22stdenv.mkDerivation rec {
33 pname = "wavefunctioncollapse";
44 version = "0.0pre20170130";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
2727 meta = {
2828 inherit version;
2929 description = ''A generator of bitmaps that are locally similar to the input bitmap'';
30− license = stdenv.lib.licenses.mit;
31− maintainers = [stdenv.lib.maintainers.raskin];
32− platforms = stdenv.lib.platforms.linux;
30+ license = lib.licenses.mit;
31+ maintainers = [lib.maintainers.raskin];
32+ platforms = lib.platforms.linux;
3333 };
3434}
pkgs/tools/graphics/welkin/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchsvn, jre, makeWrapper }:
1+{ lib, stdenv, fetchsvn, jre, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 pname = "welkin";
@@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
2626
2727 meta = {
2828 description = "An RDF visualizer";
29− maintainers = with stdenv.lib.maintainers; [
29+ maintainers = with lib.maintainers; [
3030 raskin
3131 ];
3232 hydraPlatforms = [];
33− license = stdenv.lib.licenses.free;
34− platforms = with stdenv.lib.platforms; unix;
33+ license = lib.licenses.free;
34+ platforms = with lib.platforms; unix;
3535 };
3636}
pkgs/tools/graphics/xcftools/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libpng, perl, gettext }:
1+{lib, stdenv, fetchurl, libpng, perl, gettext }:
22
33stdenv.mkDerivation {
44 name = "xcftools-1.0.7";
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
3434 These tools work independently of the Gimp engine and do not
3535 require the Gimp to even be installed.
3636 '';
37− license = stdenv.lib.licenses.gpl2;
38− platforms = stdenv.lib.platforms.linux;
37+ license = lib.licenses.gpl2;
38+ platforms = lib.platforms.linux;
3939 };
4040}
pkgs/tools/graphics/yafaray-core/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 buildInputs = [
2525 boost165 opencv zlib libxml2 freetype libjpeg libtiff
2626 swig openexr ilmbase
27− ] ++ stdenv.lib.optional withPython python3;
27+ ] ++ lib.optional withPython python3;
2828
2929 meta = with lib; {
3030 description = "A free, open source raytracer";
pkgs/tools/graphics/yaxg/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 mkdir -p $out/bin/
2020 mv yaxg $out/bin/
2121 chmod +x $out/bin/yaxg
22− wrapProgram $out/bin/yaxg --prefix PATH : ${ stdenv.lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]}
22+ wrapProgram $out/bin/yaxg --prefix PATH : ${ lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]}
2323 '';
2424
2525 meta = with lib; {
pkgs/tools/graphics/zxing/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, jre }:
1+{ lib, stdenv, fetchurl, jre }:
22stdenv.mkDerivation rec {
33 pname = "zxing";
44 version = "3.1.0";
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
2626 meta = {
2727 inherit version;
2828 description = ''1D and 2D code reading library'';
29− license = stdenv.lib.licenses.asl20;
30− maintainers = [stdenv.lib.maintainers.raskin];
31− platforms = stdenv.lib.platforms.linux;
29+ license = lib.licenses.asl20;
30+ maintainers = [lib.maintainers.raskin];
31+ platforms = lib.platforms.linux;
3232 homepage = "https://github.com/zxing/zxing";
3333 };
3434}
pkgs/tools/inputmethods/evscript/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, rustPlatform, fetchFromGitHub }:
1+{ lib, stdenv, rustPlatform, fetchFromGitHub }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "evscript";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
1414 cargoSha256 = "1dcyhxfyq0nrjl05g1s9pjkg7vqw63wbdhlskrdcvxncmci3s7rp";
1515 verifyCargoDeps = true;
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 homepage = "https://github.com/myfreeweb/${pname}";
1919 description = "A tiny sandboxed Dyon scripting environment for evdev input devices";
2020 license = licenses.unlicense;
pkgs/tools/inputmethods/fcitx/unwrapped.nix+1−1
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
5252 cp ${dicts} src/module/spell/dict/$(stripHash ${dicts})
5353 cp ${table} src/im/table/data/$(stripHash ${table})
5454 ''
55− + stdenv.lib.optionalString withPinyin ''
55+ + lib.optionalString withPinyin ''
5656 cp ${pystroke-data} src/module/pinyin-enhance/data/$(stripHash ${pystroke-data})
5757 cp ${pytable-data} src/module/pinyin-enhance/data/$(stripHash ${pytable-data})
5858 cp ${pinyin-data} src/im/pinyin/data/$(stripHash ${pinyin-data})
pkgs/tools/inputmethods/fcitx5/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, fetchFromGitHub
44, pkg-config
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
9090 libxkbfile
9191 ];
9292
93− meta = with stdenv.lib; {
93+ meta = with lib; {
9494 description = "Next generation of fcitx";
9595 homepage = "https://github.com/fcitx/fcitx5";
9696 license = licenses.lgpl21Plus;
pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, mkDerivation
33, fetchurl
44, fetchFromGitHub
@@ -64,9 +64,9 @@ mkDerivation rec {
6464 opencc
6565 qtwebengine
6666 fmt
67− ] ++ stdenv.lib.optional luaSupport fcitx5-lua;
67+ ] ++ lib.optional luaSupport fcitx5-lua;
6868
69− meta = with stdenv.lib; {
69+ meta = with lib; {
7070 description = "Addons related to Chinese, including IME previous bundled inside fcitx4";
7171 homepage = "https://github.com/fcitx/fcitx5-chinese-addons";
7272 license = with licenses; [ gpl2Plus lgpl21Plus ];
pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, mkDerivation
33, fetchFromGitHub
44, cmake
@@ -45,12 +45,12 @@ mkDerivation rec {
4545 xkeyboardconfig
4646 libxkbfile
4747 libXdmcp
48− ] ++ stdenv.lib.optionals kcmSupport [
48+ ] ++ lib.optionals kcmSupport [
4949 kdeclarative
5050 kwidgetsaddons
5151 ];
5252
53− meta = with stdenv.lib; {
53+ meta = with lib; {
5454 description = "Configuration Tool for Fcitx5";
5555 homepage = "https://github.com/fcitx/fcitx5-configtool";
5656 license = licenses.gpl2Plus;
pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, fetchFromGitHub
44, cmake
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 cmakeFlags = [
3737 "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0"
3838 "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0"
39− ] ++ stdenv.lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
39+ ] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
4040
4141 buildInputs = [
4242 gtk3
@@ -54,14 +54,14 @@ stdenv.mkDerivation rec {
5454 dbus
5555 at-spi2-core
5656 libXtst
57− ] ++ stdenv.lib.optional withGTK2 gtk2;
57+ ] ++ lib.optional withGTK2 gtk2;
5858
5959 nativeBuildInputs = [
6060 cmake
6161 extra-cmake-modules
6262 ];
6363
64− meta = with stdenv.lib; {
64+ meta = with lib; {
6565 description = "Fcitx5 gtk im module and glib based dbus client library";
6666 homepage = "https://github.com/fcitx/fcitx5-gtk";
6767 license = licenses.lgpl21Plus;
pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchFromGitHub
33, cmake
44, extra-cmake-modules
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 gettext
3131 ];
3232
33− meta = with stdenv.lib; {
33+ meta = with lib; {
3434 description = "Lua support for Fcitx 5";
3535 homepage = "https://github.com/fcitx/fcitx5-lua";
3636 license = licenses.lgpl21Plus;
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, mkDerivation
33, fetchFromGitHub
44, cmake
@@ -36,7 +36,7 @@ mkDerivation rec {
3636 libXdmcp
3737 ];
3838
39− meta = with stdenv.lib; {
39+ meta = with lib; {
4040 description = "Fcitx5 Qt Library";
4141 homepage = "https://github.com/fcitx/fcitx5-qt";
4242 license = with licenses; [ lgpl21Plus bsd3 ];
pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, fetchFromGitHub
44, pkgconfig
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 librime
3838 ];
3939
40− meta = with stdenv.lib; {
40+ meta = with lib; {
4141 description = "RIME support for Fcitx5";
4242 homepage = "https://github.com/fcitx/fcitx5-rime";
4343 license = licenses.lgpl21Plus;
pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchFromGitHub
33, cmake
44, extra-cmake-modules
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 fcitx5
2929 ];
3030
31− meta = with stdenv.lib; {
31+ meta = with lib; {
3232 description = "Extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick";
3333 homepage = "https://github.com/fcitx/fcitx5-table-extra";
3434 license = licenses.gpl2Only;
pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchFromGitHub
33, cmake
44, extra-cmake-modules
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 fcitx5
2929 ];
3030
31− meta = with stdenv.lib; {
31+ meta = with lib; {
3232 description = "Some other tables for Fcitx";
3333 homepage = "https://github.com/fcitx/fcitx5-table-other";
3434 license = licenses.gpl3Only;
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix+1−1
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
3636 postUnpack = ''
3737 rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/
3838 ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
39− '' + stdenv.lib.optionalString stdenv.isLinux ''
39+ '' + lib.optionalString stdenv.isLinux ''
4040 sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi
4141 '';
4242
pkgs/tools/inputmethods/ibus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, substituteAll
33, fetchurl
44, fetchFromGitHub
@@ -36,7 +36,7 @@
3636
3737assert withWayland -> wayland != null && libxkbcommon != null;
3838
39−with stdenv.lib;
39+with lib;
4040
4141let
4242 python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]);
pkgs/tools/inputmethods/ibus/wrapper.nix+4−4
@@ -1,9 +1,9 @@
1−{ stdenv, runCommand, makeWrapper, lndir
1+{ lib, stdenv, runCommand, makeWrapper, lndir
22, dconf, hicolor-icon-theme, ibus, librsvg, plugins ? []
33}:
44
55let
6− name = "ibus-with-plugins-" + stdenv.lib.getVersion ibus;
6+ name = "ibus-with-plugins-" + lib.getVersion ibus;
77 env = {
88 buildInputs = [ ibus ] ++ plugins;
99 nativeBuildInputs = [ lndir makeWrapper ];
@@ -25,7 +25,7 @@ let
2525 wrapProgram "$out/bin/$prog" \
2626 --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
2727 --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
28− --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
28+ --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
2929 --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \
3030 --set IBUS_DATAROOTDIR "$out/share" \
3131 --set IBUS_LIBEXECDIR "$out/libexec" \
@@ -44,7 +44,7 @@ let
4444 wrapProgram "$out/bin/$prog" \
4545 --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
4646 --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
47− --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
47+ --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
4848 --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \
4949 --set IBUS_DATAROOTDIR "$out/share" \
5050 --set IBUS_LIBEXECDIR "$out/libexec" \
pkgs/tools/inputmethods/interception-tools/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, cmake, libyamlcpp,
1+{ lib, stdenv, fetchurl, pkgconfig, cmake, libyamlcpp,
22 libevdev, udev }:
33
44let
@@ -26,8 +26,8 @@ in stdenv.mkDerivation {
2626 meta = {
2727 description = "A minimal composable infrastructure on top of libudev and libevdev";
2828 homepage = "https://gitlab.com/interception/linux/tools";
29− license = stdenv.lib.licenses.gpl3;
30− maintainers = [ stdenv.lib.maintainers.vyp ];
31− platforms = stdenv.lib.platforms.linux;
29+ license = lib.licenses.gpl3;
30+ maintainers = [ lib.maintainers.vyp ];
31+ platforms = lib.platforms.linux;
3232 };
3333}
pkgs/tools/inputmethods/m17n-db/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gettext }:
1+{ lib, stdenv, fetchurl, gettext }:
22
33stdenv.mkDerivation rec {
44 name = "m17n-db-1.8.0";
@@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
1010
1111 buildInputs = [ gettext ];
1212
13− configureFlags = stdenv.lib.optional (stdenv ? glibc)
13+ configureFlags = lib.optional (stdenv ? glibc)
1414 "--with-charmaps=${stdenv.glibc.out}/share/i18n/charmaps"
1515 ;
1616
1717 meta = {
1818 homepage = "https://www.nongnu.org/m17n/";
1919 description = "Multilingual text processing library (database)";
20− license = stdenv.lib.licenses.lgpl21Plus;
21− platforms = stdenv.lib.platforms.linux;
22− maintainers = with stdenv.lib.maintainers; [ astsmtl ];
20+ license = lib.licenses.lgpl21Plus;
21+ platforms = lib.platforms.linux;
22+ maintainers = with lib.maintainers; [ astsmtl ];
2323 };
2424}
pkgs/tools/inputmethods/m17n-lib/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, m17n_db}:
1+{lib, stdenv, fetchurl, m17n_db}:
22stdenv.mkDerivation rec {
33 name = "m17n-lib-1.8.0";
44
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
1212 meta = {
1313 homepage = "https://www.nongnu.org/m17n/";
1414 description = "Multilingual text processing library (runtime)";
15− license = stdenv.lib.licenses.lgpl21Plus;
16− platforms = stdenv.lib.platforms.linux;
17− maintainers = with stdenv.lib.maintainers; [ astsmtl ];
15+ license = lib.licenses.lgpl21Plus;
16+ platforms = lib.platforms.linux;
17+ maintainers = with lib.maintainers; [ astsmtl ];
1818 };
1919}
pkgs/tools/inputmethods/m17n-lib/otf.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libXaw, freetype }:
1+{ lib, stdenv, fetchurl, libXaw, freetype }:
22
33stdenv.mkDerivation rec {
44 name = "libotf-0.9.16";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121 meta = {
2222 homepage = "https://www.nongnu.org/m17n/";
2323 description = "Multilingual text processing library (libotf)";
24− license = stdenv.lib.licenses.lgpl21Plus;
25− platforms = stdenv.lib.platforms.linux;
26− maintainers = with stdenv.lib.maintainers; [ bendlas ];
24+ license = lib.licenses.lgpl21Plus;
25+ platforms = lib.platforms.linux;
26+ maintainers = with lib.maintainers; [ bendlas ];
2727 };
2828}
pkgs/tools/inputmethods/skk/skk-dicts/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libiconv, skktools }:
1+{ lib, stdenv, fetchurl, libiconv, skktools }:
22
33let
44 # kana to kanji
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
3131 pname = "skk-dicts-unstable";
3232 version = "2017-10-26";
3333 srcs = [ small medium large edict assoc ];
34− nativeBuildInputs = [ skktools ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
34+ nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv;
3535
3636 phases = [ "installPhase" ];
3737 installPhase = ''
@@ -66,8 +66,8 @@ stdenv.mkDerivation {
6666 dictionaries for the SKK Japanese input method.
6767 '';
6868 homepage = "https://github.com/skk-dev/dict";
69− license = stdenv.lib.licenses.gpl2Plus;
70− maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
71− platforms = with stdenv.lib.platforms; linux ++ darwin;
69+ license = lib.licenses.gpl2Plus;
70+ maintainers = with lib.maintainers; [ yuriaisaka ];
71+ platforms = with lib.platforms; linux ++ darwin;
7272 };
7373}
pkgs/tools/inputmethods/skk/skktools/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }:
1+{ lib, stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }:
22
33# Note (2017-10-24, yuriaisaka):
44# - Version 1.3.3 dates from Jul. 19, 2013.
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 src = fetchFromGitHub {
1515 owner = "skk-dev";
1616 repo = "skktools";
17− rev = "skktools-${stdenv.lib.replaceStrings ["."] ["_"] version}";
17+ rev = "skktools-${lib.replaceStrings ["."] ["_"] version}";
1818 sha256 = "1zway8jsm18279xq8zlpr84iqiw373x3v0ysay74n9bjqxbl234a";
1919 };
2020 # # See "12.2. Package naming"
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
3838 input method.
3939 '';
4040 homepage = "https://github.com/skk-dev/skktools";
41− license = stdenv.lib.licenses.gpl2Plus;
42− maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
43− platforms = with stdenv.lib.platforms; linux ++ darwin;
41+ license = lib.licenses.gpl2Plus;
42+ maintainers = with lib.maintainers; [ yuriaisaka ];
43+ platforms = with lib.platforms; linux ++ darwin;
4444 };
4545}
pkgs/tools/inputmethods/touchegg/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }:
1+{ lib, stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }:
22
33stdenv.mkDerivation rec {
44 pname = "touchegg";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 homepage = "https://github.com/JoseExposito/touchegg";
2222 description = "Macro binding for touch surfaces";
23− license = stdenv.lib.licenses.gpl2;
24− platforms = stdenv.lib.platforms.linux;
23+ license = lib.licenses.gpl2;
24+ platforms = lib.platforms.linux;
2525 };
2626}
pkgs/tools/inputmethods/uim/default.nix+1−1
@@ -18,7 +18,7 @@
1818, withMisc ? false, libeb ? null
1919}:
2020
21−with stdenv.lib;
21+with lib;
2222
2323assert withGtk2 -> gtk2 != null;
2424assert withGtk3 -> gtk3 != null;
pkgs/tools/misc/0x0/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818
1919 patchShebangs $out/bin/0x0
2020 wrapProgram $out/bin/0x0 \
21− --prefix PATH : '${stdenv.lib.makeBinPath [ curl xsel ]}'
21+ --prefix PATH : '${lib.makeBinPath [ curl xsel ]}'
2222 '';
2323
2424 meta = with lib; {
pkgs/tools/misc/abduco/default.nix+3−3
@@ -1,6 +1,6 @@
1−{ stdenv, fetchFromGitHub, writeText, conf ? null }:
1+{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }:
22
3−with stdenv.lib;
3+with lib;
44
55stdenv.mkDerivation rec {
66 name = "abduco-2018-05-16";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
1616 preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
1717
18− CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
18+ CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
1919
2020 meta = {
2121 homepage = "http://brain-dump.org/projects/abduco";
pkgs/tools/misc/aescrypt/default.nix+2−2
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah";
1010 };
1111
12− NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
12+ NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-liconv";
1313
1414 preBuild = ''
1515 substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc"
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 homepage = "https://www.aescrypt.com/";
3030 license = licenses.gpl2;
3131 maintainers = with maintainers; [ lovek323 qknight ];
32− platforms = stdenv.lib.platforms.all;
32+ platforms = lib.platforms.all;
3333 hydraPlatforms = with platforms; unix;
3434 };
3535}
pkgs/tools/misc/aptly/default.nix+1−1
@@ -34,7 +34,7 @@ buildGoPackage {
3434 postInstall = ''
3535 installShellCompletion --bash ${aptlyCompletionSrc}/aptly
3636 wrapProgram "$out/bin/aptly" \
37− --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
37+ --prefix PATH ":" "${lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
3838 '';
3939
4040 meta = with lib; {
pkgs/tools/misc/aws-mturk-clt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, jre }:
1+{ lib, stdenv, fetchurl, jre }:
22
33stdenv.mkDerivation rec {
44 name = "aws-mturk-clt-1.3.0";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 meta = {
2525 homepage = "https://requester.mturk.com/developer";
2626 description = "Command line tools for interacting with the Amazon Mechanical Turk";
27− license = stdenv.lib.licenses.amazonsl;
27+ license = lib.licenses.amazonsl;
2828
2929 longDescription =
3030 ''
pkgs/tools/misc/azure-vhd-utils/default.nix+1−1
@@ -3,7 +3,7 @@
33
44buildGoPackage rec {
55 pname = "azure-vhd-utils";
6− version = "20160614-${stdenv.lib.strings.substring 0 7 rev}";
6+ version = "20160614-${lib.strings.substring 0 7 rev}";
77 rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
88
99 goPackagePath = "github.com/Microsoft/azure-vhd-utils";
pkgs/tools/misc/bat-extras/default.nix+3−3
@@ -116,9 +116,9 @@ let
116116 runHook preInstall
117117 mkdir -p $out/bin
118118 cp -p bin/${name} $out/bin/${name}
119− '' + stdenv.lib.optionalString (dependencies != []) ''
119+ '' + lib.optionalString (dependencies != []) ''
120120 wrapProgram $out/bin/${name} \
121− --prefix PATH : ${stdenv.lib.makeBinPath dependencies}
121+ --prefix PATH : ${lib.makeBinPath dependencies}
122122 '' + ''
123123 runHook postInstall
124124 '';
@@ -130,7 +130,7 @@ let
130130 };
131131 optionalDep = cond: dep:
132132 assert cond -> dep != null;
133− stdenv.lib.optional cond dep;
133+ lib.optional cond dep;
134134in
135135{
136136 batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta);
pkgs/tools/misc/bat/default.nix+2−2
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
2525
2626 nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
2727
28− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
28+ buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
2929
3030 postInstall = ''
3131 installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
3636 # expected with certain flag combinations.
3737 postFixup = ''
3838 wrapProgram "$out/bin/bat" \
39− --prefix PATH : "${stdenv.lib.makeBinPath [ less ]}"
39+ --prefix PATH : "${lib.makeBinPath [ less ]}"
4040 '';
4141
4242 passthru.tests = { inherit (nixosTests) bat; };
pkgs/tools/misc/bc/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, autoreconfHook, buildPackages
1+{ lib, stdenv, autoreconfHook, buildPackages
22, fetchurl, flex, readline, ed, texinfo
33}:
44
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 meta = {
3434 description = "GNU software calculator";
3535 homepage = "https://www.gnu.org/software/bc/";
36− license = stdenv.lib.licenses.gpl3;
37− platforms = stdenv.lib.platforms.all;
36+ license = lib.licenses.gpl3;
37+ platforms = lib.platforms.all;
3838 };
3939}
pkgs/tools/misc/bfr/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 meta = with lib; {
2222 description = "A general-purpose command-line pipe buffer";
23− license = stdenv.lib.licenses.gpl2;
23+ license = lib.licenses.gpl2;
2424 maintainers = with maintainers; [ pSub ];
2525 platforms = platforms.linux;
2626 };
pkgs/tools/misc/blink1-tool/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libusb1, pkgconfig, ... }:
1+{ lib, stdenv, fetchurl, libusb1, pkgconfig, ... }:
22
33stdenv.mkDerivation rec {
44 pname = "blink1";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
2323 meta = {
2424 description = "Command line client for the blink(1) notification light";
2525 homepage = "https://blink1.thingm.com/";
26− license = stdenv.lib.licenses.cc-by-sa-30;
27− maintainers = [ stdenv.lib.maintainers.cransom ];
28− platforms = stdenv.lib.platforms.linux;
26+ license = lib.licenses.cc-by-sa-30;
27+ maintainers = [ lib.maintainers.cransom ];
28+ platforms = lib.platforms.linux;
2929 };
3030}
pkgs/tools/misc/bogofilter/default.nix+3−3
@@ -1,4 +1,4 @@
1−{fetchurl, stdenv, flex, db}:
1+{fetchurl, lib, stdenv, flex, db}:
22
33stdenv.mkDerivation rec {
44 name = "bogofilter-1.2.4";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 classifications and corrections. It is based on a Bayesian
2424 filter.
2525 '';
26− license = stdenv.lib.licenses.gpl2;
27− platforms = stdenv.lib.platforms.linux;
26+ license = lib.licenses.gpl2;
27+ platforms = lib.platforms.linux;
2828 };
2929}
pkgs/tools/misc/brltty/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, python3, bluez
1+{ lib, stdenv, fetchurl, pkgconfig, python3, bluez
22, alsaSupport ? stdenv.isLinux, alsaLib ? null
33, systemdSupport ? stdenv.isLinux, systemd ? null }:
44
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [ pkgconfig python3.pkgs.cython ];
1717 buildInputs = [ bluez ]
18− ++ stdenv.lib.optional alsaSupport alsaLib
19− ++ stdenv.lib.optional systemdSupport systemd;
18+ ++ lib.optional alsaSupport alsaLib
19+ ++ lib.optional systemdSupport systemd;
2020
2121 meta = {
2222 description = "Access software for a blind person using a braille display";
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
2727 Some speech capability has also been incorporated.
2828 '';
2929 homepage = "http://www.brltty.com/";
30− license = stdenv.lib.licenses.gpl2;
31− maintainers = [ stdenv.lib.maintainers.bramd ];
32− platforms = stdenv.lib.platforms.all;
30+ license = lib.licenses.gpl2;
31+ maintainers = [ lib.maintainers.bramd ];
32+ platforms = lib.platforms.all;
3333 };
3434
3535 makeFlags = [ "PYTHON_PREFIX=$(out)" ];
pkgs/tools/misc/broot/default.nix+1−1
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
2525 installShellFiles
2626 ];
2727
28− buildInputs = stdenv.lib.optionals stdenv.isDarwin [
28+ buildInputs = lib.optionals stdenv.isDarwin [
2929 libiconv
3030 Security
3131 zlib
pkgs/tools/misc/capture/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818
1919 patchShebangs $out/bin/capture
2020 wrapProgram $out/bin/capture \
21− --prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg_3 ]}'
21+ --prefix PATH : '${lib.makeBinPath [ slop ffmpeg_3 ]}'
2222 '';
2323
2424 meta = with lib; {
pkgs/tools/misc/catimg/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchFromGitHub, cmake } :
1+{ lib, stdenv, fetchFromGitHub, cmake } :
22
3−with stdenv.lib;
3+with lib;
44
55stdenv.mkDerivation rec {
66 pname = "catimg";
pkgs/tools/misc/chafa/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 docbook_xsl
2424 ];
2525
26− buildInputs = [ glib imagemagick ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
26+ buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
2727
2828 patches = [ ./xmlcatalog_patch.patch ];
2929
pkgs/tools/misc/cht.sh/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
3333 cp share/zsh.txt $out/share/zsh/site-functions/_cht
3434
3535 wrapProgram "$out/bin/cht.sh" \
36− --prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}"
36+ --prefix PATH : "${lib.makeBinPath [ curl rlwrap ncurses xsel ]}"
3737 '';
3838
3939 passthru.updateScript = unstableGitUpdater { };
pkgs/tools/misc/cloc/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
1+{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
22
33stdenv.mkDerivation rec {
44 pname = "cloc";
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
2626 meta = {
2727 description = "A program that counts lines of source code";
2828 homepage = "https://github.com/AlDanial/cloc";
29− license = stdenv.lib.licenses.gpl2;
30− platforms = stdenv.lib.platforms.all;
31− maintainers = with stdenv.lib.maintainers; [ rycee ];
29+ license = lib.licenses.gpl2;
30+ platforms = lib.platforms.all;
31+ maintainers = with lib.maintainers; [ rycee ];
3232 };
3333}
pkgs/tools/misc/cloud-utils/default.nix+2−2
@@ -37,11 +37,11 @@ in stdenv.mkDerivation rec {
3737 moveToOutput bin/vcs-run $guest
3838
3939 for i in $out/bin/*; do
40− wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath binDeps}:$out/bin"
40+ wrapProgram $i --prefix PATH : "${lib.makeBinPath binDeps}:$out/bin"
4141 done
4242
4343 for i in $guest/bin/*; do
44− wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath guestDeps}:$guest/bin"
44+ wrapProgram $i --prefix PATH : "${lib.makeBinPath guestDeps}:$guest/bin"
4545 ln -s $i $out/bin
4646 done
4747 '';
pkgs/tools/misc/contacts/default.nix+2−2
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
2222 homepage = "http://www.gnufoo.org/contacts/contacts.html";
2323 license = licenses.gpl2;
2424 maintainers = with maintainers; [ jwiegley ];
25− platforms = stdenv.lib.platforms.darwin;
26− hydraPlatforms = stdenv.lib.platforms.darwin;
25+ platforms = lib.platforms.darwin;
26+ hydraPlatforms = lib.platforms.darwin;
2727 };
2828}
pkgs/tools/misc/coreboot-utils/default.nix+4−4
@@ -1,9 +1,9 @@
1−{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
1+{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
22
33let
44 version = "4.13";
55
6− commonMeta = with stdenv.lib; {
6+ commonMeta = with lib; {
77 description = "Various coreboot-related tools";
88 homepage = "https://www.coreboot.org";
99 license = licenses.gpl2;
@@ -91,14 +91,14 @@ let
9191 installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all";
9292 postFixup = let
9393 binPath = [ coreutils acpica-tools iasl gnugrep gnused file ];
94− in "wrapProgram $out/bin/acpidump-all --set PATH ${stdenv.lib.makeBinPath binPath}";
94+ in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}";
9595 };
9696 };
9797
9898in utils // {
9999 coreboot-utils = (buildEnv {
100100 name = "coreboot-utils-${version}";
101− paths = stdenv.lib.attrValues utils;
101+ paths = lib.attrValues utils;
102102 postBuild = "rm -rf $out/sbin";
103103 }) // {
104104 inherit version;
pkgs/tools/misc/coreutils/default.nix+1−1
@@ -154,6 +154,6 @@ stdenv.mkDerivation (rec {
154154} // optionalAttrs stdenv.hostPlatform.isMusl {
155155 # Work around a bogus warning in conjunction with musl.
156156 NIX_CFLAGS_COMPILE = "-Wno-error";
157−} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isAndroid {
157+} // lib.optionalAttrs stdenv.hostPlatform.isAndroid {
158158 NIX_CFLAGS_COMPILE = "-D__USE_FORTIFY_LEVEL=0";
159159})
pkgs/tools/misc/cpuminer-multi/default.nix+1−1
@@ -6,7 +6,7 @@ let
66 date = "20160316";
77in
88stdenv.mkDerivation {
9− name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
9+ name = "cpuminer-multi-${date}-${lib.strings.substring 0 7 rev}";
1010
1111 src = fetchFromGitHub {
1212 owner = "hyc";
pkgs/tools/misc/cunit/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}:
1+{ lib, stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}:
22
33stdenv.mkDerivation rec {
44 pname = "CUnit";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 homepage = "http://cunit.sourceforge.net/";
2525
26− license = stdenv.lib.licenses.lgpl2;
27− platforms = stdenv.lib.platforms.unix;
26+ license = lib.licenses.lgpl2;
27+ platforms = lib.platforms.unix;
2828 };
2929}
pkgs/tools/misc/dasht/default.nix+3−3
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
5858 meta = {
5959 description = "Search API docs offline, in terminal or browser";
6060 homepage = "https://sunaku.github.io/dasht/man";
61− license = stdenv.lib.licenses.isc;
62− platforms = stdenv.lib.platforms.unix; #cannot test other
63− maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
61+ license = lib.licenses.isc;
62+ platforms = lib.platforms.unix; #cannot test other
63+ maintainers = with lib.maintainers; [ matthiasbeyer ];
6464 };
6565}
pkgs/tools/misc/dbacl/default.nix+3−3
@@ -1,4 +1,4 @@
1−{fetchurl, stdenv}:
1+{fetchurl, lib, stdenv}:
22
33stdenv.mkDerivation rec {
44 name = "dbacl-1.14";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 homepage = "http://dbacl.sourceforge.net/";
1212 longDescription = "a digramic Bayesian classifier for text recognition.";
1313 maintainers = [];
14− license = stdenv.lib.licenses.gpl3;
15− platforms = stdenv.lib.platforms.unix;
14+ license = lib.licenses.gpl3;
15+ platforms = lib.platforms.unix;
1616 };
1717}
pkgs/tools/misc/ddate/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake }:
1+{ lib, stdenv, fetchFromGitHub, cmake }:
22
33stdenv.mkDerivation rec {
44 pname = "ddate";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ cmake ];
1515
16− meta = with stdenv.lib; {
16+ meta = with lib; {
1717 homepage = "https://github.com/bo0ts/ddate";
1818 description = "Discordian version of the date program";
1919 license = licenses.publicDomain;
pkgs/tools/misc/ddccontrol/default.nix+1−1
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
6060 homepage = "https://github.com/ddccontrol/ddccontrol";
6161 license = licenses.gpl2;
6262 platforms = [ "i686-linux" "x86_64-linux" ];
63− maintainers = [ stdenv.lib.maintainers.pakhfn ];
63+ maintainers = [ lib.maintainers.pakhfn ];
6464 };
6565}
pkgs/tools/misc/debootstrap/default.nix+1−1
@@ -2,7 +2,7 @@
22, gnugrep, gnutar, gnused, gzip, makeWrapper }:
33# USAGE like this: debootstrap sid /tmp/target-chroot-directory
44# There is also cdebootstrap now. Is that easier to maintain?
5−let binPath = stdenv.lib.makeBinPath [
5+let binPath = lib.makeBinPath [
66 coreutils
77 dpkg
88 gawk
pkgs/tools/misc/desktop-file-utils/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl, pkgconfig, glib, libintl }:
1+{ lib, stdenv, fetchurl, pkgconfig, glib, libintl }:
22
3−with stdenv.lib;
3+with lib;
44
55stdenv.mkDerivation rec {
66 pname = "desktop-file-utils";
pkgs/tools/misc/ding-libs/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, check }:
1+{ lib, stdenv, fetchurl, check }:
22
33stdenv.mkDerivation rec {
44 pname = "ding-libs";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
1717 meta = {
1818 description = "'D is not GLib' utility libraries";
1919 homepage = "https://fedorahosted.org/sssd/";
20− platforms = with stdenv.lib.platforms; linux;
21− maintainers = with stdenv.lib.maintainers; [ e-user ];
22− license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ];
20+ platforms = with lib.platforms; linux;
21+ maintainers = with lib.maintainers; [ e-user ];
22+ license = [ lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ];
2323 };
2424}
pkgs/tools/misc/direnv/default.nix+1−1
@@ -15,7 +15,7 @@ buildGoModule rec {
1515
1616 # we have no bash at the moment for windows
1717 BASH_PATH =
18− stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows)
18+ lib.optionalString (!stdenv.hostPlatform.isWindows)
1919 "${bash}/bin/bash";
2020
2121 # replace the build phase to use the GNUMakefile instead
pkgs/tools/misc/diskus/default.nix+1−1
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
1111 sha256 = "087w58q5kd3r23a9qnhqgvq4vhv69b5a6a7n3kh09g5cjszy8s05";
1212 };
1313
14− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
14+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
1515
1616 cargoSha256 = "0bivmjn7h4lfp5azbc6q0xiqq3fk68jdd4kwrwgbxiljg4xd2qy8";
1717
pkgs/tools/misc/disper/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python, xorg, makeWrapper }:
1+{ lib, stdenv, fetchFromGitHub, python, xorg, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 pname = "disper";
@@ -21,14 +21,14 @@ stdenv.mkDerivation rec {
2121
2222 postInstall = ''
2323 wrapProgram $out/bin/disper \
24− --prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}"
24+ --prefix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}"
2525 '';
2626
2727 meta = {
2828 description = "On-the-fly display switch utility";
2929 homepage = "http://willem.engen.nl/projects/disper/";
30− platforms = stdenv.lib.platforms.unix;
31− license = stdenv.lib.licenses.gpl3;
30+ platforms = lib.platforms.unix;
31+ license = lib.licenses.gpl3;
3232 };
3333
3434}
pkgs/tools/misc/dmg2img/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }:
1+{ lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 name = "dmg2img-1.6.7";
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
2525 '';
2626
2727 meta = {
28− platforms = stdenv.lib.platforms.unix;
28+ platforms = lib.platforms.unix;
2929 description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool";
30− license = stdenv.lib.licenses.gpl3;
30+ license = lib.licenses.gpl3;
3131 };
3232}
pkgs/tools/misc/dtach/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "dtach";
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
2727 themselves.
2828 '';
2929
30− license = stdenv.lib.licenses.gpl2Plus;
30+ license = lib.licenses.gpl2Plus;
3131
32− platforms = stdenv.lib.platforms.unix;
32+ platforms = lib.platforms.unix;
3333 maintainers = [ ];
3434 };
3535}
pkgs/tools/misc/duc/default.nix+2−2
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
1919
2020 nativeBuildInputs = [ autoreconfHook pkgconfig ];
2121 buildInputs = [ tokyocabinet ncurses ] ++
22− stdenv.lib.optionals enableCairo [ cairo pango ];
22+ lib.optionals enableCairo [ cairo pango ];
2323
2424 configureFlags =
25− stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ];
25+ lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ];
2626
2727 meta = with lib; {
2828 homepage = "http://duc.zevv.nl/";
pkgs/tools/misc/dvtm/dvtm.nix+2−2
@@ -3,9 +3,9 @@ stdenv.mkDerivation {
33
44 inherit name src patches;
55
6− CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
6+ CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
77
8− postPatch = stdenv.lib.optionalString (customConfig != null) ''
8+ postPatch = lib.optionalString (customConfig != null) ''
99 cp ${builtins.toFile "config.h" customConfig} ./config.h
1010 '';
1111
pkgs/tools/misc/edid-decode/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit }:
1+{ lib, stdenv, fetchgit }:
22let
33 version = "2018-12-06";
44in stdenv.mkDerivation {
@@ -19,9 +19,9 @@ in stdenv.mkDerivation {
1919 meta = {
2020 description = "EDID decoder and conformance tester";
2121 homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/";
22− license = stdenv.lib.licenses.mit;
23− maintainers = [ stdenv.lib.maintainers.chiiruno ];
24− platforms = stdenv.lib.platforms.all;
22+ license = lib.licenses.mit;
23+ maintainers = [ lib.maintainers.chiiruno ];
24+ platforms = lib.platforms.all;
2525 };
2626}
2727
pkgs/tools/misc/edid-generator/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchFromGitHub
33, dos2unix
44, edid-decode
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
2525 patchShebangs modeline2edid
2626 '';
2727
28− configurePhase = (stdenv.lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines);
28+ configurePhase = (lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines);
2929
3030 installPhase = ''
3131 install -Dm 444 *.bin -t "$out/lib/firmware/edid"
@@ -34,8 +34,8 @@ in stdenv.mkDerivation {
3434 meta = {
3535 description = "Hackerswork to generate an EDID blob from given Xorg Modelines";
3636 homepage = "https://github.com/akatrevorjay/edid-generator";
37− license = stdenv.lib.licenses.mit;
38− maintainers = [ stdenv.lib.maintainers.flokli ];
39− platforms = stdenv.lib.platforms.all;
37+ license = lib.licenses.mit;
38+ maintainers = [ lib.maintainers.flokli ];
39+ platforms = lib.platforms.all;
4040 };
4141}
pkgs/tools/misc/emv/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 pname = "emv";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020 meta = {
2121 homepage = "http://www.i0i0.de/toolchest/emv";
2222 description = "Editor Move: Rename files with your favourite text editor";
23− license = stdenv.lib.licenses.publicDomain;
24− platforms = stdenv.lib.platforms.unix;
23+ license = lib.licenses.publicDomain;
24+ platforms = lib.platforms.unix;
2525 };
2626}
pkgs/tools/misc/ent/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414
1515 buildInputs = [ unzip ];
1616
17− buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang";
17+ buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
1818
1919 installPhase = ''
2020 mkdir -p $out/bin
pkgs/tools/misc/envchain/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 nativeBuildInputs = [ pkg-config ];
1919
2020 buildInputs = [ libsecret readline ]
21− ++ stdenv.lib.optionals stdenv.isDarwin [ libedit ncurses Security ];
21+ ++ lib.optionals stdenv.isDarwin [ libedit ncurses Security ];
2222
2323 makeFlags = [ "DESTDIR=$(out)" ];
2424
pkgs/tools/misc/envdir-go/default.nix+3−3
@@ -1,5 +1,5 @@
11# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
2−{ stdenv, buildGoPackage, fetchFromGitHub }:
2+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
33
44buildGoPackage rec {
55 version = "1.0.0";
@@ -16,12 +16,12 @@ buildGoPackage rec {
1616
1717 preBuild = ''
1818 # TODO: is there a way to get the commit ref so we can set main.buildCommit?
19− buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}")
19+ buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}")
2020'';
2121
2222 meta = {
2323 description = "A go rewrite of envdir";
2424 homepage = "https://github.com/d10n/envdir";
25− maintainers = with stdenv.lib.maintainers; [ edude03 ];
25+ maintainers = with lib.maintainers; [ edude03 ];
2626 };
2727}
pkgs/tools/misc/eot-utilities/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig }:
1+{lib, stdenv, fetchurl, pkgconfig }:
22
33stdenv.mkDerivation rec {
44 pname = "eot_utilities";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
1414 meta = {
1515 homepage = "http://www.w3.org/Tools/eot-utils/";
1616 description = "Create Embedded Open Type from OpenType or TrueType font";
17− license = stdenv.lib.licenses.w3c;
18− maintainers = with stdenv.lib.maintainers; [ leenaars ];
19− platforms = with stdenv.lib.platforms; unix;
17+ license = lib.licenses.w3c;
18+ maintainers = with lib.maintainers; [ leenaars ];
19+ platforms = with lib.platforms; unix;
2020 };
2121}
pkgs/tools/misc/etcher/default.nix+1−1
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
7373 postFixup = ''
7474 makeWrapper ${electron}/bin/electron $out/bin/${pname} \
7575 --add-flags $out/share/${pname}/resources/app.asar \
76− --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
76+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
7777 '';
7878
7979 meta = with lib; {
pkgs/tools/misc/exa/default.nix+1−1
@@ -28,7 +28,7 @@ buildRustPackage rec {
2828
2929 nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ];
3030 buildInputs = [ zlib ]
31− ++ stdenv.lib.optionals stdenv.isDarwin [
31+ ++ lib.optionals stdenv.isDarwin [
3232 libiconv darwin.apple_sdk.frameworks.Security ]
3333 ;
3434
pkgs/tools/misc/expect/default.nix+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 wrapProgram $i \
3030 --prefix PATH : "${tcl}/bin" \
3131 --prefix TCLLIBPATH ' ' $out/lib/* \
32− ${stdenv.lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"}
32+ ${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"}
3333 done
3434 '';
3535
pkgs/tools/misc/fasd/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub } :
1+{ lib, stdenv, fetchFromGitHub } :
22
33stdenv.mkDerivation rec {
44 pname = "fasd";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 homepage = "https://github.com/clvv/${pname}";
2020 description = "Quick command-line access to files and directories for POSIX shells";
21− license = stdenv.lib.licenses.mit;
21+ license = lib.licenses.mit;
2222
2323 longDescription = ''
2424 Fasd is a command-line productivity booster.
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
2828 command line.
2929 '';
3030
31− platforms = stdenv.lib.platforms.all;
31+ platforms = lib.platforms.all;
3232 };
3333}
pkgs/tools/misc/ffsend/default.nix+1−1
@@ -32,7 +32,7 @@ buildRustPackage rec {
3232 if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ])
3333 else [ openssl ];
3434
35− preBuild = stdenv.lib.optionalString (x11Support && usesX11) (
35+ preBuild = lib.optionalString (x11Support && usesX11) (
3636 if preferXsel && xsel != null then ''
3737 export XSEL_PATH="${xsel}/bin/xsel"
3838 '' else ''
pkgs/tools/misc/figlet/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch }:
1+{ lib, stdenv, fetchurl, fetchpatch }:
22
33stdenv.mkDerivation {
44 name = "figlet-2.2.5";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
2424 meta = {
2525 description = "Program for making large letters out of ordinary text";
2626 homepage = "http://www.figlet.org/";
27− license = stdenv.lib.licenses.afl21;
28− platforms = stdenv.lib.platforms.unix;
27+ license = lib.licenses.afl21;
28+ platforms = lib.platforms.unix;
2929 };
3030}
pkgs/tools/misc/file/default.nix+3−3
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
1818 ./webassembly-format-fix.patch
1919 ];
2020
21− nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
21+ nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
2222 buildInputs = [ zlib ]
23− ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx;
23+ ++ lib.optional stdenv.hostPlatform.isWindows libgnurx;
2424
2525 doCheck = true;
2626
27− makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file";
27+ makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file";
2828
2929 meta = with lib; {
3030 homepage = "https://darwinsys.com/file";
pkgs/tools/misc/fileschanged/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gamin }:
1+{ lib, stdenv, fetchurl, gamin }:
22
33stdenv.mkDerivation rec {
44 name = "fileschanged-0.6.9";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 meta = {
1818 homepage = "https://www.nongnu.org/fileschanged/";
1919 description = "A command-line utility that reports when files have been altered";
20− license = stdenv.lib.licenses.gpl3Plus;
20+ license = lib.licenses.gpl3Plus;
2121
2222 longDescription = ''
2323 This utility is a client to FAM (File Alteration Monitor) servers
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
2727 standard-output or executes a given command.
2828 '';
2929
30− platforms = stdenv.lib.platforms.linux;
30+ platforms = lib.platforms.linux;
3131 };
3232}
pkgs/tools/misc/findutils/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl
1+{ lib, stdenv, fetchurl
22, coreutils
33}:
44
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 patches = [ ./no-install-statedir.patch ]
2424 # fix gnulib tests on 32-bit ARM. Included on findutils master.
2525 # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html
26− ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;
26+ ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;
2727
2828 buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
2929
@@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
6464 * xargs - build and execute command lines from standard input.
6565 '';
6666
67− platforms = stdenv.lib.platforms.all;
67+ platforms = lib.platforms.all;
6868
69− license = stdenv.lib.licenses.gpl3Plus;
69+ license = lib.licenses.gpl3Plus;
7070 };
7171}
pkgs/tools/misc/fondu/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 version = "060102";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 hardeningDisable = [ "fortify" ];
1515
1616 meta = {
17− platforms = stdenv.lib.platforms.unix;
18− license = stdenv.lib.licenses.gpl3;
17+ platforms = lib.platforms.unix;
18+ license = lib.licenses.gpl3;
1919 };
2020}
pkgs/tools/misc/fontforge/default.nix+3−3
@@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
7676 meta = {
7777 description = "A font editor";
7878 homepage = "http://fontforge.github.io";
79− platforms = stdenv.lib.platforms.all;
80− license = stdenv.lib.licenses.bsd3;
81− maintainers = [ stdenv.lib.maintainers.erictapen ];
79+ platforms = lib.platforms.all;
80+ license = lib.licenses.bsd3;
81+ maintainers = [ lib.maintainers.erictapen ];
8282 };
8383}
pkgs/tools/misc/fpp/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python3 }:
1+{ lib, stdenv, fetchFromGitHub, python3 }:
22
33stdenv.mkDerivation rec {
44 pname = "fpp";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 meta = {
2525 description = "CLI program that accepts piped input and presents files for selection";
2626 homepage = "https://facebook.github.io/PathPicker/";
27− license = stdenv.lib.licenses.bsd3;
28− platforms = stdenv.lib.platforms.all;
27+ license = lib.licenses.bsd3;
28+ platforms = lib.platforms.all;
2929 };
3030}
pkgs/tools/misc/fx_cast/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 # See now-cli/default.nix
3232 dontStrip = true;
3333 preFixup = let
34− libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc];
34+ libPath = lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc];
3535 bin = "$out/bin/${pname}";
3636 in ''
3737
pkgs/tools/misc/gams/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}:
1+{ lib, stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}:
22
33assert licenseFile != null;
44
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 cp -a * "$out/share/gams"
1919
2020 cp ${licenseFile} $out/share/gams/gamslice.txt
21− '' + stdenv.lib.optionalString (optgamsFile != null) ''
21+ '' + lib.optionalString (optgamsFile != null) ''
2222 cp ${optgamsFile} $out/share/gams/optgams.def
2323 ln -s $out/share/gams/optgams.def $out/bin/optgams.def
2424 '';
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 done
3636 '';
3737
38− meta = with stdenv.lib;{
38+ meta = with lib;{
3939 description = "General Algebraic Modeling System";
4040 longDescription = ''
4141 The General Algebraic Modeling System is a high-level modeling system for mathematical optimization.
pkgs/tools/misc/gawp/default.nix+3−3
@@ -1,10 +1,10 @@
1−{ stdenv, buildGoPackage, fetchgit }:
1+{ lib, stdenv, buildGoPackage, fetchgit }:
22
33with builtins;
44
55buildGoPackage rec {
66 pname = "gawp";
7− version = "20160121-${stdenv.lib.strings.substring 0 7 rev}";
7+ version = "20160121-${lib.strings.substring 0 7 rev}";
88 rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
99
1010 goPackagePath = "github.com/martingallagher/gawp";
@@ -20,6 +20,6 @@ buildGoPackage rec {
2020 meta = {
2121 homepage = "https://github.com/martingallagher/gawp";
2222 description = "A simple, configurable, file watching, job execution tool";
23− license = stdenv.lib.licenses.asl20;
23+ license = lib.licenses.asl20;
2424 };
2525}
pkgs/tools/misc/gbdfed/default.nix+6−6
@@ -1,4 +1,4 @@
1− { stdenv, fetchurl, pkgconfig, freetype, gtk }:
1+ { lib, stdenv, fetchurl, pkgconfig, freetype, gtk }:
22
33stdenv.mkDerivation rec {
44 version = "1.6";
@@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
2020 description = "Bitmap Font Editor";
2121 longDescription = ''
2222 gbdfed lets you interactively create new bitmap font files or modify existing ones.
23− It allows editing multiple fonts and multiple glyphs,
23+ It allows editing multiple fonts and multiple glyphs,
2424 it allows cut and paste operations between fonts and glyphs and editing font properties.
25− The editor works natively with BDF fonts.
25+ The editor works natively with BDF fonts.
2626 '';
2727 homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/";
28− license = stdenv.lib.licenses.mit;
29− maintainers = [ stdenv.lib.maintainers.linquize ];
30− platforms = stdenv.lib.platforms.all;
28+ license = lib.licenses.mit;
29+ maintainers = [ lib.maintainers.linquize ];
30+ platforms = lib.platforms.all;
3131 };
3232}
pkgs/tools/misc/geekbench/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727
2828 for f in geekbench5 geekbench_x86_64 ; do
2929 patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f
30− wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/"
30+ wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/"
3131 done
3232 '';
3333
pkgs/tools/misc/getopt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
44 pname = "getopt";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 ];
1717
1818 meta = {
19− platforms = stdenv.lib.platforms.unix;
19+ platforms = lib.platforms.unix;
2020 homepage = "http://frodo.looijaard.name/project/getopt";
2121 description = "Parses command-line arguments from shell scripts";
2222 };
pkgs/tools/misc/gibo/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, coreutils, findutils, git }:
1+{ lib, stdenv, fetchFromGitHub, coreutils, findutils, git }:
22
33stdenv.mkDerivation rec {
44 pname = "gibo";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
2727
2828 meta = {
2929 homepage = "https://github.com/simonwhitaker/gibo";
30− license = stdenv.lib.licenses.publicDomain;
30+ license = lib.licenses.publicDomain;
3131 description = "A shell script for easily accessing gitignore boilerplates";
32− platforms = stdenv.lib.platforms.unix;
32+ platforms = lib.platforms.unix;
3333 };
3434}
pkgs/tools/misc/gnokii/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez
1+{ lib, stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez
22, readline, pcsclite, libical, gtk2, glib, libXpm }:
33
44stdenv.mkDerivation rec {
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919 meta = {
2020 description = "Cellphone tool";
2121 homepage = "http://www.gnokii.org";
22− maintainers = [ stdenv.lib.maintainers.raskin ];
23− platforms = stdenv.lib.platforms.linux;
22+ maintainers = [ lib.maintainers.raskin ];
23+ platforms = lib.platforms.linux;
2424 broken = true; # 2018-04-10
2525 };
2626}
pkgs/tools/misc/goaccess/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }:
1+{ lib, stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 version = "1.4";
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
3131 meta = {
3232 description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems";
3333 homepage = "https://goaccess.io";
34− license = stdenv.lib.licenses.mit;
35− platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
36− maintainers = with stdenv.lib.maintainers; [ ederoyd46 ];
34+ license = lib.licenses.mit;
35+ platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
36+ maintainers = with lib.maintainers; [ ederoyd46 ];
3737 };
3838}
pkgs/tools/misc/gosu/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, buildGoPackage, fetchgit }:
1+{ lib, stdenv, buildGoPackage, fetchgit }:
22
33buildGoPackage rec {
44 pname = "gosu";
@@ -18,7 +18,7 @@ buildGoPackage rec {
1818 meta = {
1919 description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su";
2020 homepage = "https://github.com/tianon/gosu";
21− license = stdenv.lib.licenses.gpl3;
22− platforms = stdenv.lib.platforms.linux;
21+ license = lib.licenses.gpl3;
22+ platforms = lib.platforms.linux;
2323 };
2424}
pkgs/tools/misc/gparted/default.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
2929 preFixup = ''
3030 gappsWrapperArgs+=(
31− --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}"
31+ --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}"
3232 )
3333 '';
3434
pkgs/tools/misc/graylog/plugins.nix+2−2
@@ -1,4 +1,4 @@
1−{ pkgs, stdenv, fetchurl, unzip, graylog }:
1+{ pkgs, lib, stdenv, fetchurl, unzip, graylog }:
22
33with pkgs.lib;
44
@@ -77,7 +77,7 @@ in {
7777 meta = {
7878 homepage = "https://docs.graylog.org/en/3.3/pages/integrations.html#enterprise";
7979 description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)";
80− license = stdenv.lib.licenses.unfree;
80+ license = lib.licenses.unfree;
8181 };
8282 };
8383 filter-messagesize = glPlugin rec {
pkgs/tools/misc/grex/default.nix+1−1
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
1919 sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs";
2020 };
2121
22− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
22+ buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
2323
2424 doInstallCheck = true;
2525 installCheckPhase = ''
pkgs/tools/misc/gringo/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
2323 ./gringo-4.5.4-to_string.patch
2424 ];
2525
26− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
26+ postPatch = lib.optionalString stdenv.isDarwin ''
2727 substituteInPlace ./SConstruct \
2828 --replace \
2929 "env['CXX'] = 'g++'" \
pkgs/tools/misc/grub/2.0x.nix+1−1
@@ -7,7 +7,7 @@
77, xenSupport ? false
88}:
99
10−with stdenv.lib;
10+with lib;
1111let
1212 pcSystems = {
1313 i686-linux.target = "i386";
pkgs/tools/misc/grub/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 # grub-install isn't smart enough.
1515 ./symlink.patch
1616 ]
17− ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch)
17+ ++ (lib.optional buggyBiosCDSupport ./buggybios.patch)
1818 ++ map fetchurl (import ./grub1.patches.nix)
1919 ;
2020
pkgs/tools/misc/grub/pvgrub_image/default.nix+1−1
@@ -1,6 +1,6 @@
11{ lib, stdenv, grub2_xen }:
22
3−with stdenv.lib;
3+with lib;
44let
55 efiSystemsBuild = {
66 i686-linux.target = "i386";
pkgs/tools/misc/grub/trusted.nix+1−1
@@ -3,7 +3,7 @@
33, for_HP_laptop ? false
44}:
55
6−with stdenv.lib;
6+with lib;
77let
88 pcSystems = {
99 i686-linux.target = "i386";
pkgs/tools/misc/gsmartcontrol/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }:
1+{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }:
22
33stdenv.mkDerivation rec {
44 version="1.1.3";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 preFixup = ''
2222 gappsWrapperArgs+=(
23− --prefix PATH : "${stdenv.lib.makeBinPath [ smartmontools ]}"
23+ --prefix PATH : "${lib.makeBinPath [ smartmontools ]}"
2424 )
2525 '';
2626
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
3636 as well as run various tests on it.
3737 '';
3838 homepage = "https://gsmartcontrol.sourceforge.io/";
39− license = stdenv.lib.licenses.gpl2Plus;
40− maintainers = with stdenv.lib.maintainers; [qknight];
41− platforms = with stdenv.lib.platforms; linux;
39+ license = lib.licenses.gpl2Plus;
40+ maintainers = with lib.maintainers; [qknight];
41+ platforms = with lib.platforms; linux;
4242 };
4343}
pkgs/tools/misc/hdf4/default.nix+8−8
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444
4545 nativeBuildInputs = [
4646 cmake
47− ] ++ stdenv.lib.optionals stdenv.isDarwin [
47+ ] ++ lib.optionals stdenv.isDarwin [
4848 fixDarwinDylibNames
4949 ];
5050
@@ -52,16 +52,16 @@ stdenv.mkDerivation rec {
5252 libjpeg
5353 szip
5454 zlib
55− ] ++ stdenv.lib.optionals uselibtirpc [
55+ ] ++ lib.optionals uselibtirpc [
5656 libtirpc
5757 ];
5858
59− preConfigure = stdenv.lib.optionalString uselibtirpc ''
59+ preConfigure = lib.optionalString uselibtirpc ''
6060 # Make tirpc discovery work with CMAKE_PREFIX_PATH
6161 substituteInPlace config/cmake/FindXDR.cmake \
6262 --replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \
6363 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)'
64− '' + stdenv.lib.optionalString (szip != null) ''
64+ '' + lib.optionalString (szip != null) ''
6565 export SZIP_INSTALL=${szip}
6666 '';
6767
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
7575 "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON"
7676 "-DHDF4_BUILD_FORTRAN=OFF"
7777 "-DJPEG_DIR=${libjpeg}"
78− ] ++ stdenv.lib.optionals (szip != null) [
78+ ] ++ lib.optionals (szip != null) [
7979 "-DHDF4_ENABLE_SZIP_ENCODING=ON"
8080 "-DHDF4_ENABLE_SZIP_SUPPORT=ON"
8181 ];
@@ -84,11 +84,11 @@ stdenv.mkDerivation rec {
8484
8585 preCheck = ''
8686 export LD_LIBRARY_PATH=$(pwd)/bin
87− '' + stdenv.lib.optionalString (stdenv.isDarwin) ''
87+ '' + lib.optionalString (stdenv.isDarwin) ''
8888 export DYLD_LIBRARY_PATH=$(pwd)/bin
8989 '';
9090
91− excludedTests = stdenv.lib.optionals stdenv.isDarwin [
91+ excludedTests = lib.optionals stdenv.isDarwin [
9292 "MFHDF_TEST-hdftest"
9393 "MFHDF_TEST-hdftest-shared"
9494 "HDP-dumpsds-18"
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
9696 ];
9797
9898 checkPhase = let excludedTestsRegex = if (excludedTests != [])
99− then "(" + (stdenv.lib.concatStringsSep "|" excludedTests) + ")"
99+ then "(" + (lib.concatStringsSep "|" excludedTests) + ")"
100100 else ""; in ''
101101 runHook preCheck
102102 ctest -E "${excludedTestsRegex}" --output-on-failure
pkgs/tools/misc/hdf5/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, removeReferencesTo
44, cpp ? false
@@ -13,7 +13,7 @@
1313# (--enable-unsupported could be used to force the build)
1414assert !cpp || mpi == null;
1515
16−let inherit (stdenv.lib) optional optionals; in
16+let inherit (lib) optional optionals; in
1717
1818stdenv.mkDerivation rec {
1919 version = "1.10.6";
@@ -67,8 +67,8 @@ stdenv.mkDerivation rec {
6767 applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and
6868 applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
6969 '';
70− license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant
70+ license = lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant
7171 homepage = "https://www.hdfgroup.org/HDF5/";
72− platforms = stdenv.lib.platforms.unix;
72+ platforms = lib.platforms.unix;
7373 };
7474}
pkgs/tools/misc/hdfjava/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, javac }:
1+{ lib, stdenv, fetchurl, cmake, javac }:
22
33stdenv.mkDerivation rec {
44 pname = "hdf-java";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
2020
2121 meta = {
2222 description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form";
23− license = stdenv.lib.licenses.free; # BSD-like
23+ license = lib.licenses.free; # BSD-like
2424 homepage = "https://support.hdfgroup.org/products/java/index.html";
25− platforms = stdenv.lib.platforms.linux;
25+ platforms = lib.platforms.linux;
2626 };
2727}
pkgs/tools/misc/hdfview/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ant, javac, hdf_java }:
1+{ lib, stdenv, fetchurl, ant, javac, hdf_java }:
22
33stdenv.mkDerivation rec {
44 pname = "hdfview";
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
3232
3333 meta = {
3434 description = "A visual tool for browsing and editing HDF4 and HDF5 files";
35− license = stdenv.lib.licenses.free; # BSD-like
35+ license = lib.licenses.free; # BSD-like
3636 homepage = "https://support.hdfgroup.org/products/java/index.html";
37− platforms = stdenv.lib.platforms.linux;
37+ platforms = lib.platforms.linux;
3838 };
3939}
pkgs/tools/misc/heimdall/default.nix+2−2
@@ -16,7 +16,7 @@ mkDerivation {
1616
1717 buildInputs = [
1818 zlib libusb1
19− ] ++ stdenv.lib.optional enableGUI qtbase;
19+ ] ++ lib.optional enableGUI qtbase;
2020 nativeBuildInputs = [ cmake ];
2121
2222 cmakeFlags = [
@@ -27,7 +27,7 @@ mkDerivation {
2727 preConfigure = ''
2828 # Give ownership of the Galaxy S USB device to the logged in user.
2929 substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
30− '' + stdenv.lib.optionalString stdenv.isDarwin ''
30+ '' + lib.optionalString stdenv.isDarwin ''
3131 substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" ""
3232 '';
3333
pkgs/tools/misc/hexd/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, stdenv, fetchFromGitHub }:
22
3−with stdenv.lib;
3+with lib;
44
55stdenv.mkDerivation rec {
66 pname = "hexd";
pkgs/tools/misc/hhpc/default.nix+1−1
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
2323 description = "Hides the mouse pointer in X11";
2424 maintainers = with maintainers; [ nico202 ];
2525 platforms = platforms.unix;
26− license = stdenv.lib.licenses.bsd3;
26+ license = lib.licenses.bsd3;
2727 };
2828}
pkgs/tools/misc/hyperfine/default.nix+1−1
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
1414 cargoSha256 = "12qdllhydd29xh20l5gir6qpj4a1nkzp8ics344rcwj8wsj7g5zw";
1515
1616 nativeBuildInputs = [ installShellFiles ];
17− buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
17+ buildInputs = lib.optional stdenv.isDarwin Security;
1818
1919 postInstall = ''
2020 installManPage doc/hyperfine.1
pkgs/tools/misc/i3cat/default.nix+2−2
@@ -1,8 +1,8 @@
1−{ stdenv, buildGoPackage, fetchgit }:
1+{ lib, stdenv, buildGoPackage, fetchgit }:
22
33buildGoPackage rec {
44 pname = "i3cat";
5− version = "20150321-${stdenv.lib.strings.substring 0 7 rev}";
5+ version = "20150321-${lib.strings.substring 0 7 rev}";
66 rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
77
88 goPackagePath = "github.com/vincent-petithory/i3cat";
pkgs/tools/misc/i3minator/default.nix+2−2
@@ -26,9 +26,9 @@ pythonPackages.buildPythonApplication rec {
2626 project is inspired by tmuxinator and uses i3-py.
2727 '';
2828 homepage = "https://github.com/carlesso/i3minator";
29− license = stdenv.lib.licenses.wtfpl;
29+ license = lib.licenses.wtfpl;
3030 maintainers = with maintainers; [ domenkozar ];
31− platforms = stdenv.lib.platforms.linux;
31+ platforms = lib.platforms.linux;
3232 };
3333
3434}
pkgs/tools/misc/idevicerestore/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 # Not listing other dependencies specified in
3333 # https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20
3434 # because they are inherited `libimobiledevice`.
35− ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
35+ ] ++ lib.optionals stdenv.isDarwin [ IOKit ];
3636
3737 meta = with lib; {
3838 homepage = "https://github.com/libimobiledevice/idevicerestore";
pkgs/tools/misc/idutils/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, emacs }:
1+{ fetchurl, lib, stdenv, emacs }:
22
33stdenv.mkDerivation rec {
44 name = "idutils-4.6";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sed -i '/gets is a security hole/d' lib/stdio.in.h
1616 '';
1717
18− buildInputs = stdenv.lib.optional stdenv.isLinux emacs;
18+ buildInputs = lib.optional stdenv.isLinux emacs;
1919
2020 doCheck = !stdenv.isDarwin;
2121
@@ -46,10 +46,10 @@ stdenv.mkDerivation rec {
4646 '';
4747
4848 homepage = "https://www.gnu.org/software/idutils/";
49− license = stdenv.lib.licenses.gpl3Plus;
49+ license = lib.licenses.gpl3Plus;
5050
5151 maintainers = [ ];
52− platforms = stdenv.lib.platforms.all;
52+ platforms = lib.platforms.all;
5353 broken = true;
5454 };
5555}
pkgs/tools/misc/intermodal/default.nix+1−1
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
1414 cargoSha256 = "0kf5afarfwcl47b40pwnslfvxmxllmb995vc5ls2lpz4cx0jwahn";
1515
1616 # include_hidden test tries to use `chflags` on darwin
17− checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
17+ checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
1818
1919 meta = with lib; {
2020 description = "User-friendly and featureful command-line BitTorrent metainfo utility";
pkgs/tools/misc/ipxe/default.nix+1−1
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
7575
7676 enableParallelBuilding = true;
7777
78− meta = with stdenv.lib;
78+ meta = with lib;
7979 { description = "Network boot firmware";
8080 homepage = "https://ipxe.org/";
8181 license = licenses.gpl2;
pkgs/tools/misc/ised/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "ised";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
1010
1111 meta = {
1212 description = "A numeric sequence editor";
13− maintainers = with stdenv.lib.maintainers; [ raskin ];
14− platforms = with stdenv.lib.platforms; linux;
15− license = stdenv.lib.licenses.gpl3Plus;
13+ maintainers = with lib.maintainers; [ raskin ];
14+ platforms = with lib.platforms; linux;
15+ license = lib.licenses.gpl3Plus;
1616 };
1717}
pkgs/tools/misc/ix/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 '';
1919
2020 postFixup = ''
21− wrapProgram $out/bin/ix --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
21+ wrapProgram $out/bin/ix --prefix PATH : "${lib.makeBinPath [ curl ]}"
2222 '';
2323
2424 meta = with lib; {
pkgs/tools/misc/jdupes/default.nix+2−2
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
1919
2020 makeFlags = [
2121 "PREFIX=${placeholder "out"}"
22− ] ++ stdenv.lib.optionals stdenv.isLinux [
22+ ] ++ lib.optionals stdenv.isLinux [
2323 "ENABLE_DEDUPE=1"
2424 "STATIC_DEDUPE_H=1"
25− ] ++ stdenv.lib.optionals stdenv.cc.isGNU [
25+ ] ++ lib.optionals stdenv.cc.isGNU [
2626 "HARDEN=1"
2727 ];
2828
pkgs/tools/misc/keychain/default.nix+13−13
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg
1+{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg
22, perl, procps, gnugrep, gawk, findutils, gnused }:
33
44stdenv.mkDerivation rec {
@@ -32,23 +32,23 @@ stdenv.mkDerivation rec {
3232 meta = {
3333 description = "Keychain management tool";
3434 homepage = "https://www.funtoo.org/Keychain";
35− license = stdenv.lib.licenses.gpl2;
35+ license = lib.licenses.gpl2;
3636 # other platforms are untested (AFAIK)
3737 platforms =
38− with stdenv.lib;
38+ with lib;
3939 platforms.linux ++ platforms.darwin;
40− maintainers = with stdenv.lib.maintainers; [ sigma ];
40+ maintainers = with lib.maintainers; [ sigma ];
4141 longDescription = ''
42− Keychain helps you to manage SSH and GPG keys in a convenient and secure
43− manner. It acts as a frontend to ssh-agent and ssh-add, but allows you
44− to easily have one long running ssh-agent process per system, rather
45− than the norm of one ssh-agent per login session.
42+ Keychain helps you to manage SSH and GPG keys in a convenient and secure
43+ manner. It acts as a frontend to ssh-agent and ssh-add, but allows you
44+ to easily have one long running ssh-agent process per system, rather
45+ than the norm of one ssh-agent per login session.
4646
47− This dramatically reduces the number of times you need to enter your
48− passphrase. With keychain, you only need to enter a passphrase once
49− every time your local machine is rebooted. Keychain also makes it easy
50− for remote cron jobs to securely "hook in" to a long-running ssh-agent
51− process, allowing your scripts to take advantage of key-based logins.
47+ This dramatically reduces the number of times you need to enter your
48+ passphrase. With keychain, you only need to enter a passphrase once
49+ every time your local machine is rebooted. Keychain also makes it easy
50+ for remote cron jobs to securely "hook in" to a long-running ssh-agent
51+ process, allowing your scripts to take advantage of key-based logins.
5252 '';
5353 };
5454}
pkgs/tools/misc/kisslicer/default.nix+1−1
@@ -7,7 +7,7 @@
77
88let
99
10− libPath = stdenv.lib.makeLibraryPath [
10+ libPath = lib.makeLibraryPath [
1111 libGLU libGL
1212 stdenv.cc.cc
1313 libX11
pkgs/tools/misc/kodi-cli/default.nix+4−4
@@ -3,7 +3,7 @@
33stdenv.mkDerivation rec {
44 pname = "kodi-cli";
55 version = "1.1.1";
6−
6+
77 src = fetchFromGitHub {
88 owner = "nawar";
99 repo = pname;
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
1616 installPhase = ''
1717 mkdir -p $out/bin
1818 cp -a kodi-cli $out/bin
19− wrapProgram $out/bin/kodi-cli --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash ]}
19+ wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]}
2020 cp -a playlist_to_kodi $out/bin
21− wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]}
21+ wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]}
2222 '';
23−
23+
2424 meta = with lib; {
2525 homepage = "https://github.com/nawar/kodi-cli";
2626 description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi";
pkgs/tools/misc/lbdb/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper
1+{ lib, stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper
22, abook ? null
33, gnupg ? null
44, goobook ? null
@@ -9,7 +9,7 @@
99let
1010 version = "0.48.1";
1111in
12−with stdenv.lib;
12+with lib;
1313with perlPackages;
1414stdenv.mkDerivation {
1515 pname = "lbdb";
pkgs/tools/misc/ldapvi/default.nix+1−1
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
2727 homepage = "http://www.lichteblau.com/ldapvi/";
2828 license = licenses.gpl2;
2929 maintainers = with maintainers; [ domenkozar ];
30− platforms = stdenv.lib.platforms.linux;
30+ platforms = lib.platforms.linux;
3131 };
3232}
pkgs/tools/misc/less/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.
13− ++ stdenv.lib.optional lessSecure [ "--with-secure" ];
13+ ++ lib.optional lessSecure [ "--with-secure" ];
1414
1515 buildInputs = [ ncurses ];
1616
pkgs/tools/misc/lockfile-progs/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, liblockfile }:
1+{ lib, stdenv, fetchurl, liblockfile }:
22
33stdenv.mkDerivation rec {
44 _name = "lockfile-progs";
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
2121 meta = {
2222 description = "Programs for locking and unlocking files and mailboxes";
2323 homepage = "http://packages.debian.org/sid/lockfile-progs";
24− license = stdenv.lib.licenses.gpl2;
24+ license = lib.licenses.gpl2;
2525
26− maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
27− platforms = stdenv.lib.platforms.all;
26+ maintainers = [ lib.maintainers.bluescreen303 ];
27+ platforms = lib.platforms.all;
2828 };
2929}
pkgs/tools/misc/logstash/6.x.nix+1−1
@@ -6,7 +6,7 @@
66, jre
77}:
88
9−with stdenv.lib;
9+with lib;
1010
1111stdenv.mkDerivation rec {
1212 version = elk6Version;
pkgs/tools/misc/logstash/7.x.nix+1−1
@@ -6,7 +6,7 @@
66, jre
77}:
88
9−with stdenv.lib;
9+with lib;
1010
1111stdenv.mkDerivation rec {
1212 version = elk7Version;
pkgs/tools/misc/logstash/contrib.nix+2−2
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
2626 meta = with lib; {
2727 description = "Community-maintained logstash plugins";
2828 homepage = "https://github.com/elasticsearch/logstash-contrib";
29− license = stdenv.lib.licenses.asl20;
30− platforms = stdenv.lib.platforms.unix;
29+ license = lib.licenses.asl20;
30+ platforms = lib.platforms.unix;
3131 maintainers = with maintainers; [ cstrahan ];
3232 };
3333}
pkgs/tools/misc/lorri/default.nix+1−1
@@ -47,7 +47,7 @@ in (rustPlatform.buildRustPackage rec {
4747
4848 nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ];
4949 buildInputs =
50− stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
50+ lib.optionals stdenv.isDarwin [ CoreServices Security ];
5151
5252 # copy the docs to the $man and $doc outputs
5353 postInstall = ''
pkgs/tools/misc/man-db/default.nix+3−3
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
3838 "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
3939 "--with-pager=less"
40− ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin [
40+ ] ++ lib.optional stdenv.hostPlatform.isDarwin [
4141 "ac_cv_func__set_invalid_parameter_handler=no"
4242 "ac_cv_func_posix_fadvise=no"
4343 "ac_cv_func_mempcpy=no"
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 done
5757 '';
5858
59− postFixup = stdenv.lib.optionalString (buildPackages.groff != groff) ''
59+ postFixup = lib.optionalString (buildPackages.groff != groff) ''
6060 # Check to make sure none of the outputs depend on build-time-only groff:
6161 for outName in $outputs; do
6262 out=''${!outName}
@@ -76,6 +76,6 @@ stdenv.mkDerivation rec {
7676 homepage = "http://man-db.nongnu.org";
7777 description = "An implementation of the standard Unix documentation system accessed using the man command";
7878 license = licenses.gpl2;
79− platforms = stdenv.lib.platforms.unix;
79+ platforms = lib.platforms.unix;
8080 };
8181}
pkgs/tools/misc/mbuffer/default.nix+6−6
@@ -1,5 +1,5 @@
1−{ stdenv, fetchurl,
2− openssl,
1+{ lib, stdenv, fetchurl,
2+ openssl,
33 } :
44
55stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 # objdump binary during cross-building for foreign platforms.
1818 # The correct objdump is exposed via the environment variable
1919 # $OBJDUMP, which should be used in such cases.
20− preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
20+ preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
2121 substituteInPlace configure --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}'
2222 '';
2323 doCheck = true;
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
2525 meta = {
2626 homepage = "http://www.maier-komor.de/mbuffer.html";
2727 description = "A tool for buffering data streams with a large set of unique features";
28− license = stdenv.lib.licenses.gpl3;
29− maintainers = with stdenv.lib.maintainers; [ tokudan ];
30− platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
28+ license = lib.licenses.gpl3;
29+ maintainers = with lib.maintainers; [ tokudan ];
30+ platforms = lib.platforms.linux; # Maybe other non-darwin Unix
3131 };
3232}
pkgs/tools/misc/mc/default.nix+1−1
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 slang
4242 unzip
4343 zip
44− ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
44+ ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
4545
4646 enableParallelBuilding = true;
4747
pkgs/tools/misc/mcrypt/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libmcrypt, libmhash }:
1+{ lib, stdenv, fetchurl, libmcrypt, libmhash }:
22
33stdenv.mkDerivation rec {
44 version = "2.6.8";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
2727 ever-wider range of algorithms and modes.
2828 '';
2929 homepage = "http://mcrypt.sourceforge.net";
30− license = stdenv.lib.licenses.gpl3Only;
31− platforms = stdenv.lib.platforms.all;
32− maintainers = [ stdenv.lib.maintainers.qknight ];
30+ license = lib.licenses.gpl3Only;
31+ platforms = lib.platforms.all;
32+ maintainers = [ lib.maintainers.qknight ];
3333 };
3434}
pkgs/tools/misc/megacli/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }:
1+{ lib, stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }:
22
33stdenv.mkDerivation rec {
44 pname = "megacli";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 buildInputs = [rpmextract ncurses5 unzip];
1313 libPath =
14− stdenv.lib.makeLibraryPath
14+ lib.makeLibraryPath
1515 [ stdenv.cc.cc stdenv.cc.libc ncurses5 ];
1616
1717 buildCommand = ''
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333
3434 meta = {
3535 description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards";
36− license = stdenv.lib.licenses.unfree;
36+ license = lib.licenses.unfree;
3737 platforms = [ "x86_64-linux" ];
3838 };
3939}
pkgs/tools/misc/memtest86+/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit }:
1+{ lib, stdenv, fetchgit }:
22
33stdenv.mkDerivation {
44 pname = "memtest86+";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
2525 meta = {
2626 homepage = "http://www.memtest.org/";
2727 description = "A tool to detect memory errors";
28− license = stdenv.lib.licenses.gpl2;
28+ license = lib.licenses.gpl2;
2929 platforms = [ "x86_64-linux" "i686-linux" ];
3030 };
3131}
pkgs/tools/misc/minicom/default.nix+2−2
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 sha256 = "0j95727xni4r122dalp09963gvc1nqa18l1d4wzz8746kw5s2rrb";
1313 };
1414
15− buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
15+ buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin libiconv;
1616
1717 nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
1818
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
3434 postInstall = ''
3535 for f in $out/bin/*minicom ; do
3636 wrapProgram $f \
37− --prefix PATH : ${stdenv.lib.makeBinPath [ lrzsz ]}:$out/bin
37+ --prefix PATH : ${lib.makeBinPath [ lrzsz ]}:$out/bin
3838 done
3939 '';
4040
pkgs/tools/misc/miniserve/default.nix+1−1
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
2020 cargoSha256 = "0s1gdngpf6gxz2lyapblxxmc6aydg2i9kmrfvngkbmqh4as1a2vl";
2121
2222 nativeBuildInputs = [ pkg-config zlib ];
23− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
23+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
2424
2525 meta = with lib; {
2626 description = "For when you really just want to serve some files over HTTP right now!";
pkgs/tools/misc/mktorrent/default.nix+5−5
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, openssl}:
1+{lib, stdenv, fetchFromGitHub, openssl}:
22
33stdenv.mkDerivation rec {
44 pname = "mktorrent";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 makeFlags = [ "USE_PTHREADS=1" "USE_OPENSSL=1" "USE_LONG_OPTIONS=1" ]
15− ++ stdenv.lib.optional stdenv.isi686 "USE_LARGE_FILES=1"
16− ++ stdenv.lib.optional stdenv.isLinux "CFLAGS=-lgcc_s";
15+ ++ lib.optional stdenv.isi686 "USE_LARGE_FILES=1"
16+ ++ lib.optional stdenv.isLinux "CFLAGS=-lgcc_s";
1717
1818 installFlags = [ "PREFIX=${placeholder "out"}" ];
1919
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121
2222 meta = {
2323 homepage = "http://mktorrent.sourceforge.net/";
24− license = stdenv.lib.licenses.gpl2Plus;
24+ license = lib.licenses.gpl2Plus;
2525 description = "Command line utility to create BitTorrent metainfo files";
26− maintainers = with stdenv.lib.maintainers; [Profpatsch];
26+ maintainers = with lib.maintainers; [Profpatsch];
2727 };
2828}
pkgs/tools/misc/mlocate/default.nix+1−1
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, config }:
22
33let
4− dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config;
4+ dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config;
55in stdenv.mkDerivation rec {
66 pname = "mlocate";
77 version = "0.26";
pkgs/tools/misc/mmv/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "mmv";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 meta = {
4444 homepage = "http://linux.maruhn.com/sec/mmv.html";
4545 description = "Utility for wildcard renaming, copying, etc";
46− license = stdenv.lib.licenses.gpl2;
47− platforms = stdenv.lib.platforms.linux;
46+ license = lib.licenses.gpl2;
47+ platforms = lib.platforms.linux;
4848 };
4949}
pkgs/tools/misc/mongodb-compass/default.nix+1−1
@@ -5,7 +5,7 @@
55let
66 version = "1.23.0";
77
8− rpath = stdenv.lib.makeLibraryPath [
8+ rpath = lib.makeLibraryPath [
99 alsaLib
1010 at-spi2-atk
1111 at-spi2-core
pkgs/tools/misc/mongodb-tools/default.nix+1−1
@@ -44,7 +44,7 @@ in buildGoPackage {
4444 # move vendored codes so nixpkgs go builder could find it
4545 runHook preBuild
4646
47− ${stdenv.lib.concatMapStrings (t: ''
47+ ${lib.concatMapStrings (t: ''
4848 go build -o "$out/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main
4949 '') tools}
5050
pkgs/tools/misc/moreutils/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perlPackages, makeWrapper, darwin }:
1+{ lib, stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perlPackages, makeWrapper, darwin }:
22
3−with stdenv.lib;
3+with lib;
44stdenv.mkDerivation rec {
55 pname = "moreutils";
66 version = "0.63";
pkgs/tools/misc/mrtg/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl, gd, rrdtool }:
1+{ lib, stdenv, fetchurl, perl, gd, rrdtool }:
22
33stdenv.mkDerivation rec {
44
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
1717 meta = {
1818 description = "The Multi Router Traffic Grapher";
1919 homepage = "https://oss.oetiker.ch/mrtg/";
20− license = stdenv.lib.licenses.gpl2;
21− maintainers = [ stdenv.lib.maintainers.robberer ];
22− platforms = stdenv.lib.platforms.unix;
20+ license = lib.licenses.gpl2;
21+ maintainers = [ lib.maintainers.robberer ];
22+ platforms = lib.platforms.unix;
2323 };
2424}
pkgs/tools/misc/multitail/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ncurses, pkg-config }:
1+{ lib, stdenv, fetchurl, ncurses, pkg-config }:
22
33stdenv.mkDerivation rec {
44 version = "6.5.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ ncurses ];
1515
16− makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ];
16+ makeFlags = lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ];
1717
1818 installPhase = ''
1919 mkdir -p $out/bin
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
2323 meta = {
2424 homepage = "http://www.vanheusden.com/multitail/";
2525 description = "tail on Steroids";
26− maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
27− platforms = stdenv.lib.platforms.unix;
28− license = stdenv.lib.licenses.gpl2Plus;
26+ maintainers = with lib.maintainers; [ matthiasbeyer ];
27+ platforms = lib.platforms.unix;
28+ license = lib.licenses.gpl2Plus;
2929 };
3030}
pkgs/tools/misc/multitime/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "multitime";
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
3232 performance.
3333 '';
3434
35− license = stdenv.lib.licenses.mit;
35+ license = lib.licenses.mit;
3636 homepage = "https://tratt.net/laurie/src/multitime/";
37− platforms = stdenv.lib.platforms.unix;
37+ platforms = lib.platforms.unix;
3838 };
3939}
pkgs/tools/misc/mysql2pgsql/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl }:
1+{ lib, stdenv, fetchurl, perl }:
22
33# The homepage says this script is mature..
44stdenv.mkDerivation {
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 meta = {
2020 description = "Convert MySQL dump files to PostgreSQL-loadable files";
2121 homepage = "https://pgfoundry.org/projects/mysql2pgsql/";
22− license = stdenv.lib.licenses.bsdOriginal;
23− platforms = stdenv.lib.platforms.unix;
22+ license = lib.licenses.bsdOriginal;
23+ platforms = lib.platforms.unix;
2424 };
2525}
pkgs/tools/misc/nbench/default.nix+1−1
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
2626 homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html";
2727 description = "A synthetic computing benchmark program";
2828 platforms = platforms.linux;
29− maintainers = with stdenv.lib.maintainers; [ bennofs ];
29+ maintainers = with lib.maintainers; [ bennofs ];
3030 };
3131}
pkgs/tools/misc/ocz-ssd-guru/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }:
1+{ fetchurl, lib, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }:
22
33let
44 system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 buildInputs = [ makeWrapper ];
1616
17− libPath = stdenv.lib.makeLibraryPath [
17+ libPath = lib.makeLibraryPath [
1818 xorg.libX11
1919 xorg.libxcb
2020 freetype
@@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
4545 meta = {
4646 homepage = "http://ocz.com/ssd-guru";
4747 description = "SSD Management Tool for OCZ disks";
48− license = stdenv.lib.licenses.unfree;
49− platforms = stdenv.lib.platforms.linux;
50− maintainers = with stdenv.lib.maintainers; [ jagajaga ];
48+ license = lib.licenses.unfree;
49+ platforms = lib.platforms.linux;
50+ maintainers = with lib.maintainers; [ jagajaga ];
5151 };
5252
5353}
pkgs/tools/misc/opencorsairlink/default.nix+1−1
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
2121 homepage = "https://github.com/audiohacked/OpenCorsairLink";
2222 license = licenses.gpl2;
2323 platforms = platforms.all;
24− maintainers = [ stdenv.lib.maintainers.expipiplus1 ];
24+ maintainers = [ lib.maintainers.expipiplus1 ];
2525 };
2626}
pkgs/tools/misc/opentsdb/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 description = "Time series database with millisecond precision";
3131 homepage = "http://opentsdb.net";
3232 license = licenses.lgpl21Plus;
33− platforms = stdenv.lib.platforms.linux;
33+ platforms = lib.platforms.linux;
3434 maintainers = [ ];
3535 };
3636}
pkgs/tools/misc/os-prober/default.nix+1−1
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 done;
5757 for file in $out/bin/*; do
5858 wrapProgram $file \
59− --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \
59+ --suffix PATH : ${lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \
6060 --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober"
6161 done;
6262 '';
pkgs/tools/misc/osm2pgsql/default.nix+3−3
@@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
2828 nativeBuildInputs = [ cmake ];
2929
3030 buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ]
31− ++ stdenv.lib.optional withLuaJIT luajit
32− ++ stdenv.lib.optional (!withLuaJIT) lua;
31+ ++ lib.optional withLuaJIT luajit
32+ ++ lib.optional (!withLuaJIT) lua;
3333
3434 cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ]
35− ++ stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";
35+ ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";
3636
3737 NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
3838
pkgs/tools/misc/ostree/default.nix+1−1
@@ -119,7 +119,7 @@ in stdenv.mkDerivation rec {
119119 '';
120120
121121 postFixup = let
122− typelibPath = stdenv.lib.makeSearchPath "/lib/girepository-1.0" [
122+ typelibPath = lib.makeSearchPath "/lib/girepository-1.0" [
123123 (placeholder "out")
124124 gobject-introspection
125125 ];
pkgs/tools/misc/otfcc/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 ./move-makefiles.patch
1919 ];
2020
21− buildFlags = stdenv.lib.optional stdenv.isAarch64 [ "config=release_arm" ];
21+ buildFlags = lib.optional stdenv.isAarch64 [ "config=release_arm" ];
2222
2323 installPhase = ''
2424 mkdir -p $out/bin
pkgs/tools/misc/pal/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, glib, gettext, readline, pkgconfig }:
1+{lib, stdenv, fetchurl, glib, gettext, readline, pkgconfig }:
22
33stdenv.mkDerivation rec {
44 name = "pal-0.4.3";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
2222 meta = {
2323 homepage = "http://palcal.sourceforge.net/";
2424 description = "Command-line calendar program that can keep track of events";
25− license = stdenv.lib.licenses.gpl2;
26− maintainers = with stdenv.lib.maintainers; [viric];
27− platforms = with stdenv.lib.platforms; linux;
25+ license = lib.licenses.gpl2;
26+ maintainers = with lib.maintainers; [viric];
27+ platforms = with lib.platforms; linux;
2828 };
2929}
pkgs/tools/misc/parallel/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 postInstall = ''
2525 wrapProgram $out/bin/parallel \
26− --prefix PATH : "${stdenv.lib.makeBinPath [ procps perl ]}"
26+ --prefix PATH : "${lib.makeBinPath [ procps perl ]}"
2727 '';
2828
2929 doCheck = true;
pkgs/tools/misc/parted/default.nix+8−8
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, fetchpatch
44, lvm2
@@ -29,16 +29,16 @@ stdenv.mkDerivation rec {
2929 '';
3030
3131 buildInputs = [ libuuid ]
32− ++ stdenv.lib.optional (readline != null) readline
33− ++ stdenv.lib.optional (gettext != null) gettext
34− ++ stdenv.lib.optional (lvm2 != null) lvm2;
32+ ++ lib.optional (readline != null) readline
33+ ++ lib.optional (gettext != null) gettext
34+ ++ lib.optional (lvm2 != null) lvm2;
3535
3636 configureFlags =
3737 (if (readline != null)
3838 then [ "--with-readline" ]
3939 else [ "--without-readline" ])
40− ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper"
41− ++ stdenv.lib.optional enableStatic "--enable-static";
40+ ++ lib.optional (lvm2 == null) "--disable-device-mapper"
41+ ++ lib.optional enableStatic "--enable-static";
4242
4343 # Tests were previously failing due to Hydra running builds as uid 0.
4444 # That should hopefully be fixed now.
@@ -59,13 +59,13 @@ stdenv.mkDerivation rec {
5959 '';
6060
6161 homepage = "https://www.gnu.org/software/parted/";
62− license = stdenv.lib.licenses.gpl3Plus;
62+ license = lib.licenses.gpl3Plus;
6363
6464 maintainers = [
6565 # Add your name here!
6666 ];
6767
6868 # GNU Parted requires libuuid, which is part of util-linux-ng.
69− platforms = stdenv.lib.platforms.linux;
69+ platforms = lib.platforms.linux;
7070 };
7171}
pkgs/tools/misc/pazi/default.nix+1−1
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
1111 sha256 = "0z8x70mwg0mvz6iap92gil37d4kpg5dizlyfx3zk7984ynycgap8";
1212 };
1313
14− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
14+ buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
1515
1616 cargoSha256 = "0sja0q9i0b1zb3a0a6z561yg9lqykylwr3iwin4r6cmi7j2sw5j6";
1717
pkgs/tools/misc/pb_cli/default.nix+4−4
@@ -18,16 +18,16 @@ stdenv.mkDerivation rec {
1818
1919 buildInputs = [ makeWrapper ];
2020
21− liveDeps = [ jq curl ] ++ stdenv.lib.optional screenshots maim
22− ++ stdenv.lib.optional video capture
23− ++ stdenv.lib.optional clipboard xclip;
21+ liveDeps = [ jq curl ] ++ lib.optional screenshots maim
22+ ++ lib.optional video capture
23+ ++ lib.optional clipboard xclip;
2424
2525 installPhase = ''
2626 install -Dm755 src/pb.sh $out/bin/pb
2727
2828 patchShebangs $out/bin/pb
2929 wrapProgram $out/bin/pb \
30− --prefix PATH : '${stdenv.lib.makeBinPath liveDeps}'
30+ --prefix PATH : '${lib.makeBinPath liveDeps}'
3131 '';
3232
3333 meta = with lib; {
pkgs/tools/misc/phoronix-test-suite/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 ./install-sh $out
1717 wrapProgram $out/bin/phoronix-test-suite \
1818 --set PHP_BIN ${php}/bin/php \
19− --prefix PATH : ${stdenv.lib.makeBinPath [ gnumake gcc ]}
19+ --prefix PATH : ${lib.makeBinPath [ gnumake gcc ]}
2020 '';
2121
2222 passthru.tests = {
pkgs/tools/misc/picocom/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131
3232 nativeBuildInputs = [ installShellFiles ];
3333
34− buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
34+ buildInputs = lib.optional stdenv.isDarwin IOKit;
3535
3636 installPhase = ''
3737 install -Dm555 -t $out/bin picocom
pkgs/tools/misc/pipelight/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU, libGL, wine-staging }:
1+{ lib, stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU, libGL, wine-staging }:
22
33let
44 wine_custom = wine-staging;
@@ -53,9 +53,9 @@ in stdenv.mkDerivation rec {
5353
5454 meta = {
5555 homepage = "http://pipelight.net/";
56− license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ];
56+ license = with lib.licenses; [ mpl11 gpl2 lgpl21 ];
5757 description = "A wrapper for using Windows plugins in Linux browsers";
58− maintainers = with stdenv.lib.maintainers; [ skeidel ];
58+ maintainers = with lib.maintainers; [ skeidel ];
5959 platforms = [ "x86_64-linux" "i686-linux" ];
6060 };
6161}
pkgs/tools/misc/pixd/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, stdenv, fetchFromGitHub }:
22
3−with stdenv.lib;
3+with lib;
44
55stdenv.mkDerivation rec {
66 pname = "pixd";
pkgs/tools/misc/pk2cmd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libusb-compat-0_1, makeWrapper}:
1+{lib, stdenv, fetchurl, libusb-compat-0_1, makeWrapper}:
22
33stdenv.mkDerivation {
44 name = "pk2cmd-1.20";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020
2121 meta = {
2222 homepage = "https://www.microchip.com/pickit2";
23− license = stdenv.lib.licenses.unfree; #MicroChip-PK2
23+ license = lib.licenses.unfree; #MicroChip-PK2
2424 description = "Microchip PIC programming software for the PICKit2 programmer";
2525 };
2626}
pkgs/tools/misc/plowshare/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }:
1+{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }:
22
33stdenv.mkDerivation rec {
44
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 make PREFIX="$out" install
2121
2222 for fn in plow{del,down,list,mod,probe,up}; do
23− wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl recode spidermonkey_38 ]}"
23+ wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_38 ]}"
2424 done
2525 '';
2626
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828 description = ''
2929 A command-line download/upload tool for popular file sharing websites
3030 '';
31− license = stdenv.lib.licenses.gpl3;
32− maintainers = with stdenv.lib.maintainers; [ aforemny jfrankenau ];
33− platforms = stdenv.lib.platforms.linux;
31+ license = lib.licenses.gpl3;
32+ maintainers = with lib.maintainers; [ aforemny jfrankenau ];
33+ platforms = lib.platforms.linux;
3434 };
3535}
pkgs/tools/misc/ponysay/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python3, texinfo, makeWrapper }:
1+{ lib, stdenv, fetchurl, python3, texinfo, makeWrapper }:
22
33stdenv.mkDerivation {
44 name = "ponysay-3.0.3";
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
2727 meta = {
2828 description = "Cowsay reimplemention for ponies";
2929 homepage = "https://github.com/erkin/ponysay";
30− license = stdenv.lib.licenses.gpl3;
31− maintainers = with stdenv.lib.maintainers; [ bodil ];
32− platforms = with stdenv.lib.platforms; unix;
30+ license = lib.licenses.gpl3;
31+ maintainers = with lib.maintainers; [ bodil ];
32+ platforms = with lib.platforms; unix;
3333 };
3434}
pkgs/tools/misc/profile-cleaner/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }:
1+{ lib, stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }:
22
33stdenv.mkDerivation rec {
44 version = "2.41";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 installPhase = ''
1717 PREFIX=\"\" DESTDIR=$out make install
1818 wrapProgram $out/bin/profile-cleaner \
19− --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc file ]}"
19+ --prefix PATH : "${lib.makeBinPath [ parallel sqlite bc file ]}"
2020 '';
2121
2222 meta = {
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828 some email clients and newsreaders too.
2929 '';
3030 homepage = "https://github.com/graysky2/profile-cleaner";
31− license = stdenv.lib.licenses.mit;
32− platforms = stdenv.lib.platforms.linux;
33− maintainers = [ stdenv.lib.maintainers.devhell ];
31+ license = lib.licenses.mit;
32+ platforms = lib.platforms.linux;
33+ maintainers = [ lib.maintainers.devhell ];
3434 };
3535}
pkgs/tools/misc/proxytunnel/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, openssl }:
1+{ lib, stdenv, fetchurl, openssl }:
22
33stdenv.mkDerivation {
44 name = "proxytunnel-1.9.0";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 meta = {
1616 description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
1717 homepage = "http://proxytunnel.sourceforge.net/download.php";
18− license = stdenv.lib.licenses.gpl2;
19− platforms = stdenv.lib.platforms.linux;
18+ license = lib.licenses.gpl2;
19+ platforms = lib.platforms.linux;
2020 };
2121}
pkgs/tools/misc/pv/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl } :
1+{ lib, stdenv, fetchurl } :
22
33stdenv.mkDerivation rec {
44 name = "pv-1.6.6";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
1111 meta = {
1212 homepage = "http://www.ivarch.com/programs/pv";
1313 description = "Tool for monitoring the progress of data through a pipeline";
14− license = stdenv.lib.licenses.artistic2;
15− maintainers = with stdenv.lib.maintainers; [ ];
16− platforms = with stdenv.lib.platforms; all;
14+ license = lib.licenses.artistic2;
15+ maintainers = with lib.maintainers; [ ];
16+ platforms = with lib.platforms; all;
1717 };
1818}
pkgs/tools/misc/qjoypad/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }:
1+{ lib, stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }:
22stdenv.mkDerivation rec {
33 name = "qjoypad-4.1.0";
44 src = fetchurl {
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
3333 experience just a little bit nicer.
3434 '';
3535 homepage = "http://qjoypad.sourceforge.net";
36− license = stdenv.lib.licenses.gpl2;
37− maintainers = with stdenv.lib.maintainers; [ astsmtl ];
38− platforms = with stdenv.lib.platforms; linux;
36+ license = lib.licenses.gpl2;
37+ maintainers = with lib.maintainers; [ astsmtl ];
38+ platforms = with lib.platforms; linux;
3939 };
4040}
pkgs/tools/misc/recoverjpeg/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 postFixup = ''
1717 wrapProgram $out/bin/sort-pictures \
18− --prefix PATH : ${stdenv.lib.makeBinPath [ exif imagemagick ]}
18+ --prefix PATH : ${lib.makeBinPath [ exif imagemagick ]}
1919 '';
2020
2121 meta = with lib; {
pkgs/tools/misc/recutils/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, emacs, curl, check, bc }:
1+{ fetchurl, lib, stdenv, emacs, curl, check, bc }:
22
33stdenv.mkDerivation rec {
44 name = "recutils-1.8";
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
2727
2828 homepage = "https://www.gnu.org/software/recutils/";
2929
30− license = stdenv.lib.licenses.gpl3Plus;
30+ license = lib.licenses.gpl3Plus;
3131
32− platforms = stdenv.lib.platforms.all;
32+ platforms = lib.platforms.all;
3333 maintainers = [ ];
3434 };
3535}
pkgs/tools/misc/remind/default.nix+7−7
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, tk, tcllib, makeWrapper
1+{lib, stdenv, fetchurl, tk, tcllib, makeWrapper
22, tkremind ? true
33} :
44
@@ -7,9 +7,9 @@ assert tkremind -> tcllib != null;
77assert tkremind -> makeWrapper != null;
88
99let
10− inherit (stdenv.lib) optional optionalString;
11− tclLibraries = stdenv.lib.optionals tkremind [ tcllib tk ];
12− tclLibPaths = stdenv.lib.concatStringsSep " "
10+ inherit (lib) optional optionalString;
11+ tclLibraries = lib.optionals tkremind [ tcllib tk ];
12+ tclLibPaths = lib.concatStringsSep " "
1313 (map (p: "${p}/lib/${p.libPrefix}") tclLibraries);
1414 tkremindPatch = optionalString tkremind ''
1515 substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
@@ -42,8 +42,8 @@ in stdenv.mkDerivation rec {
4242 meta = {
4343 homepage = "https://dianne.skoll.ca/projects/remind/";
4444 description = "Sophisticated calendar and alarm program for the console";
45− license = stdenv.lib.licenses.gpl2;
46− maintainers = with stdenv.lib.maintainers; [raskin kovirobi];
47− platforms = with stdenv.lib.platforms; unix;
45+ license = lib.licenses.gpl2;
46+ maintainers = with lib.maintainers; [raskin kovirobi];
47+ platforms = with lib.platforms; unix;
4848 };
4949}
pkgs/tools/misc/renameutils/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, readline}:
1+{lib, stdenv, fetchurl, readline}:
22
33stdenv.mkDerivation {
44 name = "renameutils-0.12.0";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 meta = {
1616 homepage = "https://www.nongnu.org/renameutils/";
1717 description = "A set of programs to make renaming of files faster";
18− platforms = stdenv.lib.platforms.unix;
19− license = stdenv.lib.licenses.gpl2Plus;
18+ platforms = lib.platforms.unix;
19+ license = lib.licenses.gpl2Plus;
2020 };
2121}
pkgs/tools/misc/rig/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl } :
1+{ lib, stdenv, fetchurl } :
22
33stdenv.mkDerivation rec {
44 version = "1.11";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 patches = [ ./rig_1.11-1.diff ];
1515
1616 meta = {
17− homepage = "http://rig.sourceforge.net/";
17+ homepage = "http://rig.sourceforge.net/";
1818 description = "Random identity generator";
1919 longDescription = ''
2020 RIG (Random Identity Generator) is a free replacement for a shareware
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
2424 if the Web site/BBS/person you are giving the information to tries to
2525 cross-check the city, state, zip, or area code, it will check out.
2626 '';
27− license = stdenv.lib.licenses.gpl2;
28− maintainers = with stdenv.lib.maintainers; [ tomberek ];
29− platforms = with stdenv.lib.platforms; all;
27+ license = lib.licenses.gpl2;
28+ maintainers = with lib.maintainers; [ tomberek ];
29+ platforms = with lib.platforms; all;
3030 };
3131}
pkgs/tools/misc/rlwrap/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, readline }:
1+{ lib, stdenv, fetchurl, readline }:
22
33stdenv.mkDerivation rec {
44 pname = "rlwrap";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919 meta = {
2020 description = "Readline wrapper for console programs";
2121 homepage = "https://github.com/hanslub42/rlwrap";
22− license = stdenv.lib.licenses.gpl2Plus;
23− platforms = stdenv.lib.platforms.unix;
24− maintainers = with stdenv.lib.maintainers; [ ];
22+ license = lib.licenses.gpl2Plus;
23+ platforms = lib.platforms.unix;
24+ maintainers = with lib.maintainers; [ ];
2525 };
2626}
pkgs/tools/misc/rmlint/default.nix+7−7
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, cairo
33, fetchFromGitHub
44, gettext
@@ -18,7 +18,7 @@
1818, wrapGAppsHook
1919, withGui ? false }:
2020
21−with stdenv.lib;
21+with lib;
2222stdenv.mkDerivation rec {
2323 pname = "rmlint";
2424 version = "2.10.1";
@@ -30,14 +30,14 @@ stdenv.mkDerivation rec {
3030 sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x";
3131 };
3232
33− CFLAGS="-I${stdenv.lib.getDev util-linux}/include";
33+ CFLAGS="-I${lib.getDev util-linux}/include";
3434
3535 nativeBuildInputs = [
3636 pkgconfig
3737 sphinx
3838 gettext
3939 scons
40− ] ++ stdenv.lib.optionals withGui [
40+ ] ++ lib.optionals withGui [
4141 makeWrapper
4242 wrapGAppsHook
4343 ];
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 json-glib
4848 libelf
4949 util-linux
50− ] ++ stdenv.lib.optionals withGui [
50+ ] ++ lib.optionals withGui [
5151 cairo
5252 gobject-introspection
5353 gtksourceview3
@@ -59,10 +59,10 @@ stdenv.mkDerivation rec {
5959
6060 # this doesn't seem to support configureFlags, and appends $out afterwards,
6161 # so add the --without-gui in front of it
62− prefixKey = stdenv.lib.optionalString (!withGui) " --without-gui " + "--prefix=";
62+ prefixKey = lib.optionalString (!withGui) " --without-gui " + "--prefix=";
6363
6464 # in GUI mode, this shells out to itself, and tries to import python modules
65− postInstall = stdenv.lib.optionalString withGui ''
65+ postInstall = lib.optionalString withGui ''
6666 gappsWrapperArgs+=(--prefix PATH : "$out/bin")
6767 gappsWrapperArgs+=(--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3}):$(toPythonPath ${python3.pkgs.pycairo})")
6868 '';
pkgs/tools/misc/rockbox-utility/default.nix+3−3
@@ -3,7 +3,7 @@
33, qmake, withEspeak ? false, espeak ? null
44, qt5 }:
55
6−let inherit (stdenv.lib) getDev; in
6+let inherit (lib) getDev; in
77
88stdenv.mkDerivation rec {
99 pname = "rockbox-utility";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616
1717 buildInputs = [ cryptopp libusb1 qtbase qttools ]
18− ++ stdenv.lib.optional withEspeak espeak;
18+ ++ lib.optional withEspeak espeak;
1919 nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ];
2020
2121 postPatch = ''
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 install -Dm755 RockboxUtility $out/bin/rockboxutility
3535 ln -s $out/bin/rockboxutility $out/bin/RockboxUtility
3636 wrapProgram $out/bin/rockboxutility \
37− ${stdenv.lib.optionalString withEspeak ''
37+ ${lib.optionalString withEspeak ''
3838 --prefix PATH : ${espeak}/bin
3939 ''}
4040
pkgs/tools/misc/routino/default.nix+2−2
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 patchFlags = [ "-p0" ];
13− patches = stdenv.lib.optionals stdenv.isDarwin [
13+ patches = lib.optionals stdenv.isDarwin [
1414 (fetchpatch {
1515 url = "https://raw.githubusercontent.com/macports/macports-ports/18fd229516a46e7272003acbe555735b2a902db7/gis/routino/files/patch-Makefile_conf.diff";
1616 sha256 = "1b7hpa4sizansnwwxq1c031nxwdwh71pg08jl9z9apiab8pjsn53";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727
2828 outputs = [ "out" "doc" ];
2929
30− CLANG = stdenv.lib.optionalString stdenv.cc.isClang "1";
30+ CLANG = lib.optionalString stdenv.cc.isClang "1";
3131
3232 makeFlags = [ "prefix=$(out)" ];
3333
pkgs/tools/misc/rrdtool/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 nativeBuildInputs = [ pkgconfig ];
1313
1414 buildInputs = [ gettext perl libxml2 pango cairo groff ]
15− ++ stdenv.lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ];
15+ ++ lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ];
1616
1717 postInstall = ''
1818 # for munin and rrdtool support
pkgs/tools/misc/sam-ba/default.nix+1−1
@@ -4,7 +4,7 @@
44
55let
66 maybe64 = if stdenv.isx86_64 then "_64" else "";
7− libPath = stdenv.lib.makeLibraryPath
7+ libPath = lib.makeLibraryPath
88 [ stdenv.cc.cc.lib libX11 libXScrnSaver libXext libXft libXrender freetype
99 zlib fontconfig
1010 ];
pkgs/tools/misc/screen/default.nix+4−4
@@ -16,21 +16,21 @@ stdenv.mkDerivation rec {
1616 "--enable-colors256"
1717 ];
1818
19− patches = stdenv.lib.optional stdenv.hostPlatform.isMusl
19+ patches = lib.optional stdenv.hostPlatform.isMusl
2020 (fetchpatch {
2121 url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff";
2222 sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p";
2323 stripLen = 1;
2424 });
2525
26− postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)
26+ postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)
2727 # XXX: Awful hack to allow cross-compilation.
2828 '' sed -i ./configure \
2929 -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g'
3030 ''; # "
3131
32− buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam
33− ++ stdenv.lib.optional stdenv.isDarwin utmp;
32+ buildInputs = [ ncurses ] ++ lib.optional stdenv.isLinux pam
33+ ++ lib.optional stdenv.isDarwin utmp;
3434
3535 doCheck = true;
3636
pkgs/tools/misc/sdate/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook }:
1+{ lib, stdenv, fetchurl, autoreconfHook }:
22stdenv.mkDerivation rec {
33 pname = "sdate";
44 version = "0.7";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
1212 meta = {
1313 homepage = "https://www.df7cb.de/projects/sdate";
1414 description = "Eternal september version of the date program";
15− license = stdenv.lib.licenses.gpl2Plus;
16− maintainers = with stdenv.lib.maintainers; [ edef ];
17− platforms = stdenv.lib.platforms.all;
15+ license = lib.licenses.gpl2Plus;
16+ maintainers = with lib.maintainers; [ edef ];
17+ platforms = lib.platforms.all;
1818 };
1919}
pkgs/tools/misc/shadowenv/default.nix+1−1
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
1515
1616 nativeBuildInputs = [ installShellFiles ];
1717
18− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
18+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
1919
2020 postInstall = ''
2121 installManPage man/man1/shadowenv.1
pkgs/tools/misc/shallot/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fetchpatch
1+{ lib, stdenv, fetchFromGitHub, fetchpatch
22, openssl
33}:
44
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
3838 meta = {
3939 description = "Allows you to create customized .onion addresses for your hidden service";
4040
41− license = stdenv.lib.licenses.mit;
41+ license = lib.licenses.mit;
4242 homepage = "https://github.com/katmagic/Shallot";
43− platforms = stdenv.lib.platforms.linux;
43+ platforms = lib.platforms.linux;
4444 };
4545}
pkgs/tools/misc/sixpair/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libusb-compat-0_1 }:
1+{ lib, stdenv, fetchurl, libusb-compat-0_1 }:
22stdenv.mkDerivation {
33 name = "sixpair-2007-04-18";
44
@@ -31,8 +31,8 @@ stdenv.mkDerivation {
3131 This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master.
3232 '';
3333 homepage = "http://www.pabr.org/sixlinux/";
34− license = stdenv.lib.licenses.gpl2;
35− maintainers = [ stdenv.lib.maintainers.tomsmeets ];
36− platforms = stdenv.lib.platforms.linux;
34+ license = lib.licenses.gpl2;
35+ maintainers = [ lib.maintainers.tomsmeets ];
36+ platforms = lib.platforms.linux;
3737 };
3838}
pkgs/tools/misc/slop/default.nix+3−3
@@ -16,15 +16,15 @@ stdenv.mkDerivation rec {
1616
1717 nativeBuildInputs = [ cmake pkgconfig ];
1818 buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ]
19− ++ stdenv.lib.optional doCheck cppcheck;
19+ ++ lib.optional doCheck cppcheck;
2020
2121 doCheck = false;
2222
2323 meta = with lib; {
2424 inherit (src.meta) homepage;
2525 description = "Queries a selection from the user and prints to stdout";
26− platforms = stdenv.lib.platforms.linux;
27− license = stdenv.lib.licenses.gpl3Plus;
26+ platforms = lib.platforms.linux;
27+ license = lib.licenses.gpl3Plus;
2828 maintainers = with maintainers; [ primeos mbakke ];
2929 };
3030}
pkgs/tools/misc/slsnif/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 name = "slsnif-0.4.4";
@@ -8,10 +8,10 @@ stdenv.mkDerivation {
88 sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii";
99 };
1010
11− meta = {
11+ meta = {
1212 description = "Serial line sniffer";
1313 homepage = "http://slsnif.sourceforge.net/";
14− license = stdenv.lib.licenses.gpl2;
15− platforms = stdenv.lib.platforms.linux;
14+ license = lib.licenses.gpl2;
15+ platforms = lib.platforms.linux;
1616 };
1717}
pkgs/tools/misc/slurp/default.nix+2−2
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 meson
1919 ninja
2020 pkg-config
21− ] ++ stdenv.lib.optional buildDocs scdoc;
21+ ] ++ lib.optional buildDocs scdoc;
2222
2323 buildInputs = [
2424 cairo
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 wayland-protocols
2828 ];
2929
30− mesonFlags = stdenv.lib.optional buildDocs "-Dman-pages=enabled";
30+ mesonFlags = lib.optional buildDocs "-Dman-pages=enabled";
3131
3232 meta = with lib; {
3333 description = "Select a region in a Wayland compositor";
pkgs/tools/misc/somafm-cli/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 installPhase = ''
2323 install -m0755 -D src/somafm $out/bin/somafm
24− wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}";
24+ wrapProgram $out/bin/somafm --prefix PATH ":" "${lib.makeBinPath [ curl jq mpv ]}";
2525 '';
2626
2727 meta = with lib; {
pkgs/tools/misc/spigot/default.nix+2−2
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
2929 meta = with lib; {
3030 description = "A command-line exact real calculator";
3131 homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/";
32− license = stdenv.lib.licenses.mit;
33− platforms = stdenv.lib.platforms.all;
32+ license = lib.licenses.mit;
33+ platforms = lib.platforms.all;
3434 maintainers = with maintainers; [ mcbeth ];
3535 };
3636}
pkgs/tools/misc/starship/default.nix+3−3
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec {
1919 sha256 = "1p37cfkcpqv74gp7g099alkqxanfc002kaq1cim6zkinx50gxjxw";
2020 };
2121
22− nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
22+ nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
2323
24− buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
25− ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
24+ buildInputs = lib.optionals stdenv.isLinux [ openssl ]
25+ ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
2626
2727 postInstall = ''
2828 for shell in bash fish zsh; do
pkgs/tools/misc/stow/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl, perlPackages }:
1+{ lib, stdenv, fetchurl, perl, perlPackages }:
22
33let
44 pname = "stow";
@@ -29,8 +29,8 @@ stdenv.mkDerivation {
2929 as .../share, .../man, and so on.
3030 '';
3131
32− license = stdenv.lib.licenses.gpl3Plus;
32+ license = lib.licenses.gpl3Plus;
3333 homepage = "https://www.gnu.org/software/stow/";
34− platforms = stdenv.lib.platforms.all;
34+ platforms = lib.platforms.all;
3535 };
3636}
pkgs/tools/misc/sutils/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, alsaLib }:
1+{ lib, stdenv, fetchFromGitHub, alsaLib }:
22
33stdenv.mkDerivation rec {
44 version = "0.2";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 description = "Small command-line utilities";
2222 homepage = "https://github.com/baskerville/sutils";
23− maintainers = [ stdenv.lib.maintainers.meisternu ];
23+ maintainers = [ lib.maintainers.meisternu ];
2424 license = "Custom";
25− platforms = stdenv.lib.platforms.linux;
25+ platforms = lib.platforms.linux;
2626 };
2727}
pkgs/tools/misc/svtplay-dl/default.nix+1−1
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
4646 homepage = "https://github.com/spaam/svtplay-dl";
4747 description = "Command-line tool to download videos from svtplay.se and other sites";
4848 license = licenses.mit;
49− platforms = stdenv.lib.platforms.unix;
49+ platforms = lib.platforms.unix;
5050 maintainers = [ maintainers.rycee ];
5151 };
5252}
pkgs/tools/misc/system-config-printer/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
22, docbook_xml_dtd_412, docbook_xsl
33, libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify
44, gobject-introspection, libsecret, packagekit
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
8484
8585 meta = {
8686 homepage = "https://github.com/openprinting/system-config-printer";
87− platforms = stdenv.lib.platforms.linux;
88− license = stdenv.lib.licenses.gpl2;
87+ platforms = lib.platforms.linux;
88+ license = lib.licenses.gpl2;
8989 };
9090}
pkgs/tools/misc/tab-rs/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "1clpl9fi07lms0din8f9m4y6br5jg8k5xsklsqmvgdwf83wyn321";
1515
16− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
16+ buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
1717
1818 # many tests are failing
1919 doCheck = false;
pkgs/tools/misc/tensorman/default.nix+1−1
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
1818 meta = with lib; {
1919 description = "Utility for easy management of Tensorflow containers";
2020 homepage = "https://github.com/pop-os/tensorman/";
21− license = stdenv.lib.licenses.gpl3;
21+ license = lib.licenses.gpl3;
2222 platforms = [ "x86_64-linux" ];
2323 maintainers = with maintainers; [ thefenriswolf ];
2424 };
pkgs/tools/misc/tewisay/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }:
1+{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }:
22
33buildGoPackage rec {
44 pname = "tewisay-unstable";
@@ -29,7 +29,7 @@ buildGoPackage rec {
2929 meta = {
3030 homepage = "https://github.com/lucy/tewisay";
3131 description = "Cowsay replacement with unicode and partial ansi escape support";
32− license = stdenv.lib.licenses.cc0;
33− maintainers = [ stdenv.lib.maintainers.chiiruno ];
32+ license = lib.licenses.cc0;
33+ maintainers = [ lib.maintainers.chiiruno ];
3434 };
3535}
pkgs/tools/misc/time/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
44 pname = "time";
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
2626 `time' reports unavailable information as zero values.
2727 '';
2828
29− license = stdenv.lib.licenses.gpl3Plus;
29+ license = lib.licenses.gpl3Plus;
3030 homepage = "https://www.gnu.org/software/time/";
31− platforms = stdenv.lib.platforms.unix;
31+ platforms = lib.platforms.unix;
3232 };
3333}
pkgs/tools/misc/tmux-cssh/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, makeWrapper, tmux }:
1+{ lib, stdenv, fetchFromGitHub, makeWrapper, tmux }:
22
33stdenv.mkDerivation {
44 name = "tmux-cssh-20151015";
@@ -33,9 +33,9 @@ stdenv.mkDerivation {
3333 like most server do.
3434 '';
3535
36− license = stdenv.lib.licenses.asl20;
36+ license = lib.licenses.asl20;
3737
38− platforms = stdenv.lib.platforms.unix;
39− maintainers = with stdenv.lib.maintainers; [ zimbatm ];
38+ platforms = lib.platforms.unix;
39+ maintainers = with lib.maintainers; [ zimbatm ];
4040 };
4141}
pkgs/tools/misc/tmux/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchFromGitHub
33, autoreconfHook
44, pkgconfig
@@ -72,9 +72,9 @@ stdenv.mkDerivation rec {
7272 * A clean, easily extended, BSD-licensed codebase, under active development.
7373 '';
7474
75− license = stdenv.lib.licenses.bsd3;
75+ license = lib.licenses.bsd3;
7676
77− platforms = stdenv.lib.platforms.unix;
78− maintainers = with stdenv.lib.maintainers; [ thammers fpletz ];
77+ platforms = lib.platforms.unix;
78+ maintainers = with lib.maintainers; [ thammers fpletz ];
7979 };
8080}
pkgs/tools/misc/ttf2pt1/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl, freetype }:
1+{ lib, stdenv, fetchurl, perl, freetype }:
22
33stdenv.mkDerivation {
44 name = "ttf2pt1-3.4.4";
@@ -20,13 +20,13 @@ stdenv.mkDerivation {
2020
2121 buildInputs = [ freetype ];
2222 nativeBuildInputs = [ perl ];
23−
23+
2424 patches = ./gentoo-makefile.patch; # also contains the freetype patch
2525
26− meta = {
26+ meta = {
2727 description = "True Type to Postscript Type 3 converter, fpdf";
2828 homepage = "http://ttf2pt1.sourceforge.net/index.html";
2929 license = "ttf2pt1";
30− platforms = stdenv.lib.platforms.linux;
30+ platforms = lib.platforms.linux;
3131 };
3232}
pkgs/tools/misc/ttmkfdir/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }:
1+{ lib, stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }:
22
33stdenv.mkDerivation {
44 name = "ttf-mkfontdir-3.0.9-6";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
77 url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz";
88 sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq";
99 };
10−
10+
1111 # all the patches up from ttmkfdir-3.0.9/Makefile should be reviewed by someone
1212 # who knows more about C/C++ ..
1313 patches =
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz";
1616 sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633";
1717 })
18−
18+
1919 ./cstring.patch # also fixes some other compilation issues (freetype includes)
2020 ];
2121
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
2727
2828 meta = {
2929 description = "Create fonts.dir for TTF font directory";
30− platforms = stdenv.lib.platforms.linux;
30+ platforms = lib.platforms.linux;
3131 };
3232}
pkgs/tools/misc/ttwatch/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
1717 nativeBuildInputs = [ cmake perl pkgconfig ];
1818 buildInputs = [ openssl curl libusb1 protobufc ];
1919
20− cmakeFlags = stdenv.lib.optional enableUnsafe [ "-Dunsafe=on" ];
20+ cmakeFlags = lib.optional enableUnsafe [ "-Dunsafe=on" ];
2121
2222 preFixup = ''
2323 chmod +x $out/bin/ttbin2mysports
pkgs/tools/misc/ttygif/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 nativeBuildInputs = [ makeWrapper ];
1717 postInstall = ''
1818 wrapProgram $out/bin/ttygif \
19− --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick xorg.xwd ]}
19+ --prefix PATH : ${lib.makeBinPath [ imagemagick xorg.xwd ]}
2020 '';
2121
2222 meta = with lib; {
pkgs/tools/misc/txr/default.nix+1−1
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 description = "Programming language for convenient data munging";
3737 license = licenses.bsd2;
3838 homepage = "http://nongnu.org/txr";
39− maintainers = with stdenv.lib.maintainers; [ dtzWill ];
39+ maintainers = with lib.maintainers; [ dtzWill ];
4040 platforms = platforms.linux; # Darwin fails although it should work AFAIK
4141 };
4242}
pkgs/tools/misc/txt2man/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, coreutils, gawk }:
1+{ lib, stdenv, fetchurl, coreutils, gawk }:
22
33stdenv.mkDerivation rec {
44 pname = "txt2man";
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
3636 meta = {
3737 description = "Convert flat ASCII text to man page format";
3838 homepage = "http://mvertes.free.fr/";
39− license = stdenv.lib.licenses.gpl2;
40− platforms = with stdenv.lib.platforms; linux ++ darwin;
41− maintainers = with stdenv.lib.maintainers; [ bjornfor ];
39+ license = lib.licenses.gpl2;
40+ platforms = with lib.platforms; linux ++ darwin;
41+ maintainers = with lib.maintainers; [ bjornfor ];
4242 };
4343}
pkgs/tools/misc/unclutter-xfixes/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 meta = with lib; {
2424 description = "Rewrite of unclutter using the X11 Xfixes extension";
2525 platforms = platforms.unix;
26− license = stdenv.lib.licenses.mit;
26+ license = lib.licenses.mit;
2727 inherit version;
2828 maintainers = [ maintainers.globin ];
2929 };
pkgs/tools/misc/unclutter/default.nix+1−1
@@ -32,6 +32,6 @@ stdenv.mkDerivation {
3232 '';
3333 maintainers = with maintainers; [ domenkozar ];
3434 platforms = platforms.unix;
35− license = stdenv.lib.licenses.publicDomain;
35+ license = lib.licenses.publicDomain;
3636 };
3737}
pkgs/tools/misc/upower-notify/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, buildGoPackage, fetchgit }:
1+{ lib, stdenv, buildGoPackage, fetchgit }:
22
33# To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
44#
@@ -8,7 +8,7 @@
88# '';
99buildGoPackage rec {
1010 pname = "upower-notify";
11− version = "20160310-${stdenv.lib.strings.substring 0 7 rev}";
11+ version = "20160310-${lib.strings.substring 0 7 rev}";
1212 rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
1313
1414 goPackagePath = "github.com/omeid/upower-notify";
pkgs/tools/misc/urjtag/default.nix+8−8
@@ -1,4 +1,4 @@
1−{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
1+{ lib, stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
22, flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline
33, python3
44, svfSupport ? true
@@ -21,18 +21,18 @@ stdenv.mkDerivation rec {
2121 subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ];
2222
2323 configureFlags = [
24− (stdenv.lib.enableFeature svfSupport "svf")
25− (stdenv.lib.enableFeature bsdlSupport "bsdl")
26− (stdenv.lib.enableFeature staplSupport "stapl")
27− (stdenv.lib.enableFeature jedecSupport "jedec-exp")
24+ (lib.enableFeature svfSupport "svf")
25+ (lib.enableFeature bsdlSupport "bsdl")
26+ (lib.enableFeature staplSupport "stapl")
27+ (lib.enableFeature jedecSupport "jedec-exp")
2828 ];
2929
3030 meta = {
3131 description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";
3232 homepage = "http://urjtag.org/";
33− license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ];
34− platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
35− maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ];
33+ license = with lib.licenses; [ gpl2Plus lgpl21Plus ];
34+ platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
35+ maintainers = with lib.maintainers; [ lowfatcomputing ];
3636 };
3737}
3838
pkgs/tools/misc/urn-timer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchFromGitHub
33, fetchpatch
44, unstableGitUpdater
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
5757 url = "https://github.com/3snowp7im/urn.git";
5858 };
5959
60− meta = with stdenv.lib; {
60+ meta = with lib; {
6161 homepage = "https://github.com/3snowp7im/urn";
6262 description = "Split tracker / timer for speedrunning with GTK+ frontend";
6363 license = licenses.gpl3Plus;
pkgs/tools/misc/uucp/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 name = "uucp-1.07";
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
2929
3030 homepage = "https://www.gnu.org/software/uucp/uucp.html";
3131
32− license = stdenv.lib.licenses.gpl2Plus;
32+ license = lib.licenses.gpl2Plus;
3333
34− platforms = stdenv.lib.platforms.all;
34+ platforms = lib.platforms.all;
3535 maintainers = [ ];
3636 };
3737}
pkgs/tools/misc/uudeview/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, tcl, tk }:
1+{ lib, stdenv, fetchurl, tcl, tk }:
22
33stdenv.mkDerivation rec {
44 name = "uudeview-0.5.20";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 description = "The Nice and Friendly Decoder";
2222 homepage = "http://www.fpx.de/fp/Software/UUDeview/";
23− license = stdenv.lib.licenses.gpl2;
24− maintainers = with stdenv.lib.maintainers; [ woffs ];
25− platforms = stdenv.lib.platforms.linux;
23+ license = lib.licenses.gpl2;
24+ maintainers = with lib.maintainers; [ woffs ];
25+ platforms = lib.platforms.linux;
2626 };
2727}
pkgs/tools/misc/vector/default.nix+1−1
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
2929 cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc=";
3030 nativeBuildInputs = [ pkg-config ];
3131 buildInputs = [ openssl protobuf rdkafka ]
32− ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
32+ ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
3333
3434 # needed for internal protobuf c wrapper library
3535 PROTOC="${protobuf}/bin/protoc";
pkgs/tools/misc/venus/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }:
1+{ lib, stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 pname = "venus";
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
4646 single combined feed, latest news first.
4747 '';
4848 homepage = "http://intertwingly.net/code/venus/docs/index.html";
49− license = stdenv.lib.licenses.psfl;
50− platforms = stdenv.lib.platforms.all;
49+ license = lib.licenses.psfl;
50+ platforms = lib.platforms.all;
5151 maintainers = [];
5252 };
5353}
pkgs/tools/misc/vmtouch/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, perl}:
1+{lib, stdenv, fetchFromGitHub, perl}:
22
33stdenv.mkDerivation rec {
44 pname = "vmtouch";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919 description = "Portable file system cache diagnostics and control";
2020 longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems.";
2121 homepage = "https://hoytech.com/vmtouch/";
22− license = stdenv.lib.licenses.bsd3;
23− maintainers = [ stdenv.lib.maintainers.garrison ];
24− platforms = stdenv.lib.platforms.all;
22+ license = lib.licenses.bsd3;
23+ maintainers = [ lib.maintainers.garrison ];
24+ platforms = lib.platforms.all;
2525 };
2626}
pkgs/tools/misc/watchexec/default.nix+1−1
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
1515
1616 nativeBuildInputs = [ installShellFiles ];
1717
18− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
18+ buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
1919
2020 postInstall = ''
2121 installManPage doc/watchexec.1
pkgs/tools/misc/websocat/default.nix+2−2
@@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec {
1515 cargoSha256 = "1hsms8rlnds8npr8m0dm21h04ci5ljda09pqb598v7ny3j2dldiq";
1616
1717 nativeBuildInputs = [ pkgconfig makeWrapper ];
18− buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
18+ buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
1919
2020 # The wrapping is required so that the "sh-c" option of websocat works even
2121 # if sh is not in the PATH (as can happen, for instance, when websocat is
2222 # started as a systemd service).
2323 postInstall = ''
2424 wrapProgram $out/bin/websocat \
25− --prefix PATH : ${stdenv.lib.makeBinPath [ bash ]}
25+ --prefix PATH : ${lib.makeBinPath [ bash ]}
2626 '';
2727
2828 meta = with lib; {
pkgs/tools/misc/wob/default.nix+2−2
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
1616
1717 nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ];
1818 buildInputs = [ wayland-protocols ]
19− ++ stdenv.lib.optional stdenv.isLinux libseccomp;
19+ ++ lib.optional stdenv.isLinux libseccomp;
2020
21− mesonFlags = stdenv.lib.optional stdenv.isLinux "-Dseccomp=enabled";
21+ mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled";
2222
2323 meta = with lib; {
2424 description = "A lightweight overlay bar for Wayland";
pkgs/tools/misc/woeusb/default.nix+1−1
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 # should be patched with a less useless default PATH, but for now
4040 # we add everything we need manually.
4141 wrapProgram "$out/bin/woeusb" \
42− --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}'
42+ --set PATH '${lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}'
4343 '';
4444
4545 doInstallCheck = true;
pkgs/tools/misc/woof/default.nix+2−2
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
2424 meta = with lib; {
2525 homepage = "http://www.home.unix-ag.org/simon/woof.html";
2626 description = "Web Offer One File - Command-line utility to easily exchange files over a local network";
27− license = stdenv.lib.licenses.gpl2Plus;
28− platforms = stdenv.lib.platforms.unix;
27+ license = lib.licenses.gpl2Plus;
28+ platforms = lib.platforms.unix;
2929 maintainers = with maintainers; [ matthiasbeyer ];
3030 };
3131}
pkgs/tools/misc/wv/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf
1+{ lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf
22, libxml2, bzip2 }:
33
44stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 meta = {
1919 description = "Converter from Microsoft Word formats to human-editable ones";
20− platforms = stdenv.lib.platforms.unix;
21− license = stdenv.lib.licenses.gpl2;
20+ platforms = lib.platforms.unix;
21+ license = lib.licenses.gpl2;
2222 };
2323}
pkgs/tools/misc/wv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }:
1+{ lib, stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }:
22
33stdenv.mkDerivation rec {
44 name = "wv2-0.4.2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 meta = {
1818 description = "Excellent MS Word filter lib, used in most Office suites";
19− license = stdenv.lib.licenses.lgpl2;
19+ license = lib.licenses.lgpl2;
2020 homepage = "http://wvware.sourceforge.net";
2121 };
2222}
pkgs/tools/misc/xburst-tools/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig
1+{ lib, stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig
22, gccCross ? null
33}:
44
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 sh autogen.sh
2020 '';
2121
22− configureFlags = stdenv.lib.optionals (gccCross != null) [
22+ configureFlags = lib.optionals (gccCross != null) [
2323 "--enable-firmware"
2424 "CROSS_COMPILE=${gccCross.targetPrefix}"
2525 ];
@@ -31,13 +31,13 @@ stdenv.mkDerivation {
3131
3232 nativeBuildInputs = [ autoconf automake pkgconfig ];
3333 buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++
34− stdenv.lib.optional (gccCross != null) gccCross;
34+ lib.optional (gccCross != null) gccCross;
3535
3636 meta = {
3737 description = "Qi tools to access the Ben Nanonote USB_BOOT mode";
38− license = stdenv.lib.licenses.gpl3;
38+ license = lib.licenses.gpl3;
3939 homepage = "http://www.linux-mtd.infradead.org/";
40− maintainers = with stdenv.lib.maintainers; [viric];
41− platforms = stdenv.lib.platforms.x86_64;
40+ maintainers = with lib.maintainers; [viric];
41+ platforms = lib.platforms.x86_64;
4242 };
4343}
pkgs/tools/misc/xclip/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, libXmu }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libXmu }:
22
33stdenv.mkDerivation rec {
44 pname = "xclip";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "Tool to access the X clipboard from a console application";
2020 homepage = "https://github.com/astrand/xclip";
21− license = stdenv.lib.licenses.gpl2;
22− platforms = stdenv.lib.platforms.all;
21+ license = lib.licenses.gpl2;
22+ platforms = lib.platforms.all;
2323 };
2424}
pkgs/tools/misc/xflux/default.nix+5−5
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}:
1+{lib, stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}:
22stdenv.mkDerivation {
33 name = "xflux-2013-09-01";
44 src = fetchurl {
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
66 sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021";
77 };
88
9− libPath = stdenv.lib.makeLibraryPath [
9+ libPath = lib.makeLibraryPath [
1010 gcc.cc
1111 libXxf86vm
1212 libXext
@@ -32,8 +32,8 @@ stdenv.mkDerivation {
3232 when the sun rises.
3333 '';
3434 homepage = "https://justgetflux.com/";
35− license = stdenv.lib.licenses.unfree;
36− platforms = stdenv.lib.platforms.linux;
37− maintainers = [ stdenv.lib.maintainers.paholg ];
35+ license = lib.licenses.unfree;
36+ platforms = lib.platforms.linux;
37+ maintainers = [ lib.maintainers.paholg ];
3838 };
3939}
pkgs/tools/misc/xflux/gui.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook
1+{ lib, stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook
22, xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk
33, pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3
44}:
@@ -42,8 +42,8 @@ buildPythonApplication rec {
4242 meta = {
4343 description = "Better lighting for Linux. Open source GUI for xflux";
4444 homepage = "https://justgetflux.com/linux.html";
45− license = stdenv.lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary
46− maintainers = [ stdenv.lib.maintainers.sheenobu ];
47− platforms = stdenv.lib.platforms.linux;
45+ license = lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary
46+ maintainers = [ lib.maintainers.sheenobu ];
47+ platforms = lib.platforms.linux;
4848 };
4949}
pkgs/tools/misc/xprite-editor/default.nix+3−3
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage rec {
2424 '';
2525 };
2626
27− buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk3 ]
28− ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ];
27+ buildInputs = lib.optionals stdenv.isLinux [ gtk3 ]
28+ ++ lib.optionals stdenv.isDarwin [ AppKit ];
2929
30− nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config python3 ];
30+ nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ];
3131
3232 cargoSha256 = "1a0zy8gfc1gdk8nnv5qr4yspqy1jsip5nql3w74rl6h46cplpf5y";
3333
pkgs/tools/misc/xtitle/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }:
1+{ lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }:
22
33stdenv.mkDerivation {
44 name = "xtitle-0.4.4";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
1616 meta = {
1717 description = "Outputs X window titles";
1818 homepage = "https://github.com/baskerville/xtitle";
19− maintainers = [ stdenv.lib.maintainers.meisternu ];
19+ maintainers = [ lib.maintainers.meisternu ];
2020 license = "Custom";
21− platforms = stdenv.lib.platforms.linux;
21+ platforms = lib.platforms.linux;
2222 };
2323}
pkgs/tools/misc/xvfb-run/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 patchShebangs $out/bin/xvfb-run
2020 wrapProgram $out/bin/xvfb-run \
2121 --set FONTCONFIG_FILE "${fontsConf}" \
22− --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]}
22+ --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]}
2323 '';
2424
2525 meta = with lib; {
pkgs/tools/misc/yubikey-manager-qt/default.nix+1−1
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 buildPythonPath "$pythonPath"
4545
4646 wrapQtApp $out/bin/ykman-gui \
47− --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \
47+ --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \
4848 --prefix PYTHONPATH : "$program_PYTHONPATH"
4949
5050 mkdir -p $out/share/applications
pkgs/tools/misc/zsh-autoenv/default.nix+1−1
@@ -35,6 +35,6 @@ stdenv.mkDerivation {
3535 variables (overwriting and restoring).
3636 '';
3737 homepage = "https://github.com/Tarrasch/zsh-autoenv";
38− platforms = stdenv.lib.platforms.all;
38+ platforms = lib.platforms.all;
3939 };
4040}
pkgs/tools/networking/acme-client/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, apple_sdk ? null
44, libbsd
@@ -6,7 +6,7 @@
66, pkgconfig
77}:
88
9−with stdenv.lib;
9+with lib;
1010
1111stdenv.mkDerivation rec {
1212 pname = "acme-client";
pkgs/tools/networking/ahcpd/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 name = "ahcpd-0.53";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 meta = {
1717 homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/";
1818 description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks";
19− license = stdenv.lib.licenses.mit;
20− platforms = stdenv.lib.platforms.linux;
19+ license = lib.licenses.mit;
20+ platforms = lib.platforms.linux;
2121 };
2222}
pkgs/tools/networking/aircrack-ng/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 '';
1919
2020 postFixup = ''
21− wrapProgram $out/bin/airmon-ng --prefix PATH : ${stdenv.lib.makeBinPath [
21+ wrapProgram $out/bin/airmon-ng --prefix PATH : ${lib.makeBinPath [
2222 ethtool iw pciutils usbutils
2323 ]}
2424 '';
pkgs/tools/networking/argus/default.nix+2−2
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
2323 substituteInPlace events/argus-vmstat.sh \
2424 --replace vm_stat ${procps}/bin/vmstat
2525 substituteInPlace events/argus-snmp.sh \
26− --replace /usr/bin/snmpget ${stdenv.lib.getBin net-snmp}/bin/snmpget \
27− --replace /usr/bin/snmpwalk ${stdenv.lib.getBin net-snmp}/bin/snmpwalk
26+ --replace /usr/bin/snmpget ${lib.getBin net-snmp}/bin/snmpget \
27+ --replace /usr/bin/snmpwalk ${lib.getBin net-snmp}/bin/snmpwalk
2828 '';
2929
3030 meta = with lib; {
pkgs/tools/networking/aria2/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 nativeBuildInputs = [ pkgconfig autoreconfHook sphinx ];
1919
2020 buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++
21− stdenv.lib.optional stdenv.isDarwin Security;
21+ lib.optional stdenv.isDarwin Security;
2222
2323 outputs = [ "bin" "dev" "out" "doc" "man" ];
2424
pkgs/tools/networking/babeld/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, nixosTests }:
1+{ lib, stdenv, fetchurl, nixosTests }:
22
33stdenv.mkDerivation rec {
44 pname = "babeld";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/";
2020 description = "Loop-avoiding distance-vector routing protocol";
21− license = stdenv.lib.licenses.mit;
22− maintainers = with stdenv.lib.maintainers; [ fpletz ];
23− platforms = with stdenv.lib.platforms; linux;
21+ license = lib.licenses.mit;
22+ maintainers = with lib.maintainers; [ fpletz ];
23+ platforms = with lib.platforms; linux;
2424 };
2525}
pkgs/tools/networking/badvpn/default.nix+5−5
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}:
1+{lib, stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}:
22let
33 s = # Generated upstream information
44 rec {
@@ -11,7 +11,7 @@ let
1111 };
1212
1313
14− compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}";
14+ compileFlags = "-O3 ${lib.optionalString (!debug) "-DNDEBUG"}";
1515in
1616stdenv.mkDerivation {
1717 inherit (s) name version;
@@ -32,8 +32,8 @@ stdenv.mkDerivation {
3232 meta = {
3333 inherit (s) version;
3434 description = ''A set of network-related (mostly VPN-related) tools'';
35− license = stdenv.lib.licenses.bsd3 ;
36− maintainers = [stdenv.lib.maintainers.raskin];
37− platforms = stdenv.lib.platforms.linux;
35+ license = lib.licenses.bsd3 ;
36+ maintainers = [lib.maintainers.raskin];
37+ platforms = lib.platforms.linux;
3838 };
3939}
pkgs/tools/networking/bandwhich/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "0b5pqsdggdjq9sl54rmh2gaq31va6b2crdv7ihh3198ixwasaf02";
1515
16− buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
16+ buildInputs = lib.optional stdenv.isDarwin Security;
1717
1818 meta = with lib; {
1919 description = "A CLI utility for displaying current network utilization";
pkgs/tools/networking/bgpdump/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, zlib, bzip2 }:
1+{ lib, stdenv, fetchurl, autoreconfHook, zlib, bzip2 }:
22
33stdenv.mkDerivation rec {
44 pname = "bgpdump";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
1515 meta = {
1616 homepage = "https://bitbucket.org/ripencc/bgpdump/";
1717 description = ''Analyze dump files produced by Zebra/Quagga or MRT'';
18− license = stdenv.lib.licenses.hpnd;
19− maintainers = with stdenv.lib.maintainers; [ lewo ];
20− platforms = with stdenv.lib.platforms; linux;
18+ license = lib.licenses.hpnd;
19+ maintainers = with lib.maintainers; [ lewo ];
20+ platforms = with lib.platforms; linux;
2121 };
2222}
pkgs/tools/networking/boringtun/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "0bms93xg75b23ls2hb8dv26y4al4nr67pqcm57rp9d4rbsfafg8c";
1515
16− buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
16+ buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
1717
1818 # Testing this project requires sudo, Docker and network access, etc.
1919 doCheck = false;
pkgs/tools/networking/burpsuite/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, jre, runtimeShell }:
1+{ lib, stdenv, fetchurl, jre, runtimeShell }:
22
33let
44 version = "2020.1";
@@ -32,9 +32,9 @@ in stdenv.mkDerivation {
3232 '';
3333 homepage = "https://portswigger.net/burp/";
3434 downloadPage = "https://portswigger.net/burp/freedownload";
35− license = [ stdenv.lib.licenses.unfree ];
35+ license = [ lib.licenses.unfree ];
3636 platforms = jre.meta.platforms;
3737 hydraPlatforms = [];
38− maintainers = with stdenv.lib.maintainers; [ bennofs ];
38+ maintainers = with lib.maintainers; [ bennofs ];
3939 };
4040}
pkgs/tools/networking/bwm-ng/default.nix+1−1
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141
4242
4343 # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline
44− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-std=gnu89";
44+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=gnu89";
4545
4646 meta = with lib; {
4747 description = "A small and simple console-based live network and disk io bandwidth monitor";
pkgs/tools/networking/chrony/default.nix+2−2
@@ -17,13 +17,13 @@ stdenv.mkDerivation rec {
1717 '';
1818
1919 buildInputs = [ readline texinfo nss nspr gnutls ]
20− ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ];
20+ ++ lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ];
2121 nativeBuildInputs = [ pkgconfig ];
2222
2323 hardeningEnable = [ "pie" ];
2424
2525 configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ]
26− ++ stdenv.lib.optional stdenv.isLinux "--enable-scfilter";
26+ ++ lib.optional stdenv.isLinux "--enable-scfilter";
2727
2828 meta = with lib; {
2929 description = "Sets your computer's clock from time servers on the Net";
pkgs/tools/networking/cjdns/default.nix+2−2
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ which python27 nodejs ] ++
1515 # for flock
16− stdenv.lib.optional stdenv.isLinux util-linux;
16+ lib.optional stdenv.isLinux util-linux;
1717
1818 CFLAGS = "-O2 -Wno-error=stringop-truncation";
1919 buildPhase =
20− stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 "
20+ lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 "
2121 + "bash do";
2222 installPhase = ''
2323 install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6
pkgs/tools/networking/cntlm/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 buildInputs = [ which ];
1313
14− preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
14+ preConfigure = lib.optionalString stdenv.isDarwin ''
1515 substituteInPlace configure --replace "xlc_r gcc" "xlc_r gcc $CC"
1616 substitute Makefile Makefile.$CC --replace "CC=gcc" "CC=$CC"
1717 '';
pkgs/tools/networking/connect/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "connect";
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
1919 description = "Make network connection via SOCKS and https proxy";
2020 longDescription = ''
2121 This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand
22− in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies.
22+ in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies.
2323 '';
2424 homepage = "https://bitbucket.org/gotoh/connect/wiki/Home";
25− license = stdenv.lib.licenses.gpl2Plus;
26− platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
27− maintainers = with stdenv.lib.maintainers; [ jcumming ];
25+ license = lib.licenses.gpl2Plus;
26+ platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
27+ maintainers = with lib.maintainers; [ jcumming ];
2828 };
2929}
pkgs/tools/networking/connman/connman.nix+3−3
@@ -48,10 +48,10 @@
4848, enableTist ? false
4949}:
5050
51−assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ];
52−assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ];
51+assert lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ];
52+assert lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ];
5353
54−let inherit (stdenv.lib) optionals; in
54+let inherit (lib) optionals; in
5555
5656stdenv.mkDerivation rec {
5757 pname = "connman";
pkgs/tools/networking/connman/connman_dmenu/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, connman, dmenu }:
1+{ lib, stdenv, fetchFromGitHub, connman, dmenu }:
22
33stdenv.mkDerivation {
44 pname = "connman_dmenu";
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
2828 meta = {
2929 description = "A dmenu wrapper for connmann";
3030 homepage = "https://github.com/march-linux/connman_dmenu";
31− license = stdenv.lib.licenses.free;
32− maintainers = [ stdenv.lib.maintainers.magnetophon ];
33− platforms = stdenv.lib.platforms.all;
31+ license = lib.licenses.free;
32+ maintainers = [ lib.maintainers.magnetophon ];
33+ platforms = lib.platforms.all;
3434 };
3535}
pkgs/tools/networking/corkscrew/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 meta = with lib; {
1717 homepage = "http://agroman.net/corkscrew/";
1818 description = "A tool for tunneling SSH through HTTP proxies";
19− license = stdenv.lib.licenses.gpl2;
19+ license = lib.licenses.gpl2;
2020 platforms = platforms.unix;
2121 };
2222}
pkgs/tools/networking/curl/default.nix+8−8
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
5555 # Zlib and OpenSSL must be propagated because `libcurl.la' contains
5656 # "-lz -lssl", which aren't necessary direct build inputs of
5757 # applications that use Curl.
58− propagatedBuildInputs = with stdenv.lib;
58+ propagatedBuildInputs = with lib;
5959 optional http2Support nghttp2 ++
6060 optional idnSupport libidn ++
6161 optional ldapSupport openldap ++
@@ -90,13 +90,13 @@ stdenv.mkDerivation rec {
9090 ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" )
9191 ( if brotliSupport then "--with-brotli" else "--without-brotli" )
9292 ]
93− ++ stdenv.lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}"
94− ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
95− ++ stdenv.lib.optional gssSupport "--with-gssapi=${libkrb5.dev}"
93+ ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}"
94+ ++ lib.optional c-aresSupport "--enable-ares=${c-ares}"
95+ ++ lib.optional gssSupport "--with-gssapi=${libkrb5.dev}"
9696 # For the 'urandom', maybe it should be a cross-system option
97− ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
97+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
9898 "--with-random=/dev/urandom"
99− ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [
99+ ++ lib.optionals stdenv.hostPlatform.isWindows [
100100 "--disable-shared"
101101 "--enable-static"
102102 ];
@@ -111,9 +111,9 @@ stdenv.mkDerivation rec {
111111
112112 # Install completions
113113 make -C scripts install
114− '' + stdenv.lib.optionalString scpSupport ''
114+ '' + lib.optionalString scpSupport ''
115115 sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
116− '' + stdenv.lib.optionalString gnutlsSupport ''
116+ '' + lib.optionalString gnutlsSupport ''
117117 ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so
118118 ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4
119119 ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
pkgs/tools/networking/davix/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 # "please ignore the GitHub-generated tarballs, as they are incomplete"
1111 # https://github.com/cern-fts/davix/releases/tag/R_0_7_6
1212 src = fetchurl {
13− url = "https://github.com/cern-fts/${pname}/releases/download/R_${stdenv.lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz";
13+ url = "https://github.com/cern-fts/${pname}/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz";
1414 sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2";
1515 };
1616
pkgs/tools/networking/dd-agent/5.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python
1+{ lib, stdenv, fetchFromGitHub, python
22, unzip, makeWrapper }:
33let
44 python' = python.override {
@@ -105,8 +105,8 @@ in stdenv.mkDerivation rec {
105105 -- v5 Python implementation
106106 '';
107107 homepage = "https://www.datadoghq.com";
108− license = stdenv.lib.licenses.bsd3;
109− platforms = stdenv.lib.platforms.all;
110− maintainers = with stdenv.lib.maintainers; [ thoughtpolice domenkozar ];
108+ license = lib.licenses.bsd3;
109+ platforms = lib.platforms.all;
110+ maintainers = with lib.maintainers; [ thoughtpolice domenkozar ];
111111 };
112112}
pkgs/tools/networking/dd-agent/datadog-agent.nix+1−1
@@ -34,7 +34,7 @@ in buildGoPackage rec {
3434
3535
3636 preBuild = let
37− ldFlags = stdenv.lib.concatStringsSep " " [
37+ ldFlags = lib.concatStringsSep " " [
3838 "-X ${goPackagePath}/pkg/version.Commit=${src.rev}"
3939 "-X ${goPackagePath}/pkg/version.AgentVersion=${version}"
4040 "-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}"
pkgs/tools/networking/dhcp/default.nix+1−1
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 "--sysconfdir=/etc"
3838 "--localstatedir=/var"
3939 ] ++ lib.optional stdenv.isLinux "--with-randomdev=/dev/random"
40− ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ];
40+ ++ lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ];
4141
4242 NIX_CFLAGS_COMPILE = builtins.toString [
4343 "-Wno-error=pointer-compare"
pkgs/tools/networking/dhcpcd/default.nix+1−1
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ];
4444
4545 # Check that the udev plugin got built.
46− postInstall = stdenv.lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
46+ postInstall = lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
4747
4848 meta = with lib; {
4949 description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
pkgs/tools/networking/dibbler/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 "--enable-resolvconf"
1414 ];
1515
16− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1";
16+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1";
1717
1818 meta = with lib; {
1919 description = "Portable DHCPv6 implementation";
pkgs/tools/networking/dirb/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, autoreconfHook, curl }:
1+{ fetchurl, lib, stdenv, autoreconfHook, curl }:
22
33let
44 major = "2";
@@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
3333 meta = {
3434 description = "A web content scanner";
3535 homepage = "http://dirb.sourceforge.net/";
36− maintainers = with stdenv.lib.maintainers; [ bennofs ];
37− license = with stdenv.lib.licenses; [ gpl2 ];
38− platforms = stdenv.lib.platforms.unix;
36+ maintainers = with lib.maintainers; [ bennofs ];
37+ license = with lib.licenses; [ gpl2 ];
38+ platforms = lib.platforms.unix;
3939 };
4040}
pkgs/tools/networking/dnsmasq/default.nix+3−3
@@ -1,7 +1,7 @@
1−{ stdenv, fetchurl, pkgconfig, dbus, nettle, fetchpatch
1+{ lib, stdenv, fetchurl, pkgconfig, dbus, nettle, fetchpatch
22, libidn, libnetfilter_conntrack }:
33
4−with stdenv.lib;
4+with lib;
55let
66 copts = concatStringsSep " " ([
77 "-DHAVE_IDN"
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4";
2020 };
2121
22− postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
22+ postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
2323 sed '1i#include <linux/sockios.h>' -i src/dhcp.c
2424 '';
2525
pkgs/tools/networking/dnstop/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libpcap, ncurses }:
1+{ lib, stdenv, fetchurl, libpcap, ncurses }:
22
33stdenv.mkDerivation rec {
44 name = "dnstop-20140915";
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
1414 mkdir -p $out/share/man/man8 $out/bin
1515 '';
1616
17− meta = {
17+ meta = {
1818 description = "libpcap application that displays DNS traffic on your network";
1919 homepage = "http://dns.measurement-factory.com/tools/dnstop";
20− license = stdenv.lib.licenses.bsd3;
21− platforms = stdenv.lib.platforms.unix;
20+ license = lib.licenses.bsd3;
21+ platforms = lib.platforms.unix;
2222 };
2323}
pkgs/tools/networking/dnstracer/default.nix+2−2
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
2020 install -Dm755 -t $man/share/man/man8 dnstracer.8
2121 '';
2222
23− buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ libresolv ];
23+ buildInputs = [] ++ lib.optionals stdenv.isDarwin [ libresolv ];
2424
25− NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv";
25+ NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lresolv";
2626
2727 meta = with lib; {
2828 description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data";
pkgs/tools/networking/dogdns/default.nix+3−3
@@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec {
1919 };
2020
2121 nativeBuildInputs = [ installShellFiles ]
22− ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
23− buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
24− ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
22+ ++ lib.optionals stdenv.isLinux [ pkg-config ];
23+ buildInputs = lib.optionals stdenv.isLinux [ openssl ]
24+ ++ lib.optionals stdenv.isDarwin [ Security ];
2525
2626 cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6";
2727
pkgs/tools/networking/drill/default.nix+3−3
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec {
1919
2020 cargoSha256 = "1nbfbmm9v1yp7380zdzz7qrc7x6krwlvgn5x5yzb8yn1rc99jzx4";
2121
22− nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
22+ nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
2323 buildInputs = [ ]
24− ++ stdenv.lib.optionals stdenv.isLinux [ openssl ]
25− ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
24+ ++ lib.optionals stdenv.isLinux [ openssl ]
25+ ++ lib.optionals stdenv.isDarwin [ Security ];
2626
2727 meta = with lib; {
2828 description = "HTTP load testing application inspired by Ansible syntax";
pkgs/tools/networking/email/default.nix+1−1
@@ -35,6 +35,6 @@ stdenv.mkDerivation {
3535 description = "Command line SMTP client";
3636 license = with lib.licenses; [ gpl2 ];
3737 homepage = "https://deanproxy.com/code";
38− platforms = stdenv.lib.platforms.unix;
38+ platforms = lib.platforms.unix;
3939 };
4040}
pkgs/tools/networking/ferm/default.nix+6−6
@@ -1,7 +1,7 @@
1−{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }:
1+{ lib, stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }:
22
33let
4− inherit (stdenv.lib.versions) majorMinor;
4+ inherit (lib.versions) majorMinor;
55in stdenv.mkDerivation rec {
66 version = "2.5.1";
77 pname = "ferm";
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
2323 postInstall = ''
2424 rm -r $out/lib/systemd
2525 for i in "$out/sbin/"*; do
26− wrapProgram "$i" --prefix PATH : "${stdenv.lib.makeBinPath [ iptables ipset ebtables ]}"
26+ wrapProgram "$i" --prefix PATH : "${lib.makeBinPath [ iptables ipset ebtables ]}"
2727 done
2828 '';
2929
@@ -39,8 +39,8 @@ in stdenv.mkDerivation rec {
3939 command. The firewall configuration resembles structured programming-like
4040 language, which can contain levels and lists.
4141 '';
42− license = stdenv.lib.licenses.gpl2;
43− maintainers = with stdenv.lib.maintainers; [mic92];
44− platforms = stdenv.lib.platforms.linux;
42+ license = lib.licenses.gpl2;
43+ maintainers = with lib.maintainers; [mic92];
44+ platforms = lib.platforms.linux;
4545 };
4646}
pkgs/tools/networking/flvstreamer/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44
@@ -25,15 +25,15 @@ stdenv.mkDerivation rec {
2525 description = "Command-line RTMP client";
2626
2727 longDescription =
28− '' flvstreamer is an open source command-line RTMP client intended to
28+ '' flvstreamer is an open source command-line RTMP client intended to
2929 stream audio or video content from all types of flash or rtmp servers.
3030 '';
3131
32− license = stdenv.lib.licenses.gpl2Plus;
32+ license = lib.licenses.gpl2Plus;
3333
3434 homepage = "https://savannah.nongnu.org/projects/flvstreamer";
3535
36− maintainers = [ stdenv.lib.maintainers.thammers ];
37− platforms = with stdenv.lib.platforms; linux ++ darwin;
36+ maintainers = [ lib.maintainers.thammers ];
37+ platforms = with lib.platforms; linux ++ darwin;
3838 };
3939}
pkgs/tools/networking/getmail/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python2Packages }:
1+{ lib, stdenv, fetchurl, python2Packages }:
22
33python2Packages.buildPythonApplication rec {
44 pname = "getmail";
@@ -19,12 +19,12 @@ python2Packages.buildPythonApplication rec {
1919
2020 meta = {
2121 description = "A program for retrieving mail";
22− maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ];
23− platforms = stdenv.lib.platforms.linux;
22+ maintainers = [ lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ];
23+ platforms = lib.platforms.linux;
2424
2525 homepage = "http://pyropus.ca/software/getmail/";
2626 inherit version;
2727 updateWalker = true;
28− license = stdenv.lib.licenses.gpl2Plus;
28+ license = lib.licenses.gpl2Plus;
2929 };
3030}
pkgs/tools/networking/gftp/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkgconfig }:
1+{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkgconfig }:
22
33stdenv.mkDerivation {
44 name = "gftp-2.0.19";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 meta = {
1919 description = "GTK-based FTP client";
2020 homepage = "http://www.gftp.org";
21− license = stdenv.lib.licenses.gpl2Plus;
22− platforms = stdenv.lib.platforms.unix;
21+ license = lib.licenses.gpl2Plus;
22+ platforms = lib.platforms.unix;
2323 };
2424}
pkgs/tools/networking/goreplay/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub, libpcap }:
1+{ lib, stdenv, buildGoPackage, fetchFromGitHub, libpcap }:
22
33buildGoPackage rec {
44 pname = "goreplay";
@@ -18,9 +18,9 @@ buildGoPackage rec {
1818
1919 meta = {
2020 homepage = "https://github.com/buger/goreplay";
21− license = stdenv.lib.licenses.lgpl3Only;
21+ license = lib.licenses.lgpl3Only;
2222 description = "Open-source tool for capturing and replaying live HTTP traffic";
23− platforms = stdenv.lib.platforms.unix;
24− maintainers = with stdenv.lib.maintainers; [ lovek323 ];
23+ platforms = lib.platforms.unix;
24+ maintainers = with lib.maintainers; [ lovek323 ];
2525 };
2626}
pkgs/tools/networking/gupnp-tools/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 version = "0.10.0";
2020
2121 src = fetchurl {
22− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
22+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
2323 sha256 = "13d1qr1avz9r76989nvgxhhclmqzr025xjk4rfnja94fpbspznj1";
2424 };
2525
pkgs/tools/networking/haproxy/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 version = "2.3.2";
1515
1616 src = fetchurl {
17− url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
17+ url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
1818 sha256 = "1mcg0d6qiwl3xps65ir2sv5sc868zla5wnfhk24d2b0sg6xp7jwr";
1919 };
2020
pkgs/tools/networking/hping/default.nix+2−2
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
1111 sha256 = "0y0n1ybij3yg9lfgzcwfmjz1sjg913zcqrv391xx83dm0j80sdpb";
1212 };
1313
14− buildInputs = [ libpcap ] ++ stdenv.lib.optional withTcl tcl;
14+ buildInputs = [ libpcap ] ++ lib.optional withTcl tcl;
1515
1616 postPatch = ''
1717 substituteInPlace Makefile.in --replace "gcc" "$CC"
1818 substituteInPlace version.c --replace "RELEASE_DATE" "\"$version\""
19− '' + stdenv.lib.optionalString stdenv.isLinux ''
19+ '' + lib.optionalString stdenv.isLinux ''
2020 sed -i -e 's|#include <net/bpf.h>|#include <pcap/bpf.h>|' \
2121 libpcap_stuff.c script.c
2222 '';
pkgs/tools/networking/httpie/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }:
1+{ lib, stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }:
22
33python3Packages.buildPythonApplication rec {
44 pname = "httpie";
@@ -97,7 +97,7 @@ python3Packages.buildPythonApplication rec {
9797 meta = {
9898 description = "A command line HTTP client whose goal is to make CLI human-friendly";
9999 homepage = "https://httpie.org/";
100− license = stdenv.lib.licenses.bsd3;
101− maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ];
100+ license = lib.licenses.bsd3;
101+ maintainers = with lib.maintainers; [ antono relrod schneefux ];
102102 };
103103}
pkgs/tools/networking/httpstat/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }:
1+{ lib, stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }:
22
33pythonPackages.buildPythonApplication rec {
44 pname = "httpstat";
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
1818 meta = {
1919 description = "curl statistics made simple";
2020 homepage = "https://github.com/reorx/httpstat";
21− license = stdenv.lib.licenses.mit;
22− maintainers = with stdenv.lib.maintainers; [ nequissimus ];
21+ license = lib.licenses.mit;
22+ maintainers = with lib.maintainers; [ nequissimus ];
2323 };
2424}
pkgs/tools/networking/hyenae/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libdnet, pkgconfig, libpcap}:
1+{lib, stdenv, fetchurl, libdnet, pkgconfig, libpcap}:
22
33stdenv.mkDerivation {
44 name = "hyenae-0.36-1";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
1616 meta = {
1717 description = "";
1818 homepage = "https://sourceforge.net/projects/hyenae/";
19− license = stdenv.lib.licenses.gpl3;
20− maintainers = [stdenv.lib.maintainers.marcweber];
21− platforms = stdenv.lib.platforms.linux;
19+ license = lib.licenses.gpl3;
20+ maintainers = [lib.maintainers.marcweber];
21+ platforms = lib.platforms.linux;
2222 };
2323}
pkgs/tools/networking/i2pd/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 sha256 = "0bpkgq7srwpjmadsz3nsd14jpr19b1zfrpc074lzjaq15icxxgxc";
1919 };
2020
21− buildInputs = with stdenv.lib; [ boost zlib openssl ]
21+ buildInputs = with lib; [ boost zlib openssl ]
2222 ++ optional upnpSupport miniupnpc;
2323 makeFlags =
2424 let ynf = a: b: a + "=" + (if b then "yes" else "no"); in
pkgs/tools/networking/iftop/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010
1111 # Explicitly link against libgcc_s, to work around the infamous
1212 # "libgcc_s.so.1 must be installed for pthread_cancel to work".
13− LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
13+ LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
1414
1515 preConfigure = ''
1616 cp ${automake}/share/automake*/config.{sub,guess} config
pkgs/tools/networking/imapproxy/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, openssl, ncurses}:
1+{lib, stdenv, fetchurl, openssl, ncurses}:
22
33stdenv.mkDerivation {
44 name = "imapproxy-1.2.7";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 meta = {
1717 homepage = "http://imapproxy.org/";
1818 description = "It proxies IMAP transactions caching server connections";
19− license = stdenv.lib.licenses.gpl2Plus;
20− platforms = stdenv.lib.platforms.unix;
19+ license = lib.licenses.gpl2Plus;
20+ platforms = lib.platforms.unix;
2121 };
2222}
pkgs/tools/networking/iodine/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, zlib, nettools, nixosTests }:
1+{ lib, stdenv, fetchFromGitHub, zlib, nettools, nixosTests }:
22
33stdenv.mkDerivation rec {
44 pname = "iodine";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 meta = {
2727 homepage = "http://code.kryo.se/iodine/";
2828 description = "Tool to tunnel IPv4 data through a DNS server";
29− license = stdenv.lib.licenses.isc;
30− platforms = stdenv.lib.platforms.unix;
29+ license = lib.licenses.isc;
30+ platforms = lib.platforms.unix;
3131 };
3232}
pkgs/tools/networking/ip2unix/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd
1+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd
22, python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl
33, libxml2, docbook5
44}:
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
3939 meta = {
4040 homepage = "https://github.com/nixcloud/ip2unix";
4141 description = "Turn IP sockets into Unix domain sockets";
42− platforms = stdenv.lib.platforms.linux;
43− license = stdenv.lib.licenses.lgpl3;
44− maintainers = [ stdenv.lib.maintainers.aszlig ];
42+ platforms = lib.platforms.linux;
43+ license = lib.licenses.lgpl3;
44+ maintainers = [ lib.maintainers.aszlig ];
4545 };
4646}
pkgs/tools/networking/ipcalc/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, perl}:
1+{lib, stdenv, fetchurl, perl}:
22stdenv.mkDerivation rec {
33 pname = "ipcalc";
44 version = "0.41";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 meta = {
1515 description = "Simple IP network calculator";
1616 homepage = "http://jodies.de/ipcalc";
17− license = stdenv.lib.licenses.gpl2Plus;
18− platforms = stdenv.lib.platforms.all;
17+ license = lib.licenses.gpl2Plus;
18+ platforms = lib.platforms.all;
1919 };
2020}
pkgs/tools/networking/iperf/3.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 outputs = [ "out" "man" ];
1818
19− patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
19+ patches = lib.optionals stdenv.hostPlatform.isMusl [
2020 (fetchpatch {
2121 url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb";
2222 name = "remove-pg-flags.patch";
pkgs/tools/networking/ipv6calc/default.nix+3−3
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
3030 "--disable-bundled-md5"
3131 "--disable-dynamic-load"
3232 "--enable-shared"
33− ] ++ stdenv.lib.optional (libmaxminddb != null) "--enable-mmdb"
34− ++ stdenv.lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP"
35− ++ stdenv.lib.optional (ip2location-c != null) "--enable-ip2location";
33+ ] ++ lib.optional (libmaxminddb != null) "--enable-mmdb"
34+ ++ lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP"
35+ ++ lib.optional (ip2location-c != null) "--enable-ip2location";
3636
3737 enableParallelBuilding = true;
3838
pkgs/tools/networking/jnettop/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, fetchpatch, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }:
1+{ fetchurl, fetchpatch, lib, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }:
22
33stdenv.mkDerivation {
44 name = "jnettop-0.13.0";
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
3131 '';
3232
3333 homepage = "http://jnettop.kubs.info/";
34− license = stdenv.lib.licenses.gpl2Plus;
35− platforms = stdenv.lib.platforms.unix;
34+ license = lib.licenses.gpl2Plus;
35+ platforms = lib.platforms.unix;
3636 };
3737}
pkgs/tools/networking/junkie/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, libpcap, guile, openssl }:
1+{ lib, stdenv, fetchFromGitHub, pkgconfig, libpcap, guile, openssl }:
22
33stdenv.mkDerivation rec {
44 pname = "junkie";
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 description = "Deep packet inspection swiss-army knife";
2222 homepage = "https://github.com/rixed/junkie";
23− license = stdenv.lib.licenses.agpl3Plus;
24− maintainers = [ stdenv.lib.maintainers.rixed ];
25− platforms = stdenv.lib.platforms.unix;
23+ license = lib.licenses.agpl3Plus;
24+ maintainers = [ lib.maintainers.rixed ];
25+ platforms = lib.platforms.unix;
2626 longDescription = ''
2727 Junkie is a network sniffer like Tcpdump or Wireshark, but designed to
2828 be easy to program and extend.
pkgs/tools/networking/jwhois/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, lynx, fetchurl}:
1+{lib, stdenv, lynx, fetchurl}:
22
33stdenv.mkDerivation {
44 name = "jwhois-4.0";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020 meta = {
2121 description = "A client for the WHOIS protocol allowing you to query the owner of a domain name";
2222 homepage = "https://www.gnu.org/software/jwhois/";
23− license = stdenv.lib.licenses.gpl3;
24− platforms = stdenv.lib.platforms.unix;
23+ license = lib.licenses.gpl3;
24+ platforms = lib.platforms.unix;
2525 };
2626}
pkgs/tools/networking/lftp/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring gettext ];
1919
20− hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";
20+ hardeningDisable = lib.optional stdenv.isDarwin "format";
2121
2222 configureFlags = [
2323 "--with-readline=${readline.dev}"
pkgs/tools/networking/libreswan/default.nix+3−3
@@ -5,7 +5,7 @@
55 }:
66
77let
8− binPath = stdenv.lib.makeBinPath [
8+ binPath = lib.makeBinPath [
99 bash iproute iptables procps coreutils gnused gawk nss.tools which python
1010 ];
1111in
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
3838 nativeBuildInputs = [ makeWrapper pkgconfig ];
3939 buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
4040 libcap_ng curl nspr nss python ldns ]
41− ++ stdenv.lib.optional docs xmlto
42− ++ stdenv.lib.optional stdenv.isLinux libselinux;
41+ ++ lib.optional docs xmlto
42+ ++ lib.optional stdenv.isLinux libselinux;
4343
4444 prePatch = ''
4545 # Correct bash path
pkgs/tools/networking/logmein-hamachi/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchurl }:
22
3−with stdenv.lib;
3+with lib;
44
55let
66 arch =
@@ -12,7 +12,7 @@ let
1212 if stdenv.hostPlatform.system == "x86_64-linux" then "0zy0jzvdqccfsg42m2lq1rj8r2c4iypd1h9vxl9824cbl92yim37"
1313 else if stdenv.hostPlatform.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62"
1414 else throwSystem;
15− libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
15+ libraries = lib.makeLibraryPath [ stdenv.cc.cc ];
1616
1717in stdenv.mkDerivation rec {
1818 pname = "logmein-hamachi";
pkgs/tools/networking/lsh/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gperf, guile, gmp, zlib, liboop, readline, gnum4, pam
1+{ lib, stdenv, fetchurl, gperf, guile, gmp, zlib, liboop, readline, gnum4, pam
22, nettools, lsof, procps }:
33
44stdenv.mkDerivation rec {
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 '';
4444
4545 homepage = "http://www.lysator.liu.se/~nisse/lsh/";
46− license = stdenv.lib.licenses.gpl2Plus;
46+ license = lib.licenses.gpl2Plus;
4747
4848 maintainers = [ ];
4949 platforms = [ "x86_64-linux" ];
pkgs/tools/networking/mailsend/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, openssl}:
1+{lib, stdenv, fetchurl, openssl}:
22let
33 s = # Generated upstream information
44 rec {
@@ -32,9 +32,9 @@ stdenv.mkDerivation {
3232 meta = {
3333 inherit (s) version;
3434 description = ''CLI email sending tool'';
35− license = stdenv.lib.licenses.bsd3 ;
36− maintainers = [stdenv.lib.maintainers.raskin];
37− platforms = stdenv.lib.platforms.linux;
35+ license = lib.licenses.bsd3 ;
36+ maintainers = [lib.maintainers.raskin];
37+ platforms = lib.platforms.linux;
3838 homepage = "https://github.com/muquit/mailsend";
3939 downloadPage = "https://github.com/muquit/mailsend/releases";
4040 };
pkgs/tools/networking/mcrcon/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
44 pname = "mcrcon";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 It is well suited for remote administration and to be used as part of automated server maintenance scripts.
2828 It does not trigger "IO: Broken pipe" or "IO: Connection reset" spam bugs on the server side.
2929 '';
30− maintainers = with stdenv.lib.maintainers; [ dermetfan ];
31− license = with stdenv.lib.licenses; [ zlib libpng ];
30+ maintainers = with lib.maintainers; [ dermetfan ];
31+ license = with lib.licenses; [ zlib libpng ];
3232 };
3333}
pkgs/tools/networking/megatools/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 docbook_xsl docbook_xml_dtd_45 libxslt
1717 ];
1818 buildInputs = [ glib glib-networking curl ]
19− ++ stdenv.lib.optionals stdenv.isLinux [ fuse ];
19+ ++ lib.optionals stdenv.isLinux [ fuse ];
2020
2121 enableParallelBuilding = true;
2222
pkgs/tools/networking/memtier-benchmark/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook
22, pkgconfig, libevent, pcre, zlib, openssl
33}:
44
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
2424 meta = {
2525 description = "Redis and Memcached traffic generation and benchmarking tool";
2626 homepage = "https://github.com/redislabs/memtier_benchmark";
27− license = stdenv.lib.licenses.gpl2;
28− platforms = stdenv.lib.platforms.linux;
29− maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
27+ license = lib.licenses.gpl2;
28+ platforms = lib.platforms.linux;
29+ maintainers = with lib.maintainers; [ thoughtpolice ];
3030 };
3131}
pkgs/tools/networking/miniupnpc/default.nix+2−2
@@ -11,9 +11,9 @@ let
1111 inherit sha256;
1212 };
1313
14− nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ which cctools ];
14+ nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ];
1515
16− patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
16+ patches = lib.optional stdenv.isFreeBSD ./freebsd.patch;
1717
1818 doCheck = !stdenv.isFreeBSD;
1919
pkgs/tools/networking/mosh/default.nix+4−4
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
4141 '';
4242
43− CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
43+ CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
4444
4545 meta = {
4646 homepage = "https://mosh.org/";
@@ -53,8 +53,8 @@ stdenv.mkDerivation rec {
5353 Mosh is a replacement for SSH. It's more robust and responsive,
5454 especially over Wi-Fi, cellular, and long-distance links.
5555 '';
56− license = stdenv.lib.licenses.gpl3Plus;
57− maintainers = with stdenv.lib.maintainers; [viric];
58− platforms = stdenv.lib.platforms.unix;
56+ license = lib.licenses.gpl3Plus;
57+ maintainers = with lib.maintainers; [viric];
58+ platforms = lib.platforms.unix;
5959 };
6060}
pkgs/tools/networking/mozwire/default.nix+1−1
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
1111 sha256 = "01bj3c34x9ywxygsz4rdyw5gc9cz8x6zzl5fd7db8qy8bx2lhlr9";
1212 };
1313
14− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
14+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
1515
1616 cargoSha256 = "0yxnpnxwis46wz4j5rjzyyzrvh94hn8vzxmmrcmrdz3gkakg77hg";
1717
pkgs/tools/networking/mtr/default.nix+3−3
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
2626 --replace ' install-exec-hook' ""
2727 '';
2828
29− configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk";
29+ configureFlags = lib.optional (!withGtk) "--without-gtk";
3030
3131 nativeBuildInputs = [ autoreconfHook pkg-config ];
3232
3333 buildInputs = [ ncurses ]
34− ++ stdenv.lib.optional withGtk gtk3
35− ++ stdenv.lib.optional stdenv.isLinux libcap;
34+ ++ lib.optional withGtk gtk3
35+ ++ lib.optional stdenv.isLinux libcap;
3636
3737 enableParallelBuilding = true;
3838
pkgs/tools/networking/mu/default.nix+4−4
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "03cp2ppj07xpb0c43d3cr8m9jps07mfm8clmlk03sjbxg1widsh0";
1616 };
1717
18− postPatch = stdenv.lib.optionalString (batchSize != null) ''
18+ postPatch = lib.optionalString (batchSize != null) ''
1919 sed -i lib/mu-store.cc --regexp-extended \
2020 -e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@'
2121 '';
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
2424 sqlite xapian glib gmime3 texinfo emacs libsoup icu
2525 ]
2626 # Workaround for https://github.com/djcb/mu/issues/1641
27− ++ stdenv.lib.optional (!stdenv.isDarwin) guile
28− ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ];
27+ ++ lib.optional (!stdenv.isDarwin) guile
28+ ++ lib.optionals withMug [ gtk3 webkitgtk ];
2929
3030 nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ];
3131
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 '';
3939
4040 # Install mug
41− postInstall = stdenv.lib.optionalString withMug ''
41+ postInstall = lib.optionalString withMug ''
4242 for f in mug ; do
4343 install -m755 toys/$f/$f $out/bin/$f
4444 done
pkgs/tools/networking/nbd/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, which }:
1+{ lib, stdenv, fetchurl, pkgconfig, glib, which }:
22
33stdenv.mkDerivation rec {
44 name = "nbd-3.20";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 buildInputs = [ glib ]
12− ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;
12+ ++ lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;
1313
1414 nativeBuildInputs = [ pkgconfig which ];
1515
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
2323 # Glib calls `clock_gettime', which is in librt. Linking that library
2424 # here ensures that a proper rpath is added to the executable so that
2525 # it can be loaded at run-time.
26− NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lrt -lpthread";
26+ NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lrt -lpthread";
2727
2828 meta = {
2929 homepage = "http://nbd.sourceforge.net";
3030 description = "Map arbitrary files as block devices over the network";
31− license = stdenv.lib.licenses.gpl2;
32− maintainers = [ stdenv.lib.maintainers.peti ];
33− platforms = stdenv.lib.platforms.linux;
31+ license = lib.licenses.gpl2;
32+ maintainers = [ lib.maintainers.peti ];
33+ platforms = lib.platforms.linux;
3434 };
3535}
pkgs/tools/networking/ndjbdns/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, systemd, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, systemd, pkgconfig }:
22
3−with stdenv.lib;
3+with lib;
44
55stdenv.mkDerivation {
66 version = "1.06";
pkgs/tools/networking/netboot/default.nix+1−1
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
1515 description = "Mini PXE server";
1616 maintainers = [ maintainers.raskin ];
1717 platforms = ["x86_64-linux"];
18− license = stdenv.lib.licenses.free;
18+ license = lib.licenses.free;
1919 };
2020}
pkgs/tools/networking/netifd/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515
1616 preBuild = ''
1717 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \
18− -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/)"
18+ -I$(echo "${lib.getDev libnl}"/include/libnl*/)"
1919 '';
2020
2121 meta = with lib; {
pkgs/tools/networking/netkit/tftp/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
44 name = "netkit-tftp-0.17";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919 meta = {
2020 description = "Netkit TFTP client and server";
2121 homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/";
22− license = stdenv.lib.licenses.bsdOriginal;
23− maintainers = with stdenv.lib.maintainers; [viric];
24− platforms = with stdenv.lib.platforms; linux;
22+ license = lib.licenses.bsdOriginal;
23+ maintainers = with lib.maintainers; [viric];
24+ platforms = with lib.platforms; linux;
2525 };
2626}
pkgs/tools/networking/netrw/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl
1+{ lib, stdenv, fetchurl
22, checksumType ? "built-in"
33, libmhash ? null
44, openssl ? null
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
1515 "--with-checksum=${checksumType}"
1616 ];
1717
18− buildInputs = stdenv.lib.optional (checksumType == "mhash") libmhash
19− ++ stdenv.lib.optional (checksumType == "openssl") openssl;
18+ buildInputs = lib.optional (checksumType == "mhash") libmhash
19+ ++ lib.optional (checksumType == "openssl") openssl;
2020
2121 src = fetchurl {
2222 urls = [
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828
2929 meta = {
3030 description = "Simple tool for transporting data over the network";
31− license = stdenv.lib.licenses.gpl2;
31+ license = lib.licenses.gpl2;
3232 homepage = "https://mamuti.net/netrw/index.en.html";
33− platforms = stdenv.lib.platforms.unix;
33+ platforms = lib.platforms.unix;
3434 };
3535}
pkgs/tools/networking/nettee/default.nix+1−1
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
1616 meta = {
1717 homepage = "http://saf.bio.caltech.edu/nettee.html";
1818 description = ''Network "tee" program'';
19− license = stdenv.lib.licenses.gpl2;
19+ license = lib.licenses.gpl2;
2020 maintainers = with lib.maintainers; [ Profpatsch ];
2121 platforms = lib.platforms.linux;
2222 };
pkgs/tools/networking/network-manager/applet/default.nix+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 version = "1.18.0";
3030
3131 src = fetchurl {
32− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
32+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
3333 sha256 = "12xiy8g8qk18jvxvn78mvq03zvzp06bww49na765jjw0rq541fyx";
3434 };
3535
pkgs/tools/networking/network-manager/default.nix+1−1
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
1313 version = "1.26.0";
1414
1515 src = fetchurl {
16− url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
16+ url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
1717 sha256 = "0isdqwp58d7r92sqsk7l2vlqwy518n8b7c7z94jk9gc1bdmjf8sj";
1818 };
1919
pkgs/tools/networking/network-manager/dmenu/default.nix+3−3
@@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
3333 meta = with lib; {
3434 description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet";
3535 homepage = "https://github.com/firecat53/networkmanager-dmenu";
36− license = stdenv.lib.licenses.mit;
37− maintainers = [ stdenv.lib.maintainers.jensbin ];
38− platforms = stdenv.lib.platforms.all;
36+ license = lib.licenses.mit;
37+ maintainers = [ lib.maintainers.jensbin ];
38+ platforms = lib.platforms.all;
3939 };
4040}
pkgs/tools/networking/network-manager/fortisslvpn/default.nix+2−2
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
2323
2424 src = fetchurl {
25− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
25+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
2626 sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s";
2727 };
2828
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
5050 networkmanager
5151 ppp
5252 glib
53− ] ++ stdenv.lib.optionals withGnome [
53+ ] ++ lib.optionals withGnome [
5454 gtk3
5555 libsecret
5656 libnma
pkgs/tools/networking/network-manager/iodine/default.nix+1−1
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
2828 ];
2929
3030 buildInputs = [ iodine networkmanager glib ]
31− ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
31+ ++ lib.optionals withGnome [ gtk3 libsecret libnma ];
3232
3333 nativeBuildInputs = [ intltool autoreconfHook pkgconfig ];
3434
pkgs/tools/networking/network-manager/l2tp/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 ];
2424
2525 buildInputs = [ networkmanager ppp ]
26− ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
26+ ++ lib.optionals withGnome [ gtk3 libsecret libnma ];
2727
2828 nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ];
2929
pkgs/tools/networking/network-manager/libnma/default.nix+2−2
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 outputs = [ "out" "dev" "devdoc" ];
3030
3131 src = fetchurl {
32− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
32+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
3333 sha256 = "1d5gzn7ss5vi0bhc8s4i5gsrck1ajslajam5jxfqazg094mffcys";
3434 };
3535
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 networkmanager
5757 isocodes
5858 mobile-broadband-provider-info
59− ] ++ stdenv.lib.optionals withGnome [
59+ ] ++ lib.optionals withGnome [
6060 # advanced certificate chooser
6161 gcr
6262 ];
pkgs/tools/networking/network-manager/openconnect/default.nix+2−2
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
2525 name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
2626
2727 src = fetchurl {
28− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
28+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
2929 sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m";
3030 };
3131
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
4747 libxml2
4848 openconnect
4949 networkmanager
50− ] ++ stdenv.lib.optionals withGnome [
50+ ] ++ lib.optionals withGnome [
5151 gtk3
5252 gcr
5353 libsecret
pkgs/tools/networking/network-manager/openvpn/default.nix+2−2
@@ -8,7 +8,7 @@ in stdenv.mkDerivation {
88 name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
99
1010 src = fetchurl {
11− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1212 sha256 = "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f";
1313 };
1414
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
2020 ];
2121
2222 buildInputs = [ openvpn networkmanager ]
23− ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
23+ ++ lib.optionals withGnome [ gtk3 libsecret libnma ];
2424
2525 nativeBuildInputs = [ intltool pkgconfig file libxml2 ];
2626
pkgs/tools/networking/network-manager/sstp/default.nix+1−1
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
3030 };
3131
3232 buildInputs = [ sstp networkmanager glib ppp ]
33− ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
33+ ++ lib.optionals withGnome [ gtk3 libsecret libnma ];
3434
3535 nativeBuildInputs = [ file intltool autoreconfHook pkgconfig ];
3636
pkgs/tools/networking/network-manager/vpnc/default.nix+2−2
@@ -7,7 +7,7 @@ in stdenv.mkDerivation {
77 name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
88
99 src = fetchurl {
10− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1111 sha256 = "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy";
1212 };
1313
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
2424 ];
2525
2626 buildInputs = [ vpnc networkmanager glib ]
27− ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
27+ ++ lib.optionals withGnome [ gtk3 libsecret libnma ];
2828
2929 nativeBuildInputs = [ intltool pkgconfig file ];
3030
pkgs/tools/networking/ngrok-2/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
3−with stdenv.lib;
3+with lib;
44
55let versions = builtins.fromJSON (builtins.readFile ./versions.json);
66 arch = if stdenv.isi686 then "386"
pkgs/tools/networking/noip/default.nix+2−2
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
2020 meta = with lib; {
2121 description = "Dynamic DNS daemon for no-ip accounts";
2222 homepage = "http://noip.com/download?page=linux";
23− license = stdenv.lib.licenses.gpl2;
24− maintainers = [ stdenv.lib.maintainers.iand675 ];
23+ license = lib.licenses.gpl2;
24+ maintainers = [ lib.maintainers.iand675 ];
2525 platforms = platforms.linux;
2626 };
2727}
pkgs/tools/networking/nss-mdns/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, fetchpatch }:
1+{ fetchurl, lib, stdenv, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 name = "nss-mdns-0.10";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 "--localstatedir=/var"
2121 ];
2222
23− patches = stdenv.lib.optional stdenv.hostPlatform.isMusl
23+ patches = lib.optional stdenv.hostPlatform.isMusl
2424 (
2525 fetchpatch
2626 {
@@ -41,10 +41,10 @@ stdenv.mkDerivation rec {
4141 '';
4242
4343 homepage = "http://0pointer.de/lennart/projects/nss-mdns/";
44− license = stdenv.lib.licenses.lgpl2Plus;
44+ license = lib.licenses.lgpl2Plus;
4545
4646 # Supports both the GNU and FreeBSD NSS.
47− platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd;
47+ platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd;
4848
4949 maintainers = [ ];
5050 };
pkgs/tools/networking/ntopng/default.nix+2−2
@@ -50,12 +50,12 @@ stdenv.mkDerivation rec {
5050
5151 rm -rf httpdocs/geoip
5252 ln -s ${geolite-legacy}/share/GeoIP httpdocs/geoip
53− '' + stdenv.lib.optionalString stdenv.isDarwin ''
53+ '' + lib.optionalString stdenv.isDarwin ''
5454 sed 's|LIBS += -lstdc++.6||' -i Makefile
5555 '';
5656
5757 NIX_CFLAGS_COMPILE = "-fpermissive"
58− + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal";
58+ + lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal";
5959
6060 meta = with lib; {
6161 description = "High-speed web-based traffic analysis and flow collection tool";
pkgs/tools/networking/ntp/default.nix+2−2
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
2626 "--with-openssl-incdir=${openssl.dev}/include"
2727 "--enable-ignore-dns-errors"
2828 "--with-yielding-select=yes"
29− ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps"
30− ++ stdenv.lib.optional withSeccomp "--enable-libseccomp";
29+ ] ++ lib.optional stdenv.isLinux "--enable-linuxcaps"
30+ ++ lib.optional withSeccomp "--enable-libseccomp";
3131
3232 buildInputs = [ libcap openssl perl ]
3333 ++ lib.optional withSeccomp libseccomp
pkgs/tools/networking/ocserv/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 src = fetchFromGitLab {
1111 owner = "openconnect";
1212 repo = "ocserv";
13− rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
13+ rev = "ocserv_${lib.replaceStrings [ "." ] [ "_" ] version}";
1414 sha256 = "0k7sx9sg8akxwfdl51cvdqkdrx9qganqddgri2yhcgznc3f3pz5b";
1515 };
1616
pkgs/tools/networking/offlineimap/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python2Packages,
1+{ lib, stdenv, fetchFromGitHub, python2Packages,
22 asciidoc, cacert, libxml2, libxslt, docbook_xsl }:
33
44python2Packages.buildPythonApplication rec {
@@ -34,7 +34,7 @@ python2Packages.buildPythonApplication rec {
3434 meta = {
3535 description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
3636 homepage = "http://offlineimap.org";
37− license = stdenv.lib.licenses.gpl2Plus;
38− maintainers = with stdenv.lib.maintainers; [ endocrimes ];
37+ license = lib.licenses.gpl2Plus;
38+ maintainers = with lib.maintainers; [ endocrimes ];
3939 };
4040}
pkgs/tools/networking/olsrd/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fetchpatch, bison, flex }:
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, flex }:
22
33stdenv.mkDerivation rec {
44 pname = "olsrd";
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
2828
2929 meta = {
3030 description = "An adhoc wireless mesh routing daemon";
31− license = stdenv.lib.licenses.bsd3;
31+ license = lib.licenses.bsd3;
3232 homepage = "http://olsr.org/";
33− maintainers = with stdenv.lib.maintainers; [viric];
34− platforms = with stdenv.lib.platforms; linux;
33+ maintainers = with lib.maintainers; [viric];
34+ platforms = with lib.platforms; linux;
3535 };
3636}
pkgs/tools/networking/openconnect/default.nix+3−3
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
2020 };
2121
2222 outputs = [ "out" "dev" ];
23−
23+
2424 configureFlags = [
2525 "--with-vpnc-script=${vpnc}/vpnc-script"
2626 "--disable-nls"
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
2828 ];
2929
3030 buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ]
31− ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC;
31+ ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC;
3232 nativeBuildInputs = [ pkgconfig ];
3333
3434 meta = with lib; {
@@ -36,6 +36,6 @@ in stdenv.mkDerivation rec {
3636 homepage = "http://www.infradead.org/openconnect/";
3737 license = licenses.lgpl21;
3838 maintainers = with maintainers; [ pradeepchhetri tricktron ];
39− platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
39+ platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
4040 };
4141}
pkgs/tools/networking/openresolv/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, makeWrapper, coreutils }:
1+{ lib, stdenv, fetchurl, makeWrapper, coreutils }:
22
33stdenv.mkDerivation rec {
44 pname = "openresolv";
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
3333 meta = {
3434 description = "A program to manage /etc/resolv.conf";
3535 homepage = "https://roy.marples.name/projects/openresolv";
36− license = stdenv.lib.licenses.bsd2;
37− maintainers = [ stdenv.lib.maintainers.eelco ];
38− platforms = stdenv.lib.platforms.linux;
36+ license = lib.licenses.bsd2;
37+ maintainers = [ lib.maintainers.eelco ];
38+ platforms = lib.platforms.linux;
3939 };
4040}
pkgs/tools/networking/openssh/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, pkgs
33, fetchurl
44, fetchpatch
@@ -30,7 +30,7 @@ let
3030 };
3131
3232in
33−with stdenv.lib;
33+with lib;
3434stdenv.mkDerivation rec {
3535 pname = "openssh";
3636 inherit version;
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
134134 description = "An implementation of the SSH protocol";
135135 homepage = "https://www.openssh.com/";
136136 changelog = "https://www.openssh.com/releasenotes.html";
137− license = stdenv.lib.licenses.bsd2;
137+ license = lib.licenses.bsd2;
138138 platforms = platforms.unix ++ platforms.windows;
139139 maintainers = with maintainers; [ eelco aneeshusa ];
140140 };
pkgs/tools/networking/openvpn/default.nix+1−1
@@ -17,7 +17,7 @@
1717assert useSystemd -> (systemd != null);
1818assert pkcs11Support -> (pkcs11helper != null);
1919
20−with stdenv.lib;
20+with lib;
2121let
2222 # Check if the script needs to have other binaries wrapped when changing this.
2323 update-resolved = fetchurl {
pkgs/tools/networking/openvpn/openvpn_learnaddress.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:
1+{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:
22
33stdenv.mkDerivation {
44 name = "openvpn-learnaddress-19b03c3";
@@ -15,13 +15,13 @@ stdenv.mkDerivation {
1515 install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress
1616
1717 wrapProgram $out/libexec/openvpn/openvpn-learnaddress \
18− --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk util-linux ]}
18+ --prefix PATH : ${lib.makeBinPath [ coreutils gawk util-linux ]}
1919 '';
2020
2121 meta = {
2222 description = "Openvpn learn-address script to manage a hosts-like file";
2323 homepage = "https://gist.github.com/offlinehacker/4058733/";
24− maintainers = [ stdenv.lib.maintainers.offline ];
25− platforms = stdenv.lib.platforms.unix;
24+ maintainers = [ lib.maintainers.offline ];
25+ platforms = lib.platforms.unix;
2626 };
2727}
pkgs/tools/networking/p2p/azureus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, jdk, swt}:
1+{lib, stdenv, fetchurl, jdk, swt}:
22
33stdenv.mkDerivation {
44 name = "azureus-2.3.0.6";
@@ -11,6 +11,6 @@ stdenv.mkDerivation {
1111 inherit jdk swt;
1212
1313 meta = {
14− platforms = stdenv.lib.platforms.linux;
14+ platforms = lib.platforms.linux;
1515 };
1616}
pkgs/tools/networking/p2p/gtk-gnutella/default.nix+2−2
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
4242 zlib
4343 ]
4444 ++
45− stdenv.lib.optionals (enableGui) [ gtk2 ]
45+ lib.optionals (enableGui) [ gtk2 ]
4646 ;
4747
4848 configureScript = "./build.sh";
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
5151 # See https://sourceforge.net/p/gtk-gnutella/bugs/555/
5252 "--disable-malloc"
5353 ]
54− ++ stdenv.lib.optionals (!enableGui) [ "--topless" ]
54+ ++ lib.optionals (!enableGui) [ "--topless" ]
5555 ;
5656
5757 hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ];
pkgs/tools/networking/p2p/rtorrent/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
2727 # Optional patch adds support for custom configurable colors
2828 # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md
29− patches = stdenv.lib.optional colorSupport (fetchurl {
29+ patches = lib.optional colorSupport (fetchurl {
3030 url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch";
3131 sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965";
3232 });
pkgs/tools/networking/packetdrill/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }:
1+{ lib, stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }:
22stdenv.mkDerivation rec {
33 pname = "packetdrill";
44 version = "unstable-2020-08-22";
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
3434 meta = {
3535 description = "Quick, precise tests for entire TCP/UDP/IPv4/IPv6 network stacks";
3636 homepage = "https://github.com/google/packetdrill";
37− license = stdenv.lib.licenses.gpl2;
38− platforms = stdenv.lib.platforms.linux;
39− maintainers = with stdenv.lib.maintainers; [ dmjio cleverca22 ];
37+ license = lib.licenses.gpl2;
38+ platforms = lib.platforms.linux;
39+ maintainers = with lib.maintainers; [ dmjio cleverca22 ];
4040 };
4141}
pkgs/tools/networking/pdsh/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }:
1+{ lib, stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }:
22
33stdenv.mkDerivation rec {
44 name = "pdsh-2.34";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 buildInputs = [ perl readline ssh ]
12− ++ (stdenv.lib.optional slurmSupport slurm);
12+ ++ (lib.optional slurmSupport slurm);
1313
1414 preConfigure = ''
1515 configureFlagsArray=(
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 meta = {
3131 homepage = "https://github.com/chaos/pdsh";
3232 description = "High-performance, parallel remote shell utility";
33− license = stdenv.lib.licenses.gpl2;
33+ license = lib.licenses.gpl2;
3434
3535 longDescription = ''
3636 Pdsh is a high-performance, parallel remote shell utility. It has
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 while timeouts occur on some connections.
4242 '';
4343
44− platforms = stdenv.lib.platforms.unix;
45− maintainers = [ stdenv.lib.maintainers.peti ];
44+ platforms = lib.platforms.unix;
45+ maintainers = [ lib.maintainers.peti ];
4646 };
4747}
pkgs/tools/networking/pixiecore/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, buildGoModule, fetchFromGitHub }:
1+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
22
33buildGoModule rec {
44 pname = "pixiecore";
@@ -21,8 +21,8 @@ buildGoModule rec {
2121 meta = {
2222 description = "A tool to manage network booting of machines";
2323 homepage = "https://github.com/danderson/netboot/tree/master/pixiecore";
24− license = stdenv.lib.licenses.asl20;
25− maintainers = with stdenv.lib.maintainers; [ bbigras danderson ];
26− platforms = stdenv.lib.platforms.linux;
24+ license = lib.licenses.asl20;
25+ maintainers = with lib.maintainers; [ bbigras danderson ];
26+ platforms = lib.platforms.linux;
2727 };
2828}
pkgs/tools/networking/pixiewps/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
44 pname = "pixiewps";
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
1515 substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out"
1616 substituteInPlace Makefile --replace "/local" ""
1717 '';
18−
18+
1919 meta = {
2020 description = "An offline WPS bruteforce utility";
2121 homepage = "https://github.com/wiire/pixiewps";
22− license = stdenv.lib.licenses.gpl3;
23− maintainers = [ stdenv.lib.maintainers.nico202 ];
24− platforms = stdenv.lib.platforms.linux;
22+ license = lib.licenses.gpl3;
23+ maintainers = [ lib.maintainers.nico202 ];
24+ platforms = lib.platforms.linux;
2525 };
2626}
pkgs/tools/networking/pmacct/default.nix+1−1
@@ -19,7 +19,7 @@ assert withSQLite -> sqlite != null;
1919assert withPgSQL -> postgresql != null;
2020assert withMysql -> libmysqlclient != null;
2121
22−let inherit (stdenv.lib) getDev optional optionalString; in
22+let inherit (lib) getDev optional optionalString; in
2323
2424stdenv.mkDerivation rec {
2525 version = "1.7.5";
pkgs/tools/networking/proxychains/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub } :
1+{ lib, stdenv, fetchFromGitHub } :
22stdenv.mkDerivation rec {
33 pname = "proxychains";
44 version = "4.2.0";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 meta = {
2222 description = "Proxifier for SOCKS proxies";
2323 homepage = "http://proxychains.sourceforge.net";
24− license = stdenv.lib.licenses.gpl2Plus;
25− platforms = stdenv.lib.platforms.linux;
24+ license = lib.licenses.gpl2Plus;
25+ platforms = lib.platforms.linux;
2626 };
2727}
pkgs/tools/networking/pwnat/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 meta = with lib; {
2222 homepage = "http://samy.pl/pwnat/";
2323 description = "ICMP NAT to NAT client-server communication";
24− license = stdenv.lib.licenses.gpl3Plus;
24+ license = lib.licenses.gpl3Plus;
2525 maintainers = with maintainers; [viric];
2626 platforms = with platforms; linux;
2727 };
pkgs/tools/networking/pykms/default.nix+1−1
@@ -17,7 +17,7 @@ let
1717 );
1818 '';
1919
20− dbScript = writeScript "create_pykms_db.sh" (with stdenv.lib; ''
20+ dbScript = writeScript "create_pykms_db.sh" (with lib; ''
2121 #!${runtimeShell}
2222
2323 set -eEuo pipefail
pkgs/tools/networking/redir/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "redir";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
1616 meta = {
1717 description = "A TCP port redirector for UNIX";
1818 homepage = "https://github.com/troglobit/redir";
19− license = stdenv.lib.licenses.gpl2;
20− maintainers = with stdenv.lib.maintainers; [ ];
21− platforms = stdenv.lib.platforms.linux;
19+ license = lib.licenses.gpl2;
20+ maintainers = with lib.maintainers; [ ];
21+ platforms = lib.platforms.linux;
2222 };
2323}
pkgs/tools/networking/redsocks/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, libevent }:
1+{ lib, stdenv, fetchFromGitHub, libevent }:
22
33let
44 pkg = "redsocks";
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
2626 meta = {
2727 description = "Transparent redirector of any TCP connection to proxy";
2828 homepage = "http://darkk.net.ru/redsocks/";
29− license = stdenv.lib.licenses.asl20;
30− maintainers = [ stdenv.lib.maintainers.ekleog ];
31− platforms = stdenv.lib.platforms.linux;
29+ license = lib.licenses.asl20;
30+ maintainers = [ lib.maintainers.ekleog ];
31+ platforms = lib.platforms.linux;
3232 };
3333}
pkgs/tools/networking/s3gof3r/default.nix+2−2
@@ -1,8 +1,8 @@
1−{ stdenv, buildGoPackage, fetchgit }:
1+{ lib, stdenv, buildGoPackage, fetchgit }:
22
33buildGoPackage rec {
44 pname = "s3gof3r";
5− version = "20151109-${stdenv.lib.strings.substring 0 7 rev}";
5+ version = "20151109-${lib.strings.substring 0 7 rev}";
66 rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445";
77
88 goPackagePath = "github.com/rlmcpherson/s3gof3r";
pkgs/tools/networking/samplicator/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "samplicator";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 meta = {
1818 description = "Send copies of (UDP) datagrams to multiple receivers";
1919 homepage = "https://github.com/sleinen/samplicator/";
20− license = stdenv.lib.licenses.gpl2Plus;
21− platforms = stdenv.lib.platforms.unix;
20+ license = lib.licenses.gpl2Plus;
21+ platforms = lib.platforms.unix;
2222 };
2323}
pkgs/tools/networking/shadowsocks-rust/default.nix+1−1
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
1616 SODIUM_USE_PKG_CONFIG = 1;
1717
1818 buildInputs = [ openssl libsodium ]
19− ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
19+ ++ lib.optionals stdenv.isDarwin [ Security ];
2020 nativeBuildInputs = [ pkgconfig ];
2121
2222 meta = with lib; {
pkgs/tools/networking/shorewall/default.nix+4−4
@@ -8,12 +8,12 @@
88, iptables
99, perl
1010, perlPackages
11−, stdenv
11+, lib, stdenv
1212, tree
1313, util-linux
1414}:
1515let
16− PATH = stdenv.lib.concatStringsSep ":"
16+ PATH = lib.concatStringsSep ":"
1717 [ "${coreutils}/bin"
1818 "${iproute}/bin"
1919 "${iptables}/bin"
@@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
124124 not use Netfilter's ipchains compatibility mode and can thus take
125125 advantage of Netfilter's connection state tracking capabilities.
126126 '';
127− license = stdenv.lib.licenses.gpl2Plus;
128− platforms = stdenv.lib.platforms.linux;
127+ license = lib.licenses.gpl2Plus;
128+ platforms = lib.platforms.linux;
129129 };
130130}
pkgs/tools/networking/siege/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1y3dnl1ziw0c0d4nw30aj0sdmjvarn4xfxgfkswffwnkm8z5p9xz";
99 };
1010
11− NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
11+ NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
1212
1313 buildInputs = [ openssl zlib ];
1414
pkgs/tools/networking/sipsak/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 meta = with lib; {
2121 homepage = "https://github.com/sipwise/sipsak";
2222 description = "SIP Swiss army knife";
23− license = stdenv.lib.licenses.gpl2;
23+ license = lib.licenses.gpl2;
2424 maintainers = with maintainers; [ sheenobu ];
2525 platforms = with platforms; unix;
2626 };
pkgs/tools/networking/smokeping/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fping, rrdtool, perlPackages }:
1+{ lib, stdenv, fetchurl, fping, rrdtool, perlPackages }:
22
33stdenv.mkDerivation rec {
44 pname = "smokeping";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
1717 meta = {
1818 description = "Network latency collector";
1919 homepage = "http://oss.oetiker.ch/smokeping";
20− license = stdenv.lib.licenses.gpl2Plus;
21− platforms = stdenv.lib.platforms.all;
22− maintainers = [ stdenv.lib.maintainers.erictapen ];
20+ license = lib.licenses.gpl2Plus;
21+ platforms = lib.platforms.all;
22+ maintainers = [ lib.maintainers.erictapen ];
2323 };
2424}
pkgs/tools/networking/snabb/default.nix+2−2
@@ -1,8 +1,8 @@
1−{ stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools
1+{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools
22,supportOpenstack ? true
33}:
44
5−with stdenv.lib;
5+with lib;
66
77stdenv.mkDerivation rec {
88 pname = "snabb";
pkgs/tools/networking/socat/2.x.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 buildInputs = [ openssl ];
1212
13− patches = stdenv.lib.singleton ./libressl-fixes.patch ;
13+ patches = lib.singleton ./libressl-fixes.patch ;
1414
1515 meta = with lib; {
1616 description = "A utility for bidirectional data transfer between two independent data channels";
pkgs/tools/networking/spiped/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, openssl, coreutils }:
1+{ lib, stdenv, fetchurl, openssl, coreutils }:
22
33stdenv.mkDerivation rec {
44 pname = "spiped";
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
3434 meta = {
3535 description = "Utility for secure encrypted channels between sockets";
3636 homepage = "https://www.tarsnap.com/spiped.html";
37− license = stdenv.lib.licenses.bsd2;
38− platforms = stdenv.lib.platforms.unix;
39− maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
37+ license = lib.licenses.bsd2;
38+ platforms = lib.platforms.unix;
39+ maintainers = [ lib.maintainers.thoughtpolice ];
4040 };
4141}
pkgs/tools/networking/spoofer/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute
22, withGUI ? false, qt5 }:
33
4−let inherit (stdenv.lib) optional;
4+let inherit (lib) optional;
55in
66
77stdenv.mkDerivation rec {
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
3434 '';
3535 platforms = platforms.all;
3636 license = licenses.gpl3Plus;
37− maintainers = with stdenv.lib.maintainers; [ leenaars];
37+ maintainers = with lib.maintainers; [ leenaars];
3838 };
3939}
pkgs/tools/networking/srelay/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 name = "srelay-0.4.8";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 meta = {
1616 description = "A SOCKS proxy and relay";
1717 homepage = "http://socks-relay.sourceforge.net/";
18− platforms = stdenv.lib.platforms.unix;
19− license = stdenv.lib.licenses.bsd3;
18+ platforms = lib.platforms.unix;
19+ license = lib.licenses.bsd3;
2020 };
2121}
pkgs/tools/networking/ssh-ident/default.nix+3−3
@@ -21,8 +21,8 @@ stdenv.mkDerivation {
2121 meta = {
2222 homepage = "https://github.com/ccontavalli/ssh-ident";
2323 description = "Start and use ssh-agent and load identities as necessary";
24− license = stdenv.lib.licenses.bsd2;
25− maintainers = with stdenv.lib.maintainers; [ telotortium ];
26− platforms = with stdenv.lib.platforms; unix;
24+ license = lib.licenses.bsd2;
25+ maintainers = with lib.maintainers; [ telotortium ];
26+ platforms = with lib.platforms; unix;
2727 };
2828}
pkgs/tools/networking/ssldump/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, openssl, libpcap }:
1+{ lib, stdenv, fetchFromGitHub, openssl, libpcap }:
22
33stdenv.mkDerivation {
44 pname = "ssldump";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
2424 description = "An SSLv3/TLS network protocol analyzer";
2525 homepage = "http://ssldump.sourceforge.net";
2626 license = "BSD-style";
27− maintainers = with stdenv.lib.maintainers; [ aycanirican ];
28− platforms = stdenv.lib.platforms.linux;
27+ maintainers = with lib.maintainers; [ aycanirican ];
28+ platforms = lib.platforms.linux;
2929 };
3030}
pkgs/tools/networking/ssmtp/default.nix+3−3
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616
1717 configureFlags = [
1818 "--sysconfdir=/etc"
19− (stdenv.lib.enableFeature tlsSupport "ssl")
19+ (lib.enableFeature tlsSupport "ssl")
2020 ];
2121
2222 postConfigure =
@@ -34,9 +34,9 @@ stdenv.mkDerivation {
3434
3535 installTargets = [ "install" "install-sendmail" ];
3636
37− buildInputs = stdenv.lib.optional tlsSupport openssl;
37+ buildInputs = lib.optional tlsSupport openssl;
3838
39− NIX_LDFLAGS = stdenv.lib.optionalString tlsSupport "-lcrypto";
39+ NIX_LDFLAGS = lib.optionalString tlsSupport "-lcrypto";
4040
4141 meta = with lib; {
4242 platforms = platforms.linux;
pkgs/tools/networking/sstp/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }:
1+{ lib, stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }:
22
33stdenv.mkDerivation rec {
44 pname = "sstp-client";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
2727 meta = {
2828 description = "SSTP client for Linux";
2929 homepage = "http://sstp-client.sourceforge.net/";
30− platforms = stdenv.lib.platforms.linux;
31− maintainers = [ stdenv.lib.maintainers.ktosiek ];
32− license = stdenv.lib.licenses.gpl2;
30+ platforms = lib.platforms.linux;
31+ maintainers = [ lib.maintainers.ktosiek ];
32+ license = lib.licenses.gpl2;
3333 };
3434}
pkgs/tools/networking/strongswan/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch
1+{ lib, stdenv, fetchurl, fetchpatch
22, pkgconfig, autoreconfHook
33, gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib
44, openresolv
@@ -13,7 +13,7 @@
1313# strongswan curl plugin may break.
1414# See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info.
1515
16−with stdenv.lib;
16+with lib;
1717
1818stdenv.mkDerivation rec {
1919 pname = "strongswan";
pkgs/tools/networking/stubby/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ cmake libyaml ];
1515
1616 buildInputs = [ doxygen getdns systemd ]
17− ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
17+ ++ lib.optionals stdenv.isDarwin [ darwin.Security ];
1818
1919 meta = with lib; {
2020 description = "A local DNS Privacy stub resolver (using DNS-over-TLS)";
pkgs/tools/networking/stunnel/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, openssl }:
1+{ lib, stdenv, fetchurl, openssl }:
22
33stdenv.mkDerivation rec {
44 pname = "stunnel";
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
3131 meta = {
3232 description = "Universal tls/ssl wrapper";
3333 homepage = "https://www.stunnel.org/";
34− license = stdenv.lib.licenses.gpl2Plus;
35− platforms = stdenv.lib.platforms.unix;
36− maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
34+ license = lib.licenses.gpl2Plus;
35+ platforms = lib.platforms.unix;
36+ maintainers = [ lib.maintainers.thoughtpolice ];
3737 };
3838}
pkgs/tools/networking/surfraw/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, perl}:
1+{lib, stdenv, fetchurl, perl}:
22
33stdenv.mkDerivation {
44 name = "surfraw-2.3.0";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power";
1919 homepage = "https://gitlab.com/surfraw/Surfraw";
2020 maintainers = [];
21− platforms = stdenv.lib.platforms.linux;
22− license = stdenv.lib.licenses.publicDomain;
21+ platforms = lib.platforms.linux;
22+ license = lib.licenses.publicDomain;
2323 };
2424}
pkgs/tools/networking/swec/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, makeWrapper, perlPackages }:
1+{ fetchurl, lib, stdenv, makeWrapper, perlPackages }:
22
33stdenv.mkDerivation rec {
44 name = "swec-0.4";
@@ -64,9 +64,9 @@ stdenv.mkDerivation rec {
6464 (well, not exactly true, SWEC will ignore robots.txt).
6565 '';
6666
67− license = stdenv.lib.licenses.gpl3Plus;
67+ license = lib.licenses.gpl3Plus;
6868
6969 maintainers = [ ];
70− platforms = stdenv.lib.platforms.linux;
70+ platforms = lib.platforms.linux;
7171 };
7272}
pkgs/tools/networking/tcpdump/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libpcap, perl, fetchpatch }:
1+{ lib, stdenv, fetchurl, libpcap, perl, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 pname = "tcpdump";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525
2626 buildInputs = [ libpcap ];
2727
28− configureFlags = stdenv.lib.optional
28+ configureFlags = lib.optional
2929 (stdenv.hostPlatform != stdenv.buildPlatform)
3030 "ac_cv_linux_vers=2";
3131
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 description = "Network sniffer";
3434 homepage = "http://www.tcpdump.org/";
3535 license = "BSD-style";
36− maintainers = with stdenv.lib.maintainers; [ globin ];
37− platforms = stdenv.lib.platforms.unix;
36+ maintainers = with lib.maintainers; [ globin ];
37+ platforms = lib.platforms.unix;
3838 };
3939}
pkgs/tools/networking/tcpreplay/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 buildInputs = [ libpcap ]
13− ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
13+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
1414 Carbon CoreServices
1515 ];
1616
pkgs/tools/networking/tcptraceroute/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv , fetchurl, libpcap, libnet
1+{ lib, stdenv , fetchurl, libpcap, libnet
22}:
33
44stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 meta = {
2323 description = "A traceroute implementation using TCP packets";
2424 homepage = "https://github.com/mct/tcptraceroute";
25− license = stdenv.lib.licenses.gpl2;
25+ license = lib.licenses.gpl2;
2626 maintainers = [ ];
2727 };
2828}
pkgs/tools/networking/termshark/default.nix+1−1
@@ -19,7 +19,7 @@ buildGoModule rec {
1919 doCheck = false;
2020
2121 postFixup = ''
22− wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]}
22+ wrapProgram $out/bin/termshark --prefix PATH : ${lib.makeBinPath [ wireshark-cli ]}
2323 '';
2424
2525 buildFlagsArray = ''
pkgs/tools/networking/tinc/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, lzo, openssl, zlib}:
1+{lib, stdenv, fetchurl, lzo, openssl, zlib}:
22
33stdenv.mkDerivation rec {
44 version = "1.0.36";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 authentication, compression and ethernet bridging.
2626 '';
2727 homepage="http://www.tinc-vpn.org/";
28− license = stdenv.lib.licenses.gpl2Plus;
29− platforms = stdenv.lib.platforms.unix;
28+ license = lib.licenses.gpl2Plus;
29+ platforms = lib.platforms.unix;
3030 };
3131}
pkgs/tools/networking/tinyproxy/default.nix+2−2
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ autoreconfHook asciidoc libxml2 libxslt docbook_xsl ];
1616
1717 # -z flag is not supported in darwin
18− preAutoreconf = stdenv.lib.optionalString stdenv.isDarwin ''
18+ preAutoreconf = lib.optionalString stdenv.isDarwin ''
1919 substituteInPlace configure.ac --replace \
2020 'LDFLAGS="-Wl,-z,defs $LDFLAGS"' \
2121 'LDFLAGS="-Wl, $LDFLAGS"'
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 "--enable-reverse" # Enable reverse proxying.
4545 ] ++
4646 # See: https://github.com/tinyproxy/tinyproxy/issues/1
47− stdenv.lib.optional stdenv.isDarwin "--disable-regexcheck";
47+ lib.optional stdenv.isDarwin "--disable-regexcheck";
4848
4949 meta = with lib; {
5050 homepage = "https://tinyproxy.github.io/";
pkgs/tools/networking/toss/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
44 pname = "toss";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "05ql0d8wbdhnmh3dw8ch5bi6clfb9h8v21lq2a74iy02slya2y0r";
1111 };
1212 preInstall = "export DESTDIR=$out/bin";
13− meta = with stdenv.lib;
13+ meta = with lib;
1414 src.meta // {
1515 description = "Dead simple LAN file transfers from the command line";
1616 license = with licenses; [ mit ];
pkgs/tools/networking/toxvpn/default.nix+1−1
@@ -2,7 +2,7 @@
22 libtoxcore, libsodium, libcap, zeromq,
33 systemd ? null }:
44
5−with stdenv.lib;
5+with lib;
66
77stdenv.mkDerivation {
88 name = "toxvpn-2019-09-09";
pkgs/tools/networking/tracebox/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 meta = with lib; {
2626 homepage = "http://www.tracebox.org/";
2727 description = "A middlebox detection tool";
28− license = stdenv.lib.licenses.gpl2;
28+ license = lib.licenses.gpl2;
2929 maintainers = [ maintainers.lethalman ];
3030 platforms = platforms.linux;
3131 };
pkgs/tools/networking/traceroute/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 meta = with lib; {
1919 homepage = "http://traceroute.sourceforge.net/";
2020 description = "Tracks the route taken by packets over an IP network";
21− license = stdenv.lib.licenses.gpl2;
21+ license = lib.licenses.gpl2;
2222 maintainers = [ maintainers.koral ];
2323 platforms = platforms.linux;
2424 };
pkgs/tools/networking/trickle/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libevent, libtirpc }:
1+{ lib, stdenv, fetchurl, libevent, libtirpc }:
22
33stdenv.mkDerivation rec {
44 name = "trickle-1.07";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
2727
2828 meta = {
2929 description = "Lightweight userspace bandwidth shaper";
30− license = stdenv.lib.licenses.bsd3;
30+ license = lib.licenses.bsd3;
3131 homepage = "https://monkey.org/~marius/pages/?page=trickle";
32− platforms = stdenv.lib.platforms.linux;
32+ platforms = lib.platforms.linux;
3333 };
3434}
pkgs/tools/networking/tunnelto/default.nix+3−3
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec {
1919
2020 cargoSha256 = "0k0ig3dynj46kh8g7d6bljcaalmp40pvdbhbjmlxrmwnjq6bhzcq";
2121
22− nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
22+ nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
2323 buildInputs = [ ]
24− ++ stdenv.lib.optionals stdenv.isLinux [ openssl ]
25− ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
24+ ++ lib.optionals stdenv.isLinux [ openssl ]
25+ ++ lib.optionals stdenv.isDarwin [ Security ];
2626
2727 meta = with lib; {
2828 description = "Expose your local web server to the internet with a public URL";
pkgs/tools/networking/twa/default.nix+1−1
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 install -Dm 0644 README.md "$out/share/doc/twa/README.md"
4141
4242 wrapProgram "$out/bin/twa" \
43− --prefix PATH : ${stdenv.lib.makeBinPath [ curl
43+ --prefix PATH : ${lib.makeBinPath [ curl
4444 host.dnsutils
4545 jq
4646 ncurses
pkgs/tools/networking/ua/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, buildGoPackage, fetchgit
1+{ lib, stdenv, buildGoPackage, fetchgit
22, pkgconfig
33, glib, libxml2
44}:
@@ -23,9 +23,9 @@ buildGoPackage rec {
2323
2424 meta = {
2525 homepage = "https://github.com/sloonz/ua";
26− license = stdenv.lib.licenses.isc;
26+ license = lib.licenses.isc;
2727 description = "Universal Aggregator";
28− platforms = stdenv.lib.platforms.unix;
29− maintainers = with stdenv.lib.maintainers; [ ttuegel ];
28+ platforms = lib.platforms.unix;
29+ maintainers = with lib.maintainers; [ ttuegel ];
3030 };
3131}
pkgs/tools/networking/udptunnel/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 name = "udptunnel-19";
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
1717 meta = {
1818 homepage = "https://code.google.com/archive/p/udptunnel/";
1919 description = "Tunnels TCP over UDP packets";
20− license = stdenv.lib.licenses.gpl3Plus;
21− maintainers = with stdenv.lib.maintainers; [viric];
22− platforms = with stdenv.lib.platforms; linux;
20+ license = lib.licenses.gpl3Plus;
21+ maintainers = with lib.maintainers; [viric];
22+ platforms = with lib.platforms; linux;
2323 };
2424}
pkgs/tools/networking/uget/default.nix+3−3
@@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
2323 libnotify
2424 libappindicator-gtk3
2525 gtk3
26− (stdenv.lib.getLib dconf)
26+ (lib.getLib dconf)
2727 ]
2828 ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])
29− ++ (stdenv.lib.optional (aria2 != null) aria2);
29+ ++ (lib.optional (aria2 != null) aria2);
3030
3131 enableParallelBuilding = true;
3232
33− preFixup = stdenv.lib.optionalString (aria2 != null)
33+ preFixup = lib.optionalString (aria2 != null)
3434 ''gappsWrapperArgs+=(--suffix PATH : "${aria2}/bin")'';
3535
3636 meta = with lib; {
pkgs/tools/networking/unbound/default.nix+1−1
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 "--with-rootkey-file=${dns-root-data}/root.key"
4444 "--enable-pie"
4545 "--enable-relro-now"
46− ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [
46+ ] ++ lib.optional stdenv.hostPlatform.isStatic [
4747 "--disable-flto"
4848 ] ++ lib.optionals withSystemd [
4949 "--enable-systemd"
pkgs/tools/networking/unbound/python.nix+1−1
@@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
5959 license = licenses.bsd3;
6060 homepage = "http://www.unbound.net";
6161 maintainers = with maintainers; [ leenaars ];
62− platforms = stdenv.lib.platforms.unix;
62+ platforms = lib.platforms.unix;
6363 broken = true;
6464 };
6565}
pkgs/tools/networking/uwimap/default.nix+8−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, pam, openssl }:
1+{ lib, stdenv, fetchurl, fetchpatch, pam, openssl }:
22
33stdenv.mkDerivation ({
44 name = "uw-imap-2007f";
@@ -12,13 +12,13 @@ stdenv.mkDerivation ({
1212 then "osx"
1313 else "lnp") ] # Linux with PAM modules;
1414 # -fPIC is required to compile php with imap on x86_64 systems
15− ++ stdenv.lib.optional stdenv.isx86_64 "EXTRACFLAGS=-fPIC"
16− ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CC=${stdenv.hostPlatform.config}-gcc" "RANLIB=${stdenv.hostPlatform.config}-ranlib" ];
15+ ++ lib.optional stdenv.isx86_64 "EXTRACFLAGS=-fPIC"
16+ ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CC=${stdenv.hostPlatform.config}-gcc" "RANLIB=${stdenv.hostPlatform.config}-ranlib" ];
1717
1818 hardeningDisable = [ "format" ];
1919
2020 buildInputs = [ openssl ]
21− ++ stdenv.lib.optional (!stdenv.isDarwin) pam;
21+ ++ lib.optional (!stdenv.isDarwin) pam;
2222
2323 patches = [ (fetchpatch {
2424 url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch";
@@ -31,7 +31,7 @@ stdenv.mkDerivation ({
3131 sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${openssl.out}/lib,'
3232 '';
3333
34− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
34+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
3535 "-I${openssl.dev}/include/openssl";
3636
3737 installPhase = ''
@@ -45,14 +45,14 @@ stdenv.mkDerivation ({
4545 meta = {
4646 homepage = "https://www.washington.edu/imap/";
4747 description = "UW IMAP toolkit - IMAP-supporting software developed by the UW";
48− license = stdenv.lib.licenses.asl20;
49− platforms = with stdenv.lib.platforms; linux;
48+ license = lib.licenses.asl20;
49+ platforms = with lib.platforms; linux;
5050 };
5151
5252 passthru = {
5353 withSSL = true;
5454 };
55−} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
55+} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
5656 # This is set here to prevent rebuilds on native compilation.
5757 # Configure phase is a no-op there, because this package doesn't use ./configure scripts.
5858 configurePhase = ''
pkgs/tools/networking/vde2/default.nix+3−3
@@ -15,17 +15,17 @@ stdenv.mkDerivation rec {
1515 url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=packages/vde2&id=15b11be49997fa94b603e366064690b7cc6bce61";
1616 sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi";
1717 })
18− ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [
18+ ] ++ lib.optional stdenv.hostPlatform.isMusl [
1919 (fetchpatch {
2020 url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238";
2121 sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af";
2222 })
2323 ];
2424
25− configureFlags = stdenv.lib.optional (!withPython) "--disable-python";
25+ configureFlags = lib.optional (!withPython) "--disable-python";
2626
2727 buildInputs = [ openssl libpcap ]
28− ++ stdenv.lib.optional withPython python2;
28+ ++ lib.optional withPython python2;
2929
3030 hardeningDisable = [ "format" ];
3131
pkgs/tools/networking/vpnc/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }:
1+{ lib, stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }:
22
33stdenv.mkDerivation {
44 name = "vpnc-0.5.3-post-r550";
@@ -50,8 +50,8 @@ stdenv.mkDerivation {
5050 meta = {
5151 homepage = "https://www.unix-ag.uni-kl.de/~massar/vpnc/";
5252 description = "Virtual private network (VPN) client for Cisco's VPN concentrators";
53− license = stdenv.lib.licenses.gpl2Plus;
53+ license = lib.licenses.gpl2Plus;
5454
55− platforms = stdenv.lib.platforms.linux;
55+ platforms = lib.platforms.linux;
5656 };
5757}
pkgs/tools/networking/waitron/default.nix+4−4
@@ -1,5 +1,5 @@
11# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
2−{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
2+{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
33
44buildGoPackage rec {
55 name = "waitron-unstable-${version}";
@@ -23,8 +23,8 @@ buildGoPackage rec {
2323 meta = {
2424 description = "A tool to manage network booting of machines";
2525 homepage = "https://github.com/ns1/waitron";
26− license = stdenv.lib.licenses.asl20;
27− maintainers = with stdenv.lib.maintainers; [ guibert ];
28− platforms = stdenv.lib.platforms.linux;
26+ license = lib.licenses.asl20;
27+ maintainers = with lib.maintainers; [ guibert ];
28+ platforms = lib.platforms.linux;
2929 };
3030}
pkgs/tools/networking/wakelan/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 name = "wakelan-1.1";
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
2121 power on.
2222 '';
2323
24− license = stdenv.lib.licenses.gpl2Plus;
24+ license = lib.licenses.gpl2Plus;
2525
26− maintainers = [ stdenv.lib.maintainers.viric ];
27− platforms = stdenv.lib.platforms.unix;
26+ maintainers = [ lib.maintainers.viric ];
27+ platforms = lib.platforms.unix;
2828 };
2929}
pkgs/tools/networking/wavemon/default.nix+1−1
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
2020 homepage = "https://github.com/uoaerg/wavemon";
2121 license = licenses.gpl3Plus;
2222 maintainers = with maintainers; [ raskin fpletz ];
23− platforms = stdenv.lib.platforms.linux;
23+ platforms = lib.platforms.linux;
2424 };
2525}
pkgs/tools/networking/wbox/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "wbox";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 meta = {
1717 description = "A simple HTTP benchmarking tool";
1818 homepage = "http://www.hping.org/wbox/";
19− license = stdenv.lib.licenses.bsd3;
20− platforms = stdenv.lib.platforms.unix;
19+ license = lib.licenses.bsd3;
20+ platforms = lib.platforms.unix;
2121 };
2222}
pkgs/tools/networking/weighttp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, python, libev, wafHook }:
1+{ lib, stdenv, fetchgit, python, libev, wafHook }:
22stdenv.mkDerivation rec {
33 pname = "weighttp";
44 version = "0.4";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 buildInputs = [ python libev ];
1414
1515 meta = {
16− platforms = stdenv.lib.platforms.unix;
16+ platforms = lib.platforms.unix;
1717 homepage = "https://redmine.lighttpd.net/projects/weighttp/wiki";
1818 description = "A lightweight and simple webserver benchmarking tool";
1919 };
pkgs/tools/networking/wget/default.nix+6−6
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 preConfigure = ''
2121 patchShebangs doc
2222
23− '' + stdenv.lib.optionalString doCheck ''
23+ '' + lib.optionalString doCheck ''
2424 # Work around lack of DNS resolution in chroots.
2525 for i in "tests/"*.pm "tests/"*.px
2626 do
@@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
3030
3131 nativeBuildInputs = [ gettext pkgconfig perlPackages.perl lzip libiconv libintl ];
3232 buildInputs = [ libidn2 zlib pcre libuuid ]
33− ++ stdenv.lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ]
34− ++ stdenv.lib.optional (openssl != null) openssl
35− ++ stdenv.lib.optional (libpsl != null) libpsl
36− ++ stdenv.lib.optional stdenv.isDarwin perlPackages.perl;
33+ ++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ]
34+ ++ lib.optional (openssl != null) openssl
35+ ++ lib.optional (libpsl != null) libpsl
36+ ++ lib.optional stdenv.isDarwin perlPackages.perl;
3737
3838 configureFlags = [
39− (stdenv.lib.withFeatureAs (openssl != null) "ssl" "openssl")
39+ (lib.withFeatureAs (openssl != null) "ssl" "openssl")
4040 ];
4141
4242 doCheck = false;
pkgs/tools/networking/wicd/default.nix+4−4
@@ -7,7 +7,7 @@ let
77in stdenv.mkDerivation rec {
88 pname = "wicd";
99 version = "1.7.2.4";
10−
10+
1111 src = fetchurl {
1212 url = "https://launchpad.net/wicd/1.7/${version}/+download/${pname}-${version}.tar.gz";
1313 sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121 ./no-var-install.patch
2222 ./pygtk.patch
2323 ./no-optimization.patch
24− ./dhclient.patch
24+ ./dhclient.patch
2525 ./fix-app-icon.patch
2626 ./fix-gtk-issues.patch
2727 ./urwid-api-update.patch
@@ -33,10 +33,10 @@ in stdenv.mkDerivation rec {
3333 postPatch = ''
3434 # We don't have "python2".
3535 substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python.interpreter}'"
36−
36+
3737 substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
3838
39− sed -i "2iexport PATH=${stdenv.lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
39+ sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
4040 sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in
4141 sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
4242 sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
pkgs/tools/networking/wifish/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub
1+{ lib, stdenv, fetchFromGitHub
22, dialog
33, gawk
44, wpa_supplicant
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
3434
3535 postFixup = ''
3636 wrapProgram ${placeholder "out"}/bin/wifish \
37− --prefix PATH ":" ${stdenv.lib.makeBinPath [ dialog gawk wpa_supplicant ]}
37+ --prefix PATH ":" ${lib.makeBinPath [ dialog gawk wpa_supplicant ]}
3838 '';
3939
40− meta = with stdenv.lib; {
40+ meta = with lib; {
4141 homepage = "https://github.com/bougyman/wifish";
4242 description = "Simple wifi shell script for linux";
4343 license = licenses.wtfpl;
pkgs/tools/networking/wireguard-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchzip
33, nixosTests
44, iptables ? null
@@ -9,7 +9,7 @@
99, wireguard-go ? null
1010}:
1111
12−with stdenv.lib;
12+with lib;
1313
1414stdenv.mkDerivation rec {
1515 pname = "wireguard-tools";
pkgs/tools/networking/wrk2/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, luajit, openssl, zlib }:
1+{ lib, stdenv, fetchFromGitHub, luajit, openssl, zlib }:
22
33stdenv.mkDerivation rec {
44 pname = "wrk2";
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
3535 meta = {
3636 description = "Constant throughput, correct latency recording variant of wrk";
3737 homepage = "https://github.com/giltene/wrk2";
38− license = stdenv.lib.licenses.bsd3;
39− platforms = stdenv.lib.platforms.linux;
40− maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
38+ license = lib.licenses.bsd3;
39+ platforms = lib.platforms.linux;
40+ maintainers = with lib.maintainers; [ thoughtpolice ];
4141 };
4242}
pkgs/tools/networking/xnbd/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson }:
1+{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson }:
22
33stdenv.mkDerivation rec {
44 name = "xnbd-0.4.0";
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
2626 meta = {
2727 homepage = "https://bitbucket.org/hirofuchi/xnbd";
2828 description = "Yet another NBD (Network Block Device) server program";
29− license = stdenv.lib.licenses.gpl2;
30− maintainers = [ stdenv.lib.maintainers.volth ];
31− platforms = stdenv.lib.platforms.linux;
29+ license = lib.licenses.gpl2;
30+ maintainers = [ lib.maintainers.volth ];
31+ platforms = lib.platforms.linux;
3232 };
3333}
pkgs/tools/networking/zssh/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, readline }:
1+{ lib, stdenv, fetchurl, readline }:
22
33let
44 version = "1.5c";
@@ -32,8 +32,8 @@ in stdenv.mkDerivation rec {
3232 meta = {
3333 description = "SSH and Telnet client with ZMODEM file transfer capability";
3434 homepage = "http://zssh.sourceforge.net/";
35− license = stdenv.lib.licenses.gpl2;
35+ license = lib.licenses.gpl2;
3636 maintainers = [ ]; # required by deepin-terminal
37− platforms = stdenv.lib.platforms.linux;
37+ platforms = lib.platforms.linux;
3838 };
3939}
pkgs/tools/nix/manix/default.nix+1−1
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
1111 sha256 = "0fv3sgzwjsgq2h1177r8r1cl5zrfja4ll801sd0bzj3nzmkyww7p";
1212 };
1313
14− buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ];
14+ buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ];
1515
1616 cargoSha256 = "0f2q3bj1cmpbma0fjhc2lc92j4al78fhrx3yc37kmbgzaza0yan5";
1717
pkgs/tools/nix/nix-output-monitor/default.nix+3−3
@@ -1,5 +1,5 @@
11{ mkDerivation, ansi-terminal, async, attoparsec, base, containers
2−, directory, HUnit, mtl, nix-derivation, process, relude, stdenv
2+, directory, HUnit, mtl, nix-derivation, process, relude, lib, stdenv
33, stm, text, time, unix, fetchFromGitHub
44}:
55mkDerivation {
@@ -27,6 +27,6 @@ mkDerivation {
2727 ];
2828 homepage = "https://github.com/maralorn/nix-output-monitor";
2929 description = "Parses output of nix-build to show additional information";
30− license = stdenv.lib.licenses.agpl3Plus;
31− maintainers = [ stdenv.lib.maintainers.maralorn ];
30+ license = lib.licenses.agpl3Plus;
31+ maintainers = [ lib.maintainers.maralorn ];
3232}
pkgs/tools/nix/nixdoc/default.nix+1−1
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
1111 sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s";
1212 };
1313
14− buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ];
14+ buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ];
1515
1616 cargoSha256 = "1vamwynkbnffs8ryr2zb1a41cymjvr8zzh1bifyh9hpkx2k11rs3";
1717
pkgs/tools/package-management/appimagekit/default.nix+1−1
@@ -98,7 +98,7 @@ in stdenv.mkDerivation rec {
9898 cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin"
9999
100100 wrapProgram "$out/bin/appimagetool" \
101− --prefix PATH : "${stdenv.lib.makeBinPath [ file gnupg ]}"
101+ --prefix PATH : "${lib.makeBinPath [ file gnupg ]}"
102102 '';
103103
104104 checkInputs = [ gtest ];
pkgs/tools/package-management/cargo-outdated/default.nix+1−1
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
1515
1616 nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ openssl ]
18− ++ stdenv.lib.optionals stdenv.isDarwin [
18+ ++ lib.optionals stdenv.isDarwin [
1919 darwin.apple_sdk.frameworks.Security
2020 libiconv
2121 curl
pkgs/tools/package-management/cargo-release/default.nix+1−1
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
1515
1616 nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ openssl ]
18− ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
18+ ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
1919
2020 meta = with lib; {
2121 description = ''Cargo subcommand "release": everything about releasing a rust crate'';
pkgs/tools/package-management/cargo-update/default.nix+1−1
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
3030 nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ];
3131
3232 buildInputs = [ libgit2 libssh2 openssl zlib ]
33− ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ];
33+ ++ lib.optionals stdenv.isDarwin [ curl Security ];
3434
3535 postBuild = ''
3636 # Man pages contain non-ASCII, so explicitly set encoding to UTF-8.
pkgs/tools/package-management/checkinstall/default.nix+5−5
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, gettext}:
1+{lib, stdenv, fetchurl, gettext}:
22
33assert stdenv.isLinux && stdenv ? glibc;
44
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
3737 ./set-buildroot.patch
3838 ]
3939
40− ++ stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux")
40+ ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux")
4141 # Force use of old memcpy so that installwatch works on Glibc <
4242 # 2.14.
4343 ./use-old-memcpy.patch;
@@ -67,8 +67,8 @@ stdenv.mkDerivation {
6767 meta = {
6868 homepage = "http://checkinstall.izto.org/";
6969 description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'";
70− maintainers = [ stdenv.lib.maintainers.eelco ];
71− platforms = stdenv.lib.platforms.linux;
72− license = stdenv.lib.licenses.gpl2;
70+ maintainers = [ lib.maintainers.eelco ];
71+ platforms = lib.platforms.linux;
72+ license = lib.licenses.gpl2;
7373 };
7474}
pkgs/tools/package-management/disnix/DisnixWebService/default.nix+5−5
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
1+{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
22
33stdenv.mkDerivation {
44 name = "DisnixWebService-0.10";
@@ -18,11 +18,11 @@ stdenv.mkDerivation {
1818 '';
1919 buildPhase = "ant";
2020 installPhase = "ant install";
21−
21+
2222 meta = {
2323 description = "A SOAP interface and client for Disnix";
24− license = stdenv.lib.licenses.mit;
25− maintainers = [ stdenv.lib.maintainers.sander ];
26− platforms = stdenv.lib.platforms.linux;
24+ license = lib.licenses.mit;
25+ maintainers = [ lib.maintainers.sander ];
26+ platforms = lib.platforms.linux;
2727 };
2828}
pkgs/tools/package-management/disnix/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }:
1+{ lib, stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }:
22
33stdenv.mkDerivation {
44 name = "disnix-0.10";
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
1313
1414 meta = {
1515 description = "A Nix-based distributed service deployment tool";
16− license = stdenv.lib.licenses.lgpl21Plus;
17− maintainers = with stdenv.lib.maintainers; [ sander tomberek ];
18− platforms = stdenv.lib.platforms.unix;
16+ license = lib.licenses.lgpl21Plus;
17+ maintainers = with lib.maintainers; [ sander tomberek ];
18+ platforms = lib.platforms.unix;
1919 };
2020}
pkgs/tools/package-management/disnix/disnixos/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
1+{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
22
33stdenv.mkDerivation {
44 name = "disnixos-0.9";
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
1313
1414 meta = {
1515 description = "Provides complementary NixOS infrastructure deployment to Disnix";
16− license = stdenv.lib.licenses.lgpl21Plus;
17− maintainers = [ stdenv.lib.maintainers.sander ];
18− platforms = stdenv.lib.platforms.linux;
16+ license = lib.licenses.lgpl21Plus;
17+ maintainers = [ lib.maintainers.sander ];
18+ platforms = lib.platforms.linux;
1919 };
2020}
pkgs/tools/package-management/disnix/dydisnix/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }:
1+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }:
22
33stdenv.mkDerivation rec {
44 version="2020-07-04";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 description = "A toolset enabling self-adaptive redeployment on top of Disnix";
2222 longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems.";
23− license = stdenv.lib.licenses.lgpl21Plus;
24− maintainers = [ stdenv.lib.maintainers.tomberek ];
25− platforms = stdenv.lib.platforms.unix;
23+ license = lib.licenses.lgpl21Plus;
24+ maintainers = [ lib.maintainers.tomberek ];
25+ platforms = lib.platforms.unix;
2626 };
2727}
pkgs/tools/package-management/disnix/dysnomia/default.nix+15−15
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, netcat
1+{ lib, stdenv, fetchurl, netcat
22, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null
33, enableApacheWebApplication ? false
44, enableAxis2WebService ? false
@@ -48,24 +48,24 @@ stdenv.mkDerivation {
4848 (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord")
4949 (if enableDockerContainer then "--with-docker" else "--without-docker")
5050 "--with-job-template=${jobTemplate}"
51− ] ++ stdenv.lib.optional enableLegacy "--enable-legacy";
51+ ] ++ lib.optional enableLegacy "--enable-legacy";
5252
5353 buildInputs = [ getopt netcat ]
54− ++ stdenv.lib.optional stdenv.isLinux systemd
55− ++ stdenv.lib.optional enableEjabberdDump ejabberd
56− ++ stdenv.lib.optional enableMySQLDatabase mysql.out
57− ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
58− ++ stdenv.lib.optional enableSubversionRepository subversion
59− ++ stdenv.lib.optional enableMongoDatabase mongodb
60− ++ stdenv.lib.optional enableMongoDatabase mongodb-tools
61− ++ stdenv.lib.optional enableInfluxDatabase influxdb
62− ++ stdenv.lib.optional enableSupervisordProgram supervisor
63− ++ stdenv.lib.optional enableDockerContainer docker;
54+ ++ lib.optional stdenv.isLinux systemd
55+ ++ lib.optional enableEjabberdDump ejabberd
56+ ++ lib.optional enableMySQLDatabase mysql.out
57+ ++ lib.optional enablePostgreSQLDatabase postgresql
58+ ++ lib.optional enableSubversionRepository subversion
59+ ++ lib.optional enableMongoDatabase mongodb
60+ ++ lib.optional enableMongoDatabase mongodb-tools
61+ ++ lib.optional enableInfluxDatabase influxdb
62+ ++ lib.optional enableSupervisordProgram supervisor
63+ ++ lib.optional enableDockerContainer docker;
6464
6565 meta = {
6666 description = "Automated deployment of mutable components and services for Disnix";
67− license = stdenv.lib.licenses.mit;
68− maintainers = [ stdenv.lib.maintainers.sander ];
69− platforms = stdenv.lib.platforms.unix;
67+ license = lib.licenses.mit;
68+ maintainers = [ lib.maintainers.sander ];
69+ platforms = lib.platforms.unix;
7070 };
7171}
pkgs/tools/package-management/dpkg/default.nix+2−2
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
1313 "--disable-dselect"
1414 "--with-admindir=/var/lib/dpkg"
1515 "PERL_LIBDIR=$(out)/${perl.libPrefix}"
16− (stdenv.lib.optionalString stdenv.isDarwin "--disable-linker-optimisations")
17− (stdenv.lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon")
16+ (lib.optionalString stdenv.isDarwin "--disable-linker-optimisations")
17+ (lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon")
1818 ];
1919
2020 preConfigure = ''
pkgs/tools/package-management/libdnf/default.nix+1−1
@@ -12,7 +12,7 @@ gcc9Stdenv.mkDerivation rec {
1212 sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq";
1313 };
1414
15− patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
15+ patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
1616
1717 nativeBuildInputs = [
1818 cmake
pkgs/tools/package-management/librepo/default.nix+1−1
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
4848 libxml2
4949 ];
5050
51− cmakeFlags = [ "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" ];
51+ cmakeFlags = [ "-DPYTHON_DESIRED=${lib.substring 0 1 python.pythonVersion}" ];
5252
5353 postFixup = ''
5454 moveToOutput "lib/${python.libPrefix}" "$py"
pkgs/tools/package-management/microdnf/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 description = "Lightweight implementation of dnf in C";
1919 homepage = "https://github.com/rpm-software-management/microdnf";
2020 license = licenses.gpl2Plus;
21− maintainers = with stdenv.lib.maintainers; [ rb2k ];
21+ maintainers = with lib.maintainers; [ rb2k ];
2222 platforms = platforms.linux ++ platforms.darwin;
2323 };
2424}
pkgs/tools/package-management/niff/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, python3
33, fetchFromGitHub
44}:
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
2828 meta = {
2929 description = "A program that compares two Nix expressions and determines which attributes changed";
3030 homepage = "https://github.com/FRidh/niff";
31− license = stdenv.lib.licenses.mit;
32− maintainers = [ stdenv.lib.maintainers.fridh ];
31+ license = lib.licenses.mit;
32+ maintainers = [ lib.maintainers.fridh ];
3333 };
3434}
pkgs/tools/package-management/nix-du/default.nix+1−1
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
1919 buildInputs = [
2020 boost
2121 nix
22− ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
22+ ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
2323
2424 meta = with lib; {
2525 description = "A tool to determine which gc-roots take space in your nix store";
pkgs/tools/package-management/nix-index/default.nix+2−2
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
1717
1818 nativeBuildInputs = [ pkgconfig makeWrapper ];
1919 buildInputs = [ openssl curl ]
20− ++ stdenv.lib.optional stdenv.isDarwin Security;
20+ ++ lib.optional stdenv.isDarwin Security;
2121
2222 doCheck = !stdenv.isDarwin;
2323
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
2727 substituteInPlace $out/etc/profile.d/command-not-found.sh \
2828 --replace "@out@" "$out"
2929 wrapProgram $out/bin/nix-index \
30− --prefix PATH : "${stdenv.lib.makeBinPath [ nix ]}"
30+ --prefix PATH : "${lib.makeBinPath [ nix ]}"
3131 '';
3232
3333 meta = with lib; {
pkgs/tools/package-management/nix-prefetch-scripts/default.nix+3−3
@@ -13,7 +13,7 @@ let mkPrefetchScript = tool: src: deps:
1313 installPhase = ''
1414 install -vD ${src} $out/bin/$name;
1515 wrapProgram $out/bin/$name \
16− --prefix PATH : ${stdenv.lib.makeBinPath (deps ++ [ gnused nix ])} \
16+ --prefix PATH : ${lib.makeBinPath (deps ++ [ gnused nix ])} \
1717 --set HOME /homeless-shelter
1818 '';
1919
@@ -22,7 +22,7 @@ let mkPrefetchScript = tool: src: deps:
2222 meta = with lib; {
2323 description = "Script used to obtain source hashes for fetch${tool}";
2424 maintainers = with maintainers; [ bennofs ];
25− platforms = stdenv.lib.platforms.unix;
25+ platforms = lib.platforms.unix;
2626 };
2727 };
2828in rec {
@@ -40,7 +40,7 @@ in rec {
4040 meta = with lib; {
4141 description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes";
4242 maintainers = with maintainers; [ bennofs ];
43− platforms = stdenv.lib.platforms.unix;
43+ platforms = lib.platforms.unix;
4444 };
4545 };
4646}
pkgs/tools/package-management/nix-prefetch/default.nix+1−1
@@ -3,7 +3,7 @@
33, gnugrep, gnused, jq, nix, fetchpatch }:
44
55let
6− binPath = stdenv.lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];
6+ binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];
77
88in stdenv.mkDerivation rec {
99 pname = "nix-prefetch";
pkgs/tools/package-management/nix-serve/default.nix+2−2
@@ -1,8 +1,8 @@
1−{ stdenv, fetchFromGitHub,
1+{ lib, stdenv, fetchFromGitHub,
22 bzip2, nix, perl, perlPackages,
33}:
44
5−with stdenv.lib;
5+with lib;
66
77let
88 rev = "e4675e38ab54942e351c7686e40fabec822120b9";
pkgs/tools/package-management/nix-top/default.nix+1−1
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 install -D -m755 ./nix-top $out/bin/nix-top
3939 wrapProgram $out/bin/nix-top \
4040 --prefix PATH : "$out/libexec/nix-top:${additionalPath}"
41− '' + stdenv.lib.optionalString stdenv.isDarwin ''
41+ '' + lib.optionalString stdenv.isDarwin ''
4242 ln -s /bin/stty $out/libexec/nix-top
4343 '';
4444
pkgs/tools/package-management/nix/default.nix+3−3
@@ -154,9 +154,9 @@ common =
154154 environments.
155155 '';
156156 homepage = "https://nixos.org/";
157− license = stdenv.lib.licenses.lgpl2Plus;
158− maintainers = [ stdenv.lib.maintainers.eelco ];
159− platforms = stdenv.lib.platforms.unix;
157+ license = lib.licenses.lgpl2Plus;
158+ maintainers = [ lib.maintainers.eelco ];
159+ platforms = lib.platforms.unix;
160160 outputsToInstall = [ "out" "man" ];
161161 };
162162
pkgs/tools/package-management/nixui/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem
1+{ lib, stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem
22, writeScript }:
33let
44 version = "0.2.1";
@@ -37,8 +37,8 @@ stdenv.mkDerivation {
3737 meta = {
3838 description = "NodeWebkit user interface for Nix";
3939 homepage = "https://github.com/matejc/nixui";
40− license = stdenv.lib.licenses.asl20;
41− maintainers = [ stdenv.lib.maintainers.matejc ];
42− platforms = stdenv.lib.platforms.unix;
40+ license = lib.licenses.asl20;
41+ maintainers = [ lib.maintainers.matejc ];
42+ platforms = lib.platforms.unix;
4343 };
4444}
pkgs/tools/package-management/rpm/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
2323 propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ]
24− ++ stdenv.lib.optional stdenv.isLinux elfutils;
24+ ++ lib.optional stdenv.isLinux elfutils;
2525
2626 NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
2727
pkgs/tools/security/1password-gui/default.nix+1−1
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
4848 # Wrap the application with Electron.
4949 makeWrapper "${electron_11}/bin/electron" "$out/bin/${pname}" \
5050 --add-flags "$out/share/${pname}/resources/app.asar" \
51− --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeLibs}"
51+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}"
5252 '';
5353
5454 passthru.updateScript = ./update.sh;
pkgs/tools/security/acsccid/default.nix+1−1
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 buildInputs = [
3737 pcsclite
3838 libusb1
39− ] ++ stdenv.lib.optionals stdenv.isDarwin [
39+ ] ++ lib.optionals stdenv.isDarwin [
4040 libiconv
4141 ];
4242
pkgs/tools/security/aespipe/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 postInstall = ''
1717 cp bz2aespipe $out/bin
1818 wrapProgram $out/bin/bz2aespipe \
19− --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ sharutils ]}
19+ --prefix PATH : $out/bin:${lib.makeBinPath [ sharutils ]}
2020 '';
2121
2222 meta = with lib; {
pkgs/tools/security/afl/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, callPackage, makeWrapper
1+{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper
22, clang, llvm, which, libcgroup
33}:
44
@@ -74,9 +74,9 @@ let
7474 testing regimes down the road.
7575 '';
7676 homepage = "https://lcamtuf.coredump.cx/afl/";
77− license = stdenv.lib.licenses.asl20;
77+ license = lib.licenses.asl20;
7878 platforms = ["x86_64-linux" "i686-linux"];
79− maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ];
79+ maintainers = with lib.maintainers; [ thoughtpolice ris ];
8080 };
8181 };
8282in afl
pkgs/tools/security/afl/libdislocator.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, afl}:
22
33stdenv.mkDerivation {
4− version = stdenv.lib.getVersion afl;
4+ version = lib.getVersion afl;
55 pname = "libdislocator";
66
77 src = afl.src;
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
2828 the odds of bumping into heap-related security bugs in
2929 several ways.
3030 '';
31− license = stdenv.lib.licenses.asl20;
31+ license = lib.licenses.asl20;
3232 maintainers = with maintainers; [ ris ];
3333 };
3434}
pkgs/tools/security/afl/qemu.nix+1−1
@@ -2,7 +2,7 @@
22, texinfo, libuuid, flex, bison, pixman, autoconf
33}:
44
5−with stdenv.lib;
5+with lib;
66
77let
88 qemuName = "qemu-2.10.0";
pkgs/tools/security/aflplusplus/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper
1+{ lib, stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper
22, clang, llvm, gcc, which, libcgroup, python, perl, gmp
33, file, wine ? null, fetchpatch
44}:
@@ -31,7 +31,7 @@ let
3131 # script.
3232 nativeBuildInputs = [ makeWrapper which clang gcc ];
3333 buildInputs = [ llvm python gmp ]
34− ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython;
34+ ++ lib.optional (wine != null) python.pkgs.wrapPython;
3535
3636
3737 postPatch = ''
@@ -91,7 +91,7 @@ let
9191
9292 patchShebangs $out/bin
9393
94− '' + stdenv.lib.optionalString (wine != null) ''
94+ '' + lib.optionalString (wine != null) ''
9595 substitute afl-wine-trace $out/bin/afl-wine-trace \
9696 --replace "qemu_mode/unsigaction" "$out/lib/afl"
9797 chmod +x $out/bin/afl-wine-trace
@@ -128,9 +128,9 @@ let
128128 and improvements from the community
129129 '';
130130 homepage = "https://aflplus.plus";
131− license = stdenv.lib.licenses.asl20;
131+ license = lib.licenses.asl20;
132132 platforms = ["x86_64-linux" "i686-linux"];
133− maintainers = with stdenv.lib.maintainers; [ ris mindavi ];
133+ maintainers = with lib.maintainers; [ ris mindavi ];
134134 };
135135 };
136136in aflplusplus
pkgs/tools/security/aflplusplus/libdislocator.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, aflplusplus}:
22
33stdenv.mkDerivation {
4− version = stdenv.lib.getVersion aflplusplus;
4+ version = lib.getVersion aflplusplus;
55 pname = "libdislocator";
66
77 src = aflplusplus.src;
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
3131 the odds of bumping into heap-related security bugs in
3232 several ways.
3333 '';
34− license = stdenv.lib.licenses.asl20;
34+ license = lib.licenses.asl20;
3535 maintainers = with maintainers; [ ris ];
3636 };
3737}
pkgs/tools/security/aflplusplus/libtokencap.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, aflplusplus}:
22
33stdenv.mkDerivation {
4− version = stdenv.lib.getVersion aflplusplus;
4+ version = lib.getVersion aflplusplus;
55 pname = "libtokencap";
66
77 src = aflplusplus.src;
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
2626 meta = with lib; {
2727 homepage = "https://github.com/vanhauser-thc/AFLplusplus";
2828 description = "strcmp & memcmp token capture library";
29− license = stdenv.lib.licenses.asl20;
29+ license = lib.licenses.asl20;
3030 maintainers = with maintainers; [ ris ];
3131 };
3232}
pkgs/tools/security/aflplusplus/qemu.nix+1−1
@@ -2,7 +2,7 @@
22, texinfo, libuuid, flex, bison, pixman, autoconf
33}:
44
5−with stdenv.lib;
5+with lib;
66
77let
88 qemuName = "qemu-3.1.0";
pkgs/tools/security/apg/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, openssl }:
1+{ lib, stdenv, fetchurl, openssl }:
22stdenv.mkDerivation rec {
33 name = "apg-2.3.0b";
44 src = fetchurl {
@@ -8,14 +8,14 @@ stdenv.mkDerivation rec {
88 configurePhase = ''
99 substituteInPlace Makefile --replace /usr/local "$out"
1010 '';
11− makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"];
11+ makeFlags = lib.optionals stdenv.isDarwin ["CC=cc"];
1212
1313 patches = [
1414 ./apg.patch
1515 ./phony-install-target.patch
1616 ];
1717
18− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
18+ postPatch = lib.optionalString stdenv.isDarwin ''
1919 sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile
2020 '';
2121
@@ -65,8 +65,8 @@ stdenv.mkDerivation rec {
6565 password generation
6666 '';
6767 homepage = "http://www.adel.nursat.kz/apg/";
68− license = stdenv.lib.licenses.bsd3;
69− maintainers = with stdenv.lib.maintainers; [ astsmtl ];
70− platforms = stdenv.lib.platforms.unix;
68+ license = lib.licenses.bsd3;
69+ maintainers = with lib.maintainers; [ astsmtl ];
70+ platforms = lib.platforms.unix;
7171 };
7272}
pkgs/tools/security/asc-key-to-qr-code-gif/default.nix+2−2
@@ -23,12 +23,12 @@ stdenv.mkDerivation {
2323 substitutions = [
2424 ''--replace "convert" "${imagemagick}/bin/convert"''
2525 ''--replace "qrencode" "${qrencode.bin}/bin/qrencode"''
26− ] ++ stdenv.lib.optional testQR [
26+ ] ++ lib.optional testQR [
2727 ''--replace "hash zbarimg" "true"'' # hash does not work on NixOS
2828 ''--replace "$(zbarimg --raw" "$(${zbar.out}/bin/zbarimg --raw"''
2929 ];
3030 in ''
31− substituteInPlace asc-to-gif.sh ${stdenv.lib.concatStringsSep " " substitutions}
31+ substituteInPlace asc-to-gif.sh ${lib.concatStringsSep " " substitutions}
3232 '';
3333
3434 installPhase = ''
pkgs/tools/security/b2sum/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchzip, openmp ? null }:
1+{ lib, stdenv, fetchzip, openmp ? null }:
22
3−with stdenv.lib;
3+with lib;
44
55stdenv.mkDerivation {
66 pname = "b2sum";
pkgs/tools/security/bash-supergenpass/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
2121
2222 installPhase = ''
2323 install -m755 -D supergenpass.sh "$out/bin/supergenpass"
24− wrapProgram "$out/bin/supergenpass" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnugrep ]}"
24+ wrapProgram "$out/bin/supergenpass" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnugrep ]}"
2525 '';
2626
2727 passthru.updateScript = unstableGitUpdater { };
pkgs/tools/security/bettercap/default.nix+1−1
@@ -25,7 +25,7 @@ buildGoModule rec {
2525
2626 nativeBuildInputs = [ pkg-config ];
2727 buildInputs = [ libpcap libusb1 ]
28− ++ stdenv.lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ];
28+ ++ lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ];
2929
3030 meta = with lib; {
3131 description = "A man in the middle tool";
pkgs/tools/security/bitwarden/default.nix+1−1
@@ -78,7 +78,7 @@ let
7878
7979 postFixup = ''
8080 makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \
81− --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \
81+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \
8282 "''${gappsWrapperArgs[@]}"
8383 '';
8484 };
pkgs/tools/security/bitwarden_rs/default.nix+1−1
@@ -18,7 +18,7 @@ in rustPlatform.buildRustPackage rec {
1818 };
1919
2020 nativeBuildInputs = [ pkgconfig ];
21− buildInputs = with stdenv.lib; [ openssl ]
21+ buildInputs = with lib; [ openssl ]
2222 ++ optionals stdenv.isDarwin [ Security CoreServices ]
2323 ++ optional (dbBackend == "mysql") libmysqlclient
2424 ++ optional (dbBackend == "postgresql") postgresql;
pkgs/tools/security/brutespray/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 patchShebangs $out/bin
2626 patchPythonScript $out/bin/brutespray
2727 wrapProgram $out/bin/brutespray \
28− --prefix PATH : ${stdenv.lib.makeBinPath [ medusa ]}
28+ --prefix PATH : ${lib.makeBinPath [ medusa ]}
2929
3030 mkdir -p $out/share/brutespray
3131 cp -r wordlist/ $out/share/brutespray/wordlist
pkgs/tools/security/ccrypt/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, perl}:
1+{lib, stdenv, fetchurl, perl}:
22
33stdenv.mkDerivation {
44 name = "ccrypt-1.11";
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
1515 meta = {
1616 homepage = "http://ccrypt.sourceforge.net/";
1717 description = "Utility for encrypting and decrypting files and streams with AES-256";
18− license = stdenv.lib.licenses.gpl2Plus;
19− maintainers = with stdenv.lib.maintainers; [viric];
20− platforms = with stdenv.lib.platforms; all;
18+ license = lib.licenses.gpl2Plus;
19+ maintainers = with lib.maintainers; [viric];
20+ platforms = with lib.platforms; all;
2121 };
2222}
pkgs/tools/security/chntpw/default.nix+3−3
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 };
1212
1313 buildInputs = [ unzip ]
14− ++ stdenv.lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
14+ ++ lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
1515
1616 patches = [
1717 ./00-chntpw-build-arch-autodetect.patch
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
2525 meta = with lib; {
2626 homepage = "http://pogostick.net/~pnh/ntpasswd/";
2727 description = "An utility to reset the password of any user that has a valid local account on a Windows system";
28− maintainers = with stdenv.lib.maintainers; [ deepfire ];
28+ maintainers = with lib.maintainers; [ deepfire ];
2929 license = licenses.gpl2;
30− platforms = with stdenv.lib.platforms; linux;
30+ platforms = with lib.platforms; linux;
3131 };
3232}
pkgs/tools/security/clamav/default.nix+3−3
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121 nativeBuildInputs = [ pkg-config ];
2222 buildInputs = [
2323 zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack json_c check
24− ] ++ stdenv.lib.optional stdenv.isLinux systemd
25− ++ stdenv.lib.optional stdenv.isDarwin Foundation;
24+ ] ++ lib.optional stdenv.isLinux systemd
25+ ++ lib.optional stdenv.isDarwin Foundation;
2626
2727 configureFlags = [
2828 "--libdir=$(out)/lib"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 "--enable-milter"
3838 "--disable-unrar" # disable unrar because it's non-free and requires some extra patching to work properly
3939 "--enable-check"
40− ] ++ stdenv.lib.optional stdenv.isLinux
40+ ] ++ lib.optional stdenv.isLinux
4141 "--with-systemdsystemunitdir=$(out)/lib/systemd";
4242
4343 postInstall = ''
pkgs/tools/security/cowpatty/default.nix+2−2
@@ -1,7 +1,7 @@
1−{ stdenv, fetchurl, openssl, libpcap
1+{ lib, stdenv, fetchurl, openssl, libpcap
22}:
33
4−with stdenv.lib;
4+with lib;
55
66stdenv.mkDerivation rec {
77 pname = "cowpatty";
pkgs/tools/security/crlfuzz/default.nix+2−2
@@ -1,6 +1,6 @@
11{ buildGoModule
22, fetchFromGitHub
3−, stdenv
3+, lib, stdenv
44}:
55
66buildGoModule rec {
@@ -18,7 +18,7 @@ buildGoModule rec {
1818
1919 doCheck = true;
2020
21− meta = with stdenv.lib; {
21+ meta = with lib; {
2222 description = "Tool to scan for CRLF vulnerability";
2323 homepage = "https://github.com/dwisiswant0/crlfuzz";
2424 license = with licenses; [ mit ];
pkgs/tools/security/dirmngr/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap
1+{ lib, stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap
22, libiconv}:
33
44stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 pth openldap libiconv ];
1212
1313 meta = {
14− platforms = stdenv.lib.platforms.unix;
15− license = stdenv.lib.licenses.gpl2Plus;
14+ platforms = lib.platforms.unix;
15+ license = lib.licenses.gpl2Plus;
1616 };
1717}
pkgs/tools/security/duo-unix/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pam, openssl, zlib }:
1+{ lib, stdenv, fetchurl, pam, openssl, zlib }:
22
33stdenv.mkDerivation rec {
44 pname = "duo-unix";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121 meta = {
2222 description = "Duo Security Unix login integration";
2323 homepage = "https://duosecurity.com";
24− license = stdenv.lib.licenses.gpl2;
25− platforms = stdenv.lib.platforms.unix;
26− maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
24+ license = lib.licenses.gpl2;
25+ platforms = lib.platforms.unix;
26+ maintainers = [ lib.maintainers.thoughtpolice ];
2727 };
2828}
pkgs/tools/security/ecryptfs/default.nix+3−3
@@ -33,14 +33,14 @@ stdenv.mkDerivation rec {
3333 done
3434 '';
3535
36− configureFlags = stdenv.lib.optionals (!enablePython) [ "--disable-pywrap" ];
36+ configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ];
3737
3838 nativeBuildInputs = [ pkgconfig ]
3939 # if python2 support is requested, it is needed at builtime as well as runtime.
40− ++ stdenv.lib.optionals (enablePython) [ python2 ]
40+ ++ lib.optionals (enablePython) [ python2 ]
4141 ;
4242 buildInputs = [ perl nss nspr pam intltool makeWrapper ]
43− ++ stdenv.lib.optionals (enablePython) [ python2 ]
43+ ++ lib.optionals (enablePython) [ python2 ]
4444 ;
4545 propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ];
4646
pkgs/tools/security/enchive/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
44 pname = "enchive";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 description = "Encrypted personal archives";
2222 homepage = "https://github.com/skeeto/enchive";
23− license = stdenv.lib.licenses.unlicense;
24− platforms = stdenv.lib.platforms.unix;
25− maintainers = [ stdenv.lib.maintainers.nico202 ];
23+ license = lib.licenses.unlicense;
24+ platforms = lib.platforms.unix;
25+ maintainers = [ lib.maintainers.nico202 ];
2626 };
2727}
pkgs/tools/security/encryptr/default.nix+1−1
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
2424
2525 dontBuild = true;
2626
27− rpath = stdenv.lib.makeLibraryPath [
27+ rpath = lib.makeLibraryPath [
2828 glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi
2929 libXcursor libXext libXfixes libXrender libXcomposite alsaLib
3030 libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk-pixbuf
pkgs/tools/security/enum4linux/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 cp enum4linux.pl $out/bin/enum4linux
1818
1919 wrapProgram $out/bin/enum4linux \
20− --prefix PATH : ${stdenv.lib.makeBinPath [ samba openldap ]}
20+ --prefix PATH : ${lib.makeBinPath [ samba openldap ]}
2121 '';
2222
2323 meta = with lib; {
pkgs/tools/security/fail2ban/default.nix+1−1
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication {
1414 };
1515
1616 pythonPath = with python3.pkgs;
17− stdenv.lib.optionals stdenv.isLinux [
17+ lib.optionals stdenv.isLinux [
1818 systemd
1919 ];
2020
pkgs/tools/security/fpm2/default.nix+2−2
@@ -1,8 +1,8 @@
1−{ stdenv, fetchurl, pkgconfig, gnupg, gtk2
1+{ lib, stdenv, fetchurl, pkgconfig, gnupg, gtk2
22, libxml2, intltool
33}:
44
5−with stdenv.lib;
5+with lib;
66
77stdenv.mkDerivation rec {
88 pname = "fpm2";
pkgs/tools/security/fprintd/default.nix+1−1
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
9898 PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share";
9999
100100 # FIXME: Ugly hack for tests to find libpam_wrapper.so
101− LIBRARY_PATH = stdenv.lib.makeLibraryPath [ python3.pkgs.pypamtest ];
101+ LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ];
102102
103103 doCheck = true;
104104
pkgs/tools/security/fwknop/default.nix+6−6
@@ -19,17 +19,17 @@ stdenv.mkDerivation rec {
1919
2020 nativeBuildInputs = [ autoreconfHook ];
2121 buildInputs = [ libpcap texinfo ]
22− ++ stdenv.lib.optionals gnupgSupport [ gnupg gpgme.dev ]
23− ++ stdenv.lib.optionals wgetSupport [ wget ];
22+ ++ lib.optionals gnupgSupport [ gnupg gpgme.dev ]
23+ ++ lib.optionals wgetSupport [ wget ];
2424
2525 configureFlags = [
2626 "--sysconfdir=/etc"
2727 "--localstatedir=/run"
2828 "--with-iptables=${iptables}/sbin/iptables"
29− (stdenv.lib.enableFeature buildServer "server")
30− (stdenv.lib.enableFeature buildClient "client")
31− (stdenv.lib.withFeatureAs wgetSupport "wget" "${wget}/bin/wget")
32− ] ++ stdenv.lib.optionalString gnupgSupport [
29+ (lib.enableFeature buildServer "server")
30+ (lib.enableFeature buildClient "client")
31+ (lib.withFeatureAs wgetSupport "wget" "${wget}/bin/wget")
32+ ] ++ lib.optionalString gnupgSupport [
3333 "--with-gpgme"
3434 "--with-gpgme-prefix=${gpgme.dev}"
3535 "--with-gpg=${gnupg}"
pkgs/tools/security/gen-oath-safe/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 installPhase =
1818 let
19− path = stdenv.lib.makeBinPath [
19+ path = lib.makeBinPath [
2020 coreutils
2121 file
2222 libcaca.bin
pkgs/tools/security/genpass/default.nix+1−1
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
1717
1818 cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x";
1919
20− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
20+ buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
2121
2222 meta = with lib; {
2323 description = "A simple yet robust commandline random password generator";
pkgs/tools/security/gnu-pw-mgr/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 homepage = "https://www.gnu.org/software/gnu-pw-mgr/";
1515 description = "A password manager designed to make it easy to reconstruct difficult passwords";
1616 license = with licenses; [ gpl3Plus lgpl3Plus ];
17− platforms = stdenv.lib.platforms.linux;
17+ platforms = lib.platforms.linux;
1818 maintainers = with maintainers; [ qoelet ];
1919 };
2020}
pkgs/tools/security/gnupg/22.nix+3−3
@@ -9,7 +9,7 @@
99null
1010}:
1111
12−with stdenv.lib;
12+with lib;
1313
1414assert guiSupport -> pinentry != null && enableMinimal == false;
1515
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
4242 # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update
4343 sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am
4444 sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in
45− '' + stdenv.lib.optionalString ( stdenv.isLinux && pcsclite != null) ''
46− sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
45+ '' + lib.optionalString ( stdenv.isLinux && pcsclite != null) ''
46+ sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
4747 ''; #" fix Emacs syntax highlighting :-(
4848
4949 pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
pkgs/tools/security/gopass/default.nix+3−3
@@ -29,12 +29,12 @@ buildGoModule rec {
2929
3030 buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ];
3131
32− wrapperPath = stdenv.lib.makeBinPath (
32+ wrapperPath = lib.makeBinPath (
3333 [
3434 git
3535 gnupg
3636 xclip
37− ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard
37+ ] ++ lib.optional stdenv.isLinux wl-clipboard
3838 );
3939
4040 postInstall = ''
@@ -42,7 +42,7 @@ buildGoModule rec {
4242 $out/bin/gopass completion $shell > gopass.$shell
4343 installShellCompletion gopass.$shell
4444 done
45− '' + stdenv.lib.optionalString passAlias ''
45+ '' + lib.optionalString passAlias ''
4646 ln -s $out/bin/gopass $out/bin/pass
4747 '';
4848
pkgs/tools/security/gorilla-bin/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }:
1+{ fetchurl, makeWrapper, patchelf, lib, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }:
22
33stdenv.mkDerivation rec {
44 pname = "gorilla-bin";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 installPhase = let
2222 interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";
23− libPath = stdenv.lib.makeLibraryPath [ libXft libX11 freetype fontconfig libXrender libXScrnSaver libXext ];
23+ libPath = lib.makeLibraryPath [ libXft libX11 freetype fontconfig libXrender libXScrnSaver libXext ];
2424 in ''
2525 mkdir -p $out/opt/password-gorilla
2626 mkdir -p $out/bin
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
3434 meta = {
3535 description = "Password Gorilla is a Tk based password manager";
3636 homepage = "https://github.com/zdia/gorilla/wiki";
37− maintainers = [ stdenv.lib.maintainers.namore ];
37+ maintainers = [ lib.maintainers.namore ];
3838 platforms = [ "x86_64-linux" ];
39− license = stdenv.lib.licenses.gpl2;
39+ license = lib.licenses.gpl2;
4040 };
4141}
pkgs/tools/security/gpgstats/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 cp gpgstats $out/bin
1717 '';
1818
19− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.is64bit)
19+ NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.is64bit)
2020 "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";
2121
2222 meta = with lib; {
pkgs/tools/security/haka/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre }:
1+{ lib, stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre }:
22
33let version = "0.3.0"; in
44
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
2727 meta = {
2828 description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files";
2929 homepage = "http://www.haka-security.org/";
30− license = stdenv.lib.licenses.mpl20;
31− maintainers = [ stdenv.lib.maintainers.tvestelind ];
30+ license = lib.licenses.mpl20;
31+ maintainers = [ lib.maintainers.tvestelind ];
3232 platforms = [ "x86_64-linux" "i686-linux" ]; # fails on aarch64
3333 };
3434}
pkgs/tools/security/hash-slinger/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }:
1+{ lib, stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }:
22
33let
44 inherit (pythonPackages) python;
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
3939 meta = {
4040 description = "Various tools to generate special DNS records";
4141 homepage = "https://github.com/letoams/hash-slinger";
42− license = stdenv.lib.licenses.gpl2Plus;
43− maintainers = [ stdenv.lib.maintainers.leenaars ];
42+ license = lib.licenses.gpl2Plus;
43+ maintainers = [ lib.maintainers.leenaars ];
4444 };
4545}
pkgs/tools/security/hashdeep/default.nix+1−1
@@ -18,6 +18,6 @@ in stdenv.mkDerivation {
1818 homepage = "https://github.com/jessek/hashdeep";
1919 license = licenses.gpl2;
2020 platforms = with platforms; linux ++ freebsd ++ openbsd;
21− maintainers = [ stdenv.lib.maintainers.karantan ];
21+ maintainers = [ lib.maintainers.karantan ];
2222 };
2323}
pkgs/tools/security/haveged/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "haveged";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
2020 the barriers to using haveged for other tasks.
2121 '';
2222 homepage = "http://www.issihosts.com/haveged/";
23− license = stdenv.lib.licenses.gpl3;
24− maintainers = [ stdenv.lib.maintainers.domenkozar ];
25− platforms = stdenv.lib.platforms.unix;
23+ license = lib.licenses.gpl3;
24+ maintainers = [ lib.maintainers.domenkozar ];
25+ platforms = lib.platforms.unix;
2626 };
2727}
pkgs/tools/security/honggfuzz/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, callPackage, makeWrapper
1+{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper
22, clang, llvm, libbfd, libopcodes, libunwind, libblocksruntime
33}:
44
@@ -43,9 +43,9 @@ let
4343 feedback-based coverage metrics.
4444 '';
4545 homepage = "https://honggfuzz.dev/";
46− license = stdenv.lib.licenses.asl20;
46+ license = lib.licenses.asl20;
4747 platforms = ["x86_64-linux"];
48− maintainers = with stdenv.lib.maintainers; [ cpu ];
48+ maintainers = with lib.maintainers; [ cpu ];
4949 };
5050 };
5151in honggfuzz
pkgs/tools/security/ipscan/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 cp usr/lib/ipscan/ipscan-any-${version}.jar $out/share/${pname}-${version}.jar
2020
2121 makeWrapper ${jre}/bin/java $out/bin/ipscan \
22− --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt xorg.libXtst ]}" \
22+ --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt xorg.libXtst ]}" \
2323 --add-flags "-Xmx256m -cp $out/share/${pname}-${version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main"
2424
2525 mkdir -p $out/share/applications
pkgs/tools/security/john/default.nix+2−2
@@ -1,8 +1,8 @@
1−{ stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2
1+{ lib, stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2
22, gcc, python3Packages, perl, perlPackages, makeWrapper
33}:
44
5−with stdenv.lib;
5+with lib;
66
77stdenv.mkDerivation rec {
88 pname = "john";
pkgs/tools/security/jwt-cli/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "1k13pw202fr5mvd0ys39n3dxwcl3sd01j6izfb28k06b6pav3wc8";
1515
16− buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
16+ buildInputs = lib.optional stdenv.isDarwin Security;
1717
1818 doInstallCheck = true;
1919 installCheckPhase = "$out/bin/jwt --version";
pkgs/tools/security/kbs2/default.nix+4−4
@@ -14,18 +14,18 @@ rustPlatform.buildRustPackage rec {
1414 cargoSha256 = "1gvvmfavaq29p40p5mq1phpp2a1nw04dz4975pzm1b6z89p0jlzl";
1515
1616 nativeBuildInputs = [ installShellFiles ]
17− ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
17+ ++ lib.optionals stdenv.isLinux [ python3 ];
1818
1919 buildInputs = [ ]
20− ++ stdenv.lib.optionals stdenv.isLinux [ libxcb ]
21− ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ];
20+ ++ lib.optionals stdenv.isLinux [ libxcb ]
21+ ++ lib.optionals stdenv.isDarwin [ AppKit ];
2222
2323 preCheck = ''
2424 export HOME=$TMPDIR
2525 '';
2626
2727 checkFlags = [ "--skip=kbs2::config::tests::test_find_config_dir" ]
28− ++ stdenv.lib.optionals stdenv.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ];
28+ ++ lib.optionals stdenv.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ];
2929
3030 postInstall = ''
3131 mkdir -p $out/share/kbs2
pkgs/tools/security/keybase/default.nix+1−1
@@ -28,7 +28,7 @@ buildGoPackage rec {
2828 })
2929 ];
3030
31− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ];
31+ buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ];
3232 buildFlags = [ "-tags production" ];
3333
3434 meta = with lib; {
pkgs/tools/security/kpcli/default.nix+2−2
@@ -21,14 +21,14 @@ stdenv.mkDerivation rec {
2121 makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \
2222 "${with perlPackages; makePerlPath ([
2323 CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser
24− ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard)}"
24+ ] ++ lib.optional stdenv.isDarwin MacPasteboard)}"
2525 '';
2626
2727
2828 meta = with lib; {
2929 description = "KeePass Command Line Interface";
3030 longDescription = ''
31− KeePass Command Line Interface (CLI) / interactive shell.
31+ KeePass Command Line Interface (CLI) / interactive shell.
3232 Use this program to access and manage your KeePass 1.x or 2.x databases from a Unix-like command line.
3333 '';
3434 license = licenses.artistic1;
pkgs/tools/security/lynis/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 install -d $out/bin $out/share/lynis/plugins
2222 cp -r include db default.prf $out/share/lynis/
2323 cp -a lynis $out/bin
24− wrapProgram "$out/bin/lynis" --prefix PATH : ${stdenv.lib.makeBinPath [ gawk ]}
24+ wrapProgram "$out/bin/lynis" --prefix PATH : ${lib.makeBinPath [ gawk ]}
2525
2626 installManPage lynis.8
2727 installShellCompletion --bash --name lynis.bash \
pkgs/tools/security/mbox/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, openssl, which }:
1+{ lib, stdenv, fetchFromGitHub, openssl, which }:
22
33stdenv.mkDerivation {
44 name = "mbox-20140526";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 cd src
1717 cp {.,}configsbox.h
1818 '';
19−
19+
2020 doCheck = true;
2121 checkPhase = ''
2222 rm tests/test-*vim.sh tests/test-pip.sh
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
2727 ./testall.sh
2828 '';
2929
30− meta = with stdenv.lib;
30+ meta = with lib;
3131 { description = "Lightweight sandboxing mechanism that any user can use without special privileges";
3232 homepage = "http://pdos.csail.mit.edu/mbox/";
3333 maintainers = with maintainers; [ ehmry ];
pkgs/tools/security/meo/default.nix+5−5
@@ -1,8 +1,8 @@
1−{ stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }:
1+{ lib, stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }:
22
33stdenv.mkDerivation {
44 name = "meo-20121113";
5−
5+
66 src = fetchhg {
77 url = "http://oss.stamfest.net/hg/meo";
88 rev = "b48e5f16cff8";
@@ -27,9 +27,9 @@ stdenv.mkDerivation {
2727 meta = {
2828 homepage = "http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only";
2929 description = "Tools to use cryptography for things like four-eyes principles";
30− license = stdenv.lib.licenses.agpl3Plus;
31− maintainers = with stdenv.lib.maintainers; [viric];
32− platforms = with stdenv.lib.platforms; linux;
30+ license = lib.licenses.agpl3Plus;
31+ maintainers = with lib.maintainers; [viric];
32+ platforms = with lib.platforms; linux;
3333 broken = true;
3434 };
3535}
pkgs/tools/security/mkrand/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 name = "mkrand-0.1.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 description = "A Digital Random Bit Generator";
1515 longDescription = "MKRAND is a utility for generating random information.";
1616 homepage = "https://github.com/mknight-tag/MKRAND/";
17− license = stdenv.lib.licenses.mit;
18− platforms = stdenv.lib.platforms.all;
17+ license = lib.licenses.mit;
18+ platforms = lib.platforms.all;
1919 };
2020 }
pkgs/tools/security/modsecurity/default.nix+2−2
@@ -6,7 +6,7 @@
66with lib;
77
88let luaValue = if luaSupport then lua5 else "no";
9− optional = stdenv.lib.optional;
9+ optional = lib.optional;
1010in
1111
1212stdenv.mkDerivation rec {
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
4949 license = licenses.asl20;
5050 homepage = "https://www.modsecurity.org/";
5151 maintainers = with maintainers; [offline];
52− platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
52+ platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
5353 };
5454}
pkgs/tools/security/monkeysphere/default.nix+5−5
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
3232
3333 nativeBuildInputs = [ makeWrapper ];
3434 buildInputs = [ perl libassuan libgcrypt ]
35− ++ stdenv.lib.optional doCheck
35+ ++ lib.optional doCheck
3636 ([ gnupg opensshUnsafe which socat cpio hexdump procps lockfileProgs ] ++
3737 (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ]));
3838
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
4545 # but they aren't enabled by default because they "drain" entropy (GnuPG
4646 # still uses /dev/random).
4747 doCheck = false;
48− preCheck = stdenv.lib.optionalString doCheck ''
48+ preCheck = lib.optionalString doCheck ''
4949 patchShebangs tests/
5050 patchShebangs src/
5151 sed -i \
@@ -64,12 +64,12 @@ in stdenv.mkDerivation rec {
6464 CryptOpenSSLRSA
6565 CryptOpenSSLBignum
6666 ])
67− + stdenv.lib.optionalString
67+ + lib.optionalString
6868 (builtins.length runtimeDeps > 0)
69− " --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}";
69+ " --prefix PATH : ${lib.makeBinPath runtimeDeps}";
7070 wrapMonkeysphere = runtimeDeps: program:
7171 "wrapProgram $out/bin/${program} ${wrapperArgs runtimeDeps}\n";
72− wrapPrograms = runtimeDeps: programs: stdenv.lib.concatMapStrings
72+ wrapPrograms = runtimeDeps: programs: lib.concatMapStrings
7373 (wrapMonkeysphere runtimeDeps)
7474 programs;
7575 in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ]
pkgs/tools/security/monsoon/default.nix+2−2
@@ -1,6 +1,6 @@
11{ buildGoModule
22, fetchFromGitHub
3−, stdenv
3+, lib, stdenv
44}:
55
66buildGoModule rec {
@@ -19,7 +19,7 @@ buildGoModule rec {
1919 # tests fails on darwin
2020 doCheck = !stdenv.isDarwin;
2121
22− meta = with stdenv.lib; {
22+ meta = with lib; {
2323 description = "Fast HTTP enumerator";
2424 longDescription = ''
2525 A fast HTTP enumerator that allows you to execute a large number of HTTP
pkgs/tools/security/nitrokey-app/udev-rules.nix+2−2
@@ -1,9 +1,9 @@
1−{ stdenv, nitrokey-app
1+{ lib, stdenv, nitrokey-app
22, group ? "nitrokey"
33}:
44
55stdenv.mkDerivation {
6− name = "nitrokey-udev-rules-${stdenv.lib.getVersion nitrokey-app}";
6+ name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}";
77
88 inherit (nitrokey-app) src;
99
pkgs/tools/security/nmap/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3
1+{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3
22, pcre, liblinear, libssh2
33, graphicalSupport ? false
44, libX11 ? null
@@ -8,7 +8,7 @@
88, withLua ? true
99}:
1010
11−with stdenv.lib;
11+with lib;
1212
1313stdenv.mkDerivation rec {
1414 name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
pkgs/tools/security/open-ecard/default.nix+1−1
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
5050 makeWrapper ${jre}/bin/java $out/bin/${appName} \
5151 --add-flags "-cp $out/share/java/cifs-${version}.jar" \
5252 --add-flags "-jar $out/share/java/richclient-${version}.jar" \
53− --suffix LD_LIBRARY_PATH ':' ${stdenv.lib.getLib pcsclite}/lib
53+ --suffix LD_LIBRARY_PATH ':' ${lib.getLib pcsclite}/lib
5454 '';
5555
5656 meta = with lib; {
pkgs/tools/security/opensc/default.nix+4−4
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 zlib readline openssl libassuan
2222 libXt libxslt libiconv docbook_xml_dtd_412
2323 ]
24− ++ stdenv.lib.optional stdenv.isDarwin Carbon
24+ ++ lib.optional stdenv.isDarwin Carbon
2525 ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
2626
2727 NIX_CFLAGS_COMPILE = "-Wno-error";
@@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
4141 if withApplePCSC then
4242 "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
4343 else
44− "${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
44+ "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
4545 }"
46− (stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform)
46+ (lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform)
4747 "XSLTPROC=${buildPackages.libxslt}/bin/xsltproc")
4848 ];
4949
50− PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC
50+ PCSC_CFLAGS = lib.optionalString withApplePCSC
5151 "-I${PCSC}/Library/Frameworks/PCSC.framework/Headers";
5252
5353 installFlags = [
pkgs/tools/security/ossec/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, which }:
1+{ lib, stdenv, fetchurl, which }:
22
33stdenv.mkDerivation {
44 name = "ossec-client-2.6";
@@ -33,8 +33,8 @@ yes
3333 meta = {
3434 description = "Open source host-based instrusion detection system";
3535 homepage = "https://www.ossec.net";
36− license = stdenv.lib.licenses.gpl2;
37− platforms = stdenv.lib.platforms.linux;
36+ license = lib.licenses.gpl2;
37+ platforms = lib.platforms.linux;
3838 };
3939}
4040
pkgs/tools/security/p0f/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libpcap, bash }:
1+{ lib, stdenv, fetchurl, libpcap, bash }:
22
33stdenv.mkDerivation rec {
44 pname = "p0f";
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
3434 meta = {
3535 description = "Passive network reconnaissance and fingerprinting tool";
3636 homepage = "https://lcamtuf.coredump.cx/p0f3/";
37− license = stdenv.lib.licenses.lgpl21;
38− platforms = stdenv.lib.platforms.linux;
39− maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
37+ license = lib.licenses.lgpl21;
38+ platforms = lib.platforms.linux;
39+ maintainers = [ lib.maintainers.thoughtpolice ];
4040 };
4141}
pkgs/tools/security/pass/default.nix+6−6
@@ -26,7 +26,7 @@ let
2626 env = extensions:
2727 let
2828 selected = [ pass ] ++ extensions passExtensions
29− ++ stdenv.lib.optional tombPluginSupport passExtensions.tomb;
29+ ++ lib.optional tombPluginSupport passExtensions.tomb;
3030 in buildEnv {
3131 name = "pass-extensions-env";
3232 paths = selected;
@@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
6363 patches = [
6464 ./set-correct-program-name-for-sleep.patch
6565 ./extension-dir.patch
66− ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch
66+ ] ++ lib.optional stdenv.isDarwin ./no-darwin-getopt.patch
6767 # TODO (@Ma27) this patch adds support for wl-clipboard and can be removed during the next
6868 # version bump.
69− ++ stdenv.lib.optional waylandSupport ./clip-wayland-support.patch;
69+ ++ lib.optional waylandSupport ./clip-wayland-support.patch;
7070
7171 nativeBuildInputs = [ makeWrapper ];
7272
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
8282 cp "contrib/dmenu/passmenu" "$out/bin/"
8383 '';
8484
85− wrapperPath = with stdenv.lib; makeBinPath ([
85+ wrapperPath = with lib; makeBinPath ([
8686 coreutils
8787 findutils
8888 getopt
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
107107 # Ensure all dependencies are in PATH
108108 wrapProgram $out/bin/pass \
109109 --prefix PATH : "${wrapperPath}"
110− '' + stdenv.lib.optionalString dmenuSupport ''
110+ '' + lib.optionalString dmenuSupport ''
111111 # We just wrap passmenu with the same PATH as pass. It doesn't
112112 # need all the tools in there but it doesn't hurt either.
113113 wrapProgram $out/bin/passmenu \
@@ -127,7 +127,7 @@ stdenv.mkDerivation rec {
127127 -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \
128128 -e '/which gpg/ d' \
129129 tests/setup.sh
130− '' + stdenv.lib.optionalString stdenv.isDarwin ''
130+ '' + lib.optionalString stdenv.isDarwin ''
131131 # 'pass edit' uses hdid, which is not available from the sandbox.
132132 rm -f tests/t0200-edit-tests.sh
133133 rm -f tests/t0010-generate-tests.sh
pkgs/tools/security/pass/rofi-pass.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep
1+{ lib, stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep
22, libnotify, pwgen, findutils, gawk, gnused, xclip, makeWrapper
33}:
44
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 cp -a config.example $out/share/doc/rofi-pass/config.example
2626 '';
2727
28− wrapperPath = with stdenv.lib; makeBinPath [
28+ wrapperPath = with lib; makeBinPath [
2929 coreutils
3030 findutils
3131 gawk
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
5050 meta = {
5151 description = "A script to make rofi work with password-store";
5252 homepage = "https://github.com/carnager/rofi-pass";
53− license = stdenv.lib.licenses.gpl3;
54− platforms = with stdenv.lib.platforms; linux;
53+ license = lib.licenses.gpl3;
54+ platforms = with lib.platforms; linux;
5555 };
5656}
pkgs/tools/security/pbis/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 if [ $CC = gcc ]; then
3434 NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow -Wno-error=address-of-packed-member"
3535 fi
36− NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${stdenv.lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable"
36+ NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable"
3737 '';
3838 configureScript = ''../configure'';
3939 configureFlags = [
pkgs/tools/security/pcsc-scm-scl011/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 cp -r proprietary/*.bundle $out/pcsc/drivers
3131 '';
3232
33− libPath = stdenv.lib.makeLibraryPath [ libusb-compat-0_1 ];
33+ libPath = lib.makeLibraryPath [ libusb-compat-0_1 ];
3434
3535 fixupPhase = ''
3636 patchelf --set-rpath $libPath \
pkgs/tools/security/pcsclite/default.nix+4−4
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
1818 # The OS should care on preparing the drivers into this location
1919 "--enable-usbdropdir=/var/lib/pcsc/drivers"
2020 "--enable-confdir=/etc"
21− ] ++ stdenv.lib.optional stdenv.isLinux
21+ ] ++ lib.optional stdenv.isLinux
2222 "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
23− ++ stdenv.lib.optional (!stdenv.isLinux)
23+ ++ lib.optional (!stdenv.isLinux)
2424 "--disable-libsystemd";
2525
2626 postConfigure = ''
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
3535 '';
3636
3737 nativeBuildInputs = [ pkgconfig perl ];
38− buildInputs = [ python3 ] ++ stdenv.lib.optionals stdenv.isLinux [ udev dbus ]
39− ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
38+ buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ]
39+ ++ lib.optionals stdenv.isDarwin [ IOKit ];
4040
4141 meta = with lib; {
4242 description = "Middleware to access a smart card using SCard API (PC/SC)";
pkgs/tools/security/pgpdump/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0pi9qdbmcmi58gmljin51ylbi3zkknl8fm26jm67cpl55hvfsn23";
1414 };
1515
16− buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ];
16+ buildInputs = lib.optionals supportCompressedPackets [ zlib bzip2 ];
1717
1818 meta = with lib; {
1919 description = "A PGP packet visualizer";
pkgs/tools/security/pinentry/default.nix+1−1
@@ -5,7 +5,7 @@
55, enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ]
66}:
77
8−with stdenv.lib;
8+with lib;
99
1010assert isList enabledFlavors && enabledFlavors != [];
1111
pkgs/tools/security/pinentry/mac.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }:
1+{ lib, stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }:
22
33stdenv.mkDerivation {
44 name = "pinentry-mac-0.9.4";
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
2424
2525 meta = {
2626 description = "Pinentry for GPG on Mac";
27− license = stdenv.lib.licenses.gpl2Plus;
27+ license = lib.licenses.gpl2Plus;
2828 homepage = "https://github.com/GPGTools/pinentry-mac";
29− platforms = stdenv.lib.platforms.darwin;
29+ platforms = lib.platforms.darwin;
3030 };
3131}
pkgs/tools/security/pius/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, stdenv, python3Packages, gnupg, perl }:
1+{ fetchFromGitHub, lib, stdenv, python3Packages, gnupg, perl }:
22
33let version = "3.0.0"; in
44python3Packages.buildPythonApplication {
@@ -33,9 +33,9 @@ python3Packages.buildPythonApplication {
3333 to the process.
3434 '';
3535
36− license = stdenv.lib.licenses.gpl2;
36+ license = lib.licenses.gpl2;
3737
38− platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
39− maintainers = with stdenv.lib.maintainers; [ kierdavis ];
38+ platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;
39+ maintainers = with lib.maintainers; [ kierdavis ];
4040 };
4141}
pkgs/tools/security/polkit-gnome/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }:
1+{ lib, stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }:
22stdenv.mkDerivation rec {
33 pname = "polkit-gnome";
44 version = "0.105";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
2222 meta = {
2323 homepage = "https://gitlab.gnome.org/Archive/policykit-gnome";
2424 description = "A dbus session bus service that is used to bring up authentication dialogs";
25− license = stdenv.lib.licenses.lgpl2Plus;
26− maintainers = with stdenv.lib.maintainers; [ phreedom ];
27− platforms = stdenv.lib.platforms.linux;
25+ license = lib.licenses.lgpl2Plus;
26+ maintainers = with lib.maintainers; [ phreedom ];
27+ platforms = lib.platforms.linux;
2828 };
2929}
pkgs/tools/security/pwgen/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, autoreconfHook}:
1+{lib, stdenv, fetchurl, autoreconfHook}:
22stdenv.mkDerivation {
33 name = "pwgen-2.08";
44
@@ -11,6 +11,6 @@ stdenv.mkDerivation {
1111
1212 meta = {
1313 description = "Password generator which creates passwords which can be easily memorized by a human";
14− platforms = stdenv.lib.platforms.all;
14+ platforms = lib.platforms.all;
1515 };
1616}
pkgs/tools/security/radamsa/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchFromGitLab, bash }:
1+{ lib, stdenv, fetchurl, fetchFromGitLab, bash }:
22
33let
44 # Fetch explicitly, otherwise build will try to do so
@@ -32,12 +32,12 @@ stdenv.mkDerivation rec {
3232
3333 checkInputs = [ bash ];
3434 doCheck = true;
35−
35+
3636 meta = {
3737 description = "A general purpose fuzzer";
3838 longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs.";
3939 homepage = "https://gitlab.com/akihe/radamsa";
40− maintainers = [ stdenv.lib.maintainers.markWot ];
41− platforms = stdenv.lib.platforms.all;
40+ maintainers = [ lib.maintainers.markWot ];
41+ platforms = lib.platforms.all;
4242 };
4343}
pkgs/tools/security/rage/default.nix+1−1
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
1616
1717 nativeBuildInputs = [ installShellFiles ];
1818
19− buildInputs = stdenv.lib.optionals stdenv.isDarwin [
19+ buildInputs = lib.optionals stdenv.isDarwin [
2020 Foundation
2121 Security
2222 ];
pkgs/tools/security/rarcrack/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 };
1313
1414 buildInputs = [ libxml2 file p7zip unrar unzip ];
15− buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang";
15+ buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
1616 installFlags = [ "PREFIX=\${out}" ];
1717
1818 patchPhase = ''
pkgs/tools/security/ripasso/cursive.nix+1−1
@@ -21,7 +21,7 @@ buildRustPackage rec {
2121 nativeBuildInputs = [ pkgconfig gpgme python3 ];
2222 buildInputs = [
2323 ncurses openssl libgpgerror gpgme xorg.libxcb
24− ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ];
24+ ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ];
2525
2626 preFixup = ''
2727 mkdir -p "$out/man/man1"
pkgs/tools/security/rng-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, libtool, autoreconfHook, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, libtool, autoreconfHook, pkgconfig
22, sysfsutils
33, argp-standalone
44 # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS
@@ -10,7 +10,7 @@
1010, libp11 ? null, opensc ? null, withPkcs11 ? true
1111}:
1212
13−with stdenv.lib;
13+with lib;
1414
1515stdenv.mkDerivation rec {
1616 pname = "rng-tools";
pkgs/tools/security/rustscan/default.nix+1−1
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
1818 --replace 'Command::new("nmap")' 'Command::new("${nmap}/bin/nmap")'
1919 '';
2020
21− buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
21+ buildInputs = lib.optional stdenv.isDarwin Security;
2222
2323 checkFlags = [
2424 "--skip=infer_ulimit_lowering_no_panic"
pkgs/tools/security/saml2aws/default.nix+2−2
@@ -26,7 +26,7 @@ buildGoModule rec {
2626 description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP";
2727 homepage = "https://github.com/Versent/saml2aws";
2828 license = licenses.mit;
29− platforms = stdenv.lib.platforms.unix;
30− maintainers = [ stdenv.lib.maintainers.pmyjavec ];
29+ platforms = lib.platforms.unix;
30+ maintainers = [ lib.maintainers.pmyjavec ];
3131 };
3232}
pkgs/tools/security/scallion/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 mkdir -p $out/share
2323 cp scallion/bin/Debug/* $out/share/
2424 makeWrapper ${mono}/bin/mono $out/bin/scallion \
25− --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \
25+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \
2626 --add-flags $out/share/scallion.exe
2727 '';
2828
pkgs/tools/security/seccure/default.nix+5−5
@@ -1,16 +1,16 @@
1−{ stdenv, fetchurl, libgcrypt }:
1+{ lib, stdenv, fetchurl, libgcrypt }:
22
33stdenv.mkDerivation rec {
44 pname = "seccure";
55 version = "0.5";
6−
6+
77 src = fetchurl {
88 url = "http://point-at-infinity.org/seccure/${pname}-${version}.tar.gz";
99 sha256 = "0nwnk3hfhgvf5xr0xipbh6smfnya22wphc5rj0vgi5d0zr5cwrk5";
1010 };
1111
1212 buildInputs = [ libgcrypt ];
13−
13+
1414 preConfigure = ''
1515 sed -e s@/usr/@$out/@g -i Makefile
1616 sed -e 's@ln -f@ln -sf@g' -i Makefile
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 homepage = "http://point-at-infinity.org/seccure/";
2222 description = "Zero-configuration elliptic curve cryptography utility";
23− platforms = stdenv.lib.platforms.unix;
24− license = stdenv.lib.licenses.lgpl3;
23+ platforms = lib.platforms.unix;
24+ license = lib.licenses.lgpl3;
2525 };
2626}
pkgs/tools/security/secp256k1/default.nix+1−1
@@ -13,7 +13,7 @@
1313
1414}:
1515
16−let inherit (stdenv.lib) optionals; in
16+let inherit (lib) optionals; in
1717
1818stdenv.mkDerivation {
1919 pname = "secp256k1";
pkgs/tools/security/shc/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 meta = with lib; {
1616 homepage = "https://neurobin.org/projects/softwares/unix/shc/";
1717 description = "Shell Script Compiler";
18− platforms = stdenv.lib.platforms.linux;
18+ platforms = lib.platforms.linux;
1919 license = licenses.gpl3;
2020 };
2121}
pkgs/tools/security/signing-party/default.nix+14−14
@@ -127,62 +127,62 @@ in stdenv.mkDerivation rec {
127127 TextTemplate MIMETools MailTools TimeDate NetIDNEncode ]
128128 ++ GnuPGInterfaceRuntimeDependencies)} \
129129 --prefix PATH ":" \
130− "${stdenv.lib.makeBinPath [ nettools gnupg ]}"
130+ "${lib.makeBinPath [ nettools gnupg ]}"
131131
132132 wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \
133133 ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
134134 --prefix PATH ":" \
135− "${stdenv.lib.makeBinPath [ gnupg libpaper ]}"
135+ "${lib.makeBinPath [ gnupg libpaper ]}"
136136
137137 wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \
138− "${stdenv.lib.makeBinPath [ which gnupg libpaper ]}"
138+ "${lib.makeBinPath [ which gnupg libpaper ]}"
139139
140140 wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \
141− "${stdenv.lib.makeBinPath [ gnupg qprint ]}"
141+ "${lib.makeBinPath [ gnupg qprint ]}"
142142
143143 wrapProgram $out/bin/gpgdir --set PERL5LIB \
144144 ${with perlPackages; makePerlPath ([
145145 TermReadKey ]
146146 ++ GnuPGInterfaceRuntimeDependencies)} \
147147 --prefix PATH ":" \
148− "${stdenv.lib.makeBinPath [ gnupg ]}"
148+ "${lib.makeBinPath [ gnupg ]}"
149149
150150 wrapProgram $out/bin/gpglist --prefix PATH ":" \
151− "${stdenv.lib.makeBinPath [ gnupg ]}"
151+ "${lib.makeBinPath [ gnupg ]}"
152152
153153 wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \
154− "${stdenv.lib.makeBinPath [ getopt gnupg ]}"
154+ "${lib.makeBinPath [ getopt gnupg ]}"
155155
156156# wrapProgram $out/bin/gpgparticipants-prefill
157157
158158 wrapProgram $out/bin/gpgparticipants-filter --prefix PATH ":" \
159− "${stdenv.lib.makeBinPath [ gnupg ]}"
159+ "${lib.makeBinPath [ gnupg ]}"
160160
161161 wrapProgram $out/bin/gpgsigs --set PERL5LIB \
162162 ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
163163 --prefix PATH ":" \
164− "${stdenv.lib.makeBinPath [ gnupg ]}"
164+ "${lib.makeBinPath [ gnupg ]}"
165165
166166 wrapProgram $out/bin/gpgwrap --prefix PATH ":" \
167− "${stdenv.lib.makeBinPath [ gnupg ]}"
167+ "${lib.makeBinPath [ gnupg ]}"
168168
169169# wrapProgram $out/bin/keyanalyze --set PERL5LIB \
170170
171171 wrapProgram $out/bin/keyart --prefix PATH ":" \
172− "${stdenv.lib.makeBinPath [ gnupg ]}"
172+ "${lib.makeBinPath [ gnupg ]}"
173173
174174 wrapProgram $out/bin/keylookup --prefix PATH ":" \
175− "${stdenv.lib.makeBinPath [ gnupg ]}"
175+ "${lib.makeBinPath [ gnupg ]}"
176176
177177 wrapProgram $out/bin/pgp-clean --set PERL5LIB \
178178 ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
179179 --prefix PATH ":" \
180− "${stdenv.lib.makeBinPath [ gnupg ]}"
180+ "${lib.makeBinPath [ gnupg ]}"
181181
182182 wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \
183183 ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
184184 --prefix PATH ":" \
185− "${stdenv.lib.makeBinPath [ gnupg ]}"
185+ "${lib.makeBinPath [ gnupg ]}"
186186
187187# wrapProgram $out/bin/pgpring
188188
pkgs/tools/security/softhsm/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 ];
1919
2020 propagatedBuildInputs =
21− stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ];
21+ lib.optionals stdenv.isDarwin [ libobjc Security ];
2222
2323 buildInputs = [ botan2 ];
2424
pkgs/tools/security/spectre-meltdown-checker/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 nativeBuildInputs = [ makeWrapper ];
2020
21− installPhase = with stdenv.lib; ''
21+ installPhase = with lib; ''
2222 runHook preInstall
2323
2424 install -Dm755 spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker
pkgs/tools/security/ssdeep/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "ssdeep";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919 meta = {
2020 description = "A program for calculating fuzzy hashes";
2121 homepage = "http://www.ssdeep.sf.net";
22− license = stdenv.lib.licenses.gpl2;
23− platforms = stdenv.lib.platforms.unix;
24− maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
22+ license = lib.licenses.gpl2;
23+ platforms = lib.platforms.unix;
24+ maintainers = [ lib.maintainers.thoughtpolice ];
2525 };
2626}
pkgs/tools/security/sshuttle/default.nix+2−2
@@ -23,11 +23,11 @@ python3Packages.buildPythonApplication rec {
2323
2424 checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ];
2525
26− runtimeDeps = [ coreutils openssh procps ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables nettools ];
26+ runtimeDeps = [ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ];
2727
2828 postInstall = ''
2929 wrapProgram $out/bin/sshuttle \
30− --prefix PATH : "${stdenv.lib.makeBinPath runtimeDeps}" \
30+ --prefix PATH : "${lib.makeBinPath runtimeDeps}" \
3131 '';
3232
3333 meta = with lib; {
pkgs/tools/security/ssss/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gmp }:
1+{ lib, stdenv, fetchurl, gmp }:
22
33stdenv.mkDerivation {
44 name = "ssss-0.5";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
2222 meta = {
2323 description = "Shamir Secret Sharing Scheme";
2424 homepage = "http://point-at-infinity.org/ssss/";
25− platforms = stdenv.lib.platforms.unix;
26− license = stdenv.lib.licenses.gpl2;
25+ platforms = lib.platforms.unix;
26+ license = lib.licenses.gpl2;
2727 };
2828}
pkgs/tools/security/stoken/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 buildInputs = [
2525 autoconf automake libtool
2626 libxml2 nettle
27− ] ++ stdenv.lib.optional withGTK3 gtk3;
27+ ] ++ lib.optional withGTK3 gtk3;
2828
2929 meta = with lib; {
3030 description = "Software Token for Linux/UNIX";
pkgs/tools/security/stricat/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "stricat";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919 meta = {
2020 description = "Multi-use cryptographic tool based on the STRIBOB algorithm";
2121 homepage = "https://www.stribob.com/stricat/";
22− license = stdenv.lib.licenses.bsd3;
23− platforms = stdenv.lib.platforms.unix;
24− maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
22+ license = lib.licenses.bsd3;
23+ platforms = lib.platforms.unix;
24+ maintainers = [ lib.maintainers.thoughtpolice ];
2525 };
2626}
pkgs/tools/security/sudo/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, coreutils, pam, groff, sssd, nixosTests
1+{ lib, stdenv, fetchurl, coreutils, pam, groff, sssd, nixosTests
22, sendmailPath ? "/run/wrappers/bin/sendmail"
33, withInsults ? false
44, withSssd ? false
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
2727 "--with-iologdir=/var/log/sudo-io"
2828 "--with-sendmail=${sendmailPath}"
2929 "--enable-tmpfiles.d=no"
30− ] ++ stdenv.lib.optional withInsults [
30+ ] ++ lib.optional withInsults [
3131 "--with-insults"
3232 "--with-all-insults"
33− ] ++ stdenv.lib.optional withSssd [
33+ ] ++ lib.optional withSssd [
3434 "--with-sssd"
3535 "--with-sssd-lib=${sssd}/lib"
3636 ];
@@ -78,8 +78,8 @@ stdenv.mkDerivation rec {
7878
7979 license = "https://www.sudo.ws/sudo/license.html";
8080
81− maintainers = with stdenv.lib.maintainers; [ eelco delroth ];
81+ maintainers = with lib.maintainers; [ eelco delroth ];
8282
83− platforms = stdenv.lib.platforms.linux;
83+ platforms = lib.platforms.linux;
8484 };
8585}
pkgs/tools/security/sudolikeaboss/default.nix+1−1
@@ -3,7 +3,7 @@
33
44buildGoPackage rec {
55 pname = "sudolikeaboss-unstable";
6− version = "20161127-${stdenv.lib.strings.substring 0 7 rev}";
6+ version = "20161127-${lib.strings.substring 0 7 rev}";
77 rev = "2d9afe19f872c9f433d476e57ee86169781b164c";
88
99 goPackagePath = "github.com/ravenac95/sudolikeaboss";
pkgs/tools/security/super/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch }:
1+{ lib, stdenv, fetchurl, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 name = "super-3.30.0";
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
4444 in /etc/super.tab); and 2) “setuid”, which allows root to
4545 execute a command under a different uid.
4646 '';
47− platforms = stdenv.lib.platforms.linux;
47+ platforms = lib.platforms.linux;
4848 };
4949}
pkgs/tools/security/tcpcrypt/default.nix+2−2
@@ -1,9 +1,9 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook
22, openssl
33, libcap, libpcap, libnfnetlink, libnetfilter_conntrack, libnetfilter_queue
44}:
55
6−with stdenv.lib;
6+with lib;
77
88stdenv.mkDerivation rec {
99 pname = "tcpcrypt";
pkgs/tools/security/tor/default.nix+4−4
@@ -15,7 +15,7 @@
1515}:
1616let
1717 tor-client-auth-gen = writeShellScript "tor-client-auth-gen" ''
18− PATH="${stdenv.lib.makeBinPath [coreutils gnugrep openssl]}"
18+ PATH="${lib.makeBinPath [coreutils gnugrep openssl]}"
1919 pem="$(openssl genpkey -algorithm x25519)"
2020
2121 printf private_key=descriptor:x25519:
@@ -41,15 +41,15 @@ stdenv.mkDerivation rec {
4141
4242 nativeBuildInputs = [ pkgconfig ];
4343 buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++
44− stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
44+ lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
4545
4646 patches = [ ./disable-monotonic-timer-tests.patch ];
4747
4848 # cross compiles correctly but needs the following
49− configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
49+ configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
5050 "--disable-tool-name-check";
5151
52− NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
52+ NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s";
5353
5454 postPatch = ''
5555 substituteInPlace contrib/client-tools/torify \
pkgs/tools/security/tor/tor-arm.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, makeWrapper
1+{ lib, stdenv, fetchurl, makeWrapper
22, python2Packages, ncurses, lsof, nettools
33}:
44
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
4848 meta = {
4949 description = "A terminal status monitor for Tor relays";
5050 homepage = "https://www.atagar.com/arm/";
51− license = stdenv.lib.licenses.gpl3;
52− platforms = stdenv.lib.platforms.unix;
53− maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
51+ license = lib.licenses.gpl3;
52+ platforms = lib.platforms.unix;
53+ maintainers = [ lib.maintainers.thoughtpolice ];
5454 };
5555}
pkgs/tools/security/tor/torsocks.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, fetchurl, autoreconfHook, libcap }:
1+{ lib, stdenv, fetchgit, fetchurl, autoreconfHook, libcap }:
22
33stdenv.mkDerivation rec {
44 pname = "torsocks";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ autoreconfHook ];
1414
15− patches = stdenv.lib.optional stdenv.isDarwin
15+ patches = lib.optional stdenv.isDarwin
1616 (fetchurl {
1717 url = "https://trac.torproject.org/projects/tor/raw-attachment/ticket/28538/0001-Fix-macros-for-accept4-2.patch";
1818 sha256 = "97881f0b59b3512acc4acb58a0d6dfc840d7633ead2f400fad70dda9b2ba30b0";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 sed -i \
2424 -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \
2525 src/bin/torsocks.in
26− '' + stdenv.lib.optionalString stdenv.isLinux ''
26+ '' + lib.optionalString stdenv.isLinux ''
2727 sed -i \
2828 -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \
2929 src/bin/torsocks.in
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
3636 description = "Wrapper to safely torify applications";
3737 homepage = "https://github.com/dgoulet/torsocks";
3838 repositories.git = "https://git.torproject.org/torsocks.git";
39− license = stdenv.lib.licenses.gpl2;
40− platforms = stdenv.lib.platforms.unix;
41− maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ];
39+ license = lib.licenses.gpl2;
40+ platforms = lib.platforms.unix;
41+ maintainers = with lib.maintainers; [ phreedom thoughtpolice ];
4242 };
4343}
pkgs/tools/security/tpm-quote-tools/default.nix+4−4
@@ -1,10 +1,10 @@
11{ lib, stdenv, fetchurl, trousers, openssl }:
22
3−stdenv.mkDerivation rec {
3+stdenv.mkDerivation rec {
44 pname = "tpm-quote-tools";
55 version = "1.0.4";
66
7− src = fetchurl {
7+ src = fetchurl {
88 url = "mirror://sourceforge/project/tpmquotetools/${version}/${pname}-${version}.tar.gz";
99 sha256 = "1qjs83xb4np4yn1bhbjfhvkiika410v8icwnjix5ad96w2nlxp0h";
1010 };
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
1313
1414 postFixup = ''
1515 patchelf \
16− --set-rpath "${stdenv.lib.makeLibraryPath [ openssl ]}:$(patchelf --print-rpath $out/bin/tpm_mkaik)" \
16+ --set-rpath "${lib.makeLibraryPath [ openssl ]}:$(patchelf --print-rpath $out/bin/tpm_mkaik)" \
1717 $out/bin/tpm_mkaik
1818 '';
1919
20− meta = with lib; {
20+ meta = with lib; {
2121 description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism";
2222 longDescription = ''
2323 The TPM Quote Tools is a collection of programs that provide support
pkgs/tools/security/volatility/default.nix+1−1
@@ -19,6 +19,6 @@ pythonPackages.buildPythonApplication rec {
1919 homepage = "https://www.volatilityfoundation.org/";
2020 description = "Advanced memory forensics framework";
2121 maintainers = with maintainers; [ bosu ];
22− license = stdenv.lib.licenses.gpl2Plus;
22+ license = lib.licenses.gpl2Plus;
2323 };
2424}
pkgs/tools/security/yara/default.nix+6−6
@@ -23,17 +23,17 @@ stdenv.mkDerivation rec {
2323 nativeBuildInputs = [ autoreconfHook pkg-config ];
2424
2525 buildInputs = [ pcre protobufc ]
26− ++ stdenv.lib.optionals withCrypto [ openssl ]
27− ++ stdenv.lib.optionals enableMagic [ file ]
28− ++ stdenv.lib.optionals enableCuckoo [ jansson ]
26+ ++ lib.optionals withCrypto [ openssl ]
27+ ++ lib.optionals enableMagic [ file ]
28+ ++ lib.optionals enableCuckoo [ jansson ]
2929 ;
3030
3131 preConfigure = "./bootstrap.sh";
3232
3333 configureFlags = [
34− (stdenv.lib.withFeature withCrypto "crypto")
35− (stdenv.lib.enableFeature enableMagic "magic")
36− (stdenv.lib.enableFeature enableCuckoo "cuckoo")
34+ (lib.withFeature withCrypto "crypto")
35+ (lib.enableFeature enableMagic "magic")
36+ (lib.enableFeature enableCuckoo "cuckoo")
3737 ];
3838
3939 meta = with lib; {
pkgs/tools/system/amtterm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, makeWrapper, perl, perlPackages }:
1+{ fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }:
22
33
44stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 postInstall =
1919 "wrapProgram $out/bin/amttool --prefix PERL5LIB : $PERL5LIB";
2020
21− meta = with stdenv.lib;
21+ meta = with lib;
2222 { description = "Intel AMT® SoL client + tools";
2323 homepage = "https://www.kraxel.org/cgit/amtterm/";
2424 license = licenses.gpl2;
pkgs/tools/system/at/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, bison, flex, pam, perl
1+{ lib, stdenv, fetchurl, fetchpatch, bison, flex, pam, perl
22, sendmailPath ? "/run/wrappers/bin/sendmail"
33, atWrapperPath ? "/run/wrappers/bin/at"
44}:
@@ -52,8 +52,8 @@ stdenv.mkDerivation rec {
5252
5353 meta = {
5454 description = ''The classical Unix `at' job scheduling command'';
55− license = stdenv.lib.licenses.gpl2Plus;
55+ license = lib.licenses.gpl2Plus;
5656 homepage = "https://packages.qa.debian.org/at";
57− platforms = stdenv.lib.platforms.linux;
57+ platforms = lib.platforms.linux;
5858 };
5959}
pkgs/tools/system/bar/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 name = "bar-1.11.1";
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
1111 meta = {
1212 description = "Console progress bar";
1313 homepage = "http://clpbar.sourceforge.net/";
14− license = stdenv.lib.licenses.gpl2;
15− maintainers = [ stdenv.lib.maintainers.rdnetto ];
16− platforms = stdenv.lib.platforms.all;
14+ license = lib.licenses.gpl2;
15+ maintainers = [ lib.maintainers.rdnetto ];
16+ platforms = lib.platforms.all;
1717 };
1818}
pkgs/tools/system/bfs/default.nix+2−2
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
1111 sha256 = "1iricyigm0rsc8fr91vk3krvyafbnp0y3ww1rjv94l6jbdl7rrlb";
1212 };
1313
14− buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];
14+ buildInputs = lib.optionals stdenv.isLinux [ libcap acl ];
1515
1616 # Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098
17− preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
17+ preConfigure = lib.optionalString stdenv.isDarwin ''
1818 substituteInPlace Makefile --replace "-flto -DNDEBUG" "-DNDEBUG"
1919 '';
2020
pkgs/tools/system/bottom/default.nix+1−1
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
1717
1818 nativeBuildInputs = [ installShellFiles ];
1919
20− buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
20+ buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
2121
2222 cargoSha256 = "sha256-qnh4Tl6JRgxBJbu+t9IJX/XChIR15rTRLvsl+/ZvPxY=";
2323
pkgs/tools/system/chase/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }:
1+{ lib, stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }:
22
33stdenv.mkDerivation rec {
44 pname = "chase";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 makeFlags = [ "-e" ];
1616 makeFlagsArray="LIBS=-lgc";
1717
18− meta = with stdenv.lib ; {
18+ meta = with lib ; {
1919 description = "Follow a symlink and print out its target file";
2020 longDescription = ''
2121 A commandline program that chases symbolic filesystems links to the original file
pkgs/tools/system/collectd/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 nativeBuildInputs = [ pkgconfig autoreconfHook ];
2020 buildInputs = [
2121 libtool
22− ] ++ stdenv.lib.optionals stdenv.isDarwin [
22+ ] ++ lib.optionals stdenv.isDarwin [
2323 darwin.apple_sdk.frameworks.ApplicationServices
2424 ] ++ plugins.buildInputs;
2525
pkgs/tools/system/collectd/plugins.nix+15−15
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, curl
33, darwin
44, hiredis
@@ -49,7 +49,7 @@ let
4949 aggregation = {};
5050 amqp = {
5151 buildInputs = [ yajl ] ++
52− stdenv.lib.optionals stdenv.isLinux [ rabbitmq-c ];
52+ lib.optionals stdenv.isLinux [ rabbitmq-c ];
5353 };
5454 apache = {
5555 buildInputs = [ curl ];
@@ -62,7 +62,7 @@ let
6262 };
6363 barometer = {};
6464 battery = {
65− buildInputs = stdenv.lib.optionals stdenv.isDarwin [
65+ buildInputs = lib.optionals stdenv.isDarwin [
6666 darwin.apple_sdk.frameworks.IOKit
6767 ];
6868 };
@@ -94,9 +94,9 @@ let
9494 };
9595 df = {};
9696 disk = {
97− buildInputs = stdenv.lib.optionals stdenv.isLinux [
97+ buildInputs = lib.optionals stdenv.isLinux [
9898 udev
99− ] ++ stdenv.lib.optionals stdenv.isDarwin [
99+ ] ++ lib.optionals stdenv.isDarwin [
100100 darwin.apple_sdk.frameworks.IOKit
101101 ];
102102 };
@@ -126,7 +126,7 @@ let
126126 iptables = {
127127 buildInputs = [
128128 libpcap
129− ] ++ stdenv.lib.optionals stdenv.isLinux [
129+ ] ++ lib.optionals stdenv.isLinux [
130130 iptables libmnl
131131 ];
132132 };
@@ -161,14 +161,14 @@ let
161161 memory = {};
162162 mic = {};
163163 modbus = {
164− buildInputs = stdenv.lib.optionals stdenv.isLinux [ libmodbus ];
164+ buildInputs = lib.optionals stdenv.isLinux [ libmodbus ];
165165 };
166166 mqtt = {
167167 buildInputs = [ mosquitto ];
168168 };
169169 multimeter = {};
170170 mysql = {
171− buildInputs = stdenv.lib.optionals (libmysqlclient != null) [
171+ buildInputs = lib.optionals (libmysqlclient != null) [
172172 libmysqlclient
173173 ];
174174 };
@@ -176,7 +176,7 @@ let
176176 netlink = {
177177 buildInputs = [
178178 libpcap
179− ] ++ stdenv.lib.optionals stdenv.isLinux [
179+ ] ++ lib.optionals stdenv.isLinux [
180180 libmnl
181181 ];
182182 };
@@ -236,20 +236,20 @@ let
236236 buildInputs = [ rrdtool libxml2 ];
237237 };
238238 sensors = {
239− buildInputs = stdenv.lib.optionals stdenv.isLinux [ lm_sensors ];
239+ buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ];
240240 };
241241 serial = {};
242242 sigrok = {
243− buildInputs = stdenv.lib.optionals stdenv.isLinux [ libsigrok udev ];
243+ buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ];
244244 };
245245 smart = {
246− buildInputs = stdenv.lib.optionals stdenv.isLinux [ libatasmart udev ];
246+ buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ];
247247 };
248248 snmp = {
249− buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ];
249+ buildInputs = lib.optionals stdenv.isLinux [ net-snmp ];
250250 };
251251 snmp_agent = {
252− buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ];
252+ buildInputs = lib.optionals stdenv.isLinux [ net-snmp ];
253253 };
254254 statsd = {};
255255 swap = {};
@@ -280,7 +280,7 @@ let
280280 };
281281 virt = {
282282 buildInputs = [ libvirt libxml2 yajl ] ++
283− stdenv.lib.optionals stdenv.isLinux [ lvm2 udev
283+ lib.optionals stdenv.isLinux [ lvm2 udev
284284 # those might be no longer required when https://github.com/NixOS/nixpkgs/pull/51767
285285 # is merged
286286 libapparmor numactl libcap_ng
pkgs/tools/system/dfc/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, cmake, gettext}:
1+{lib, stdenv, fetchurl, cmake, gettext}:
22
33stdenv.mkDerivation rec {
44 pname = "dfc";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
1414 meta = {
1515 homepage = "https://projects.gw-computing.net/projects/dfc";
1616 description = "Displays file system space usage using graphs and colors";
17− license = stdenv.lib.licenses.bsd3;
18− maintainers = with stdenv.lib.maintainers; [qknight];
19− platforms = stdenv.lib.platforms.all;
17+ license = lib.licenses.bsd3;
18+ maintainers = with lib.maintainers; [qknight];
19+ platforms = lib.platforms.all;
2020 };
2121}
pkgs/tools/system/facter/default.nix+2−2
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
1111 owner = "puppetlabs";
1212 };
1313
14− CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value";
15− NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lblkid";
14+ CXXFLAGS = lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value";
15+ NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lblkid";
1616
1717 cmakeFlags = [
1818 "-DFACTER_RUBY=${ruby}/lib/libruby${stdenv.hostPlatform.extensions.sharedLibrary}"
pkgs/tools/system/fakeroot/default.nix+7−7
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }:
1+{ lib, stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }:
22
33stdenv.mkDerivation rec {
44 version = "1.23";
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
99 sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700";
1010 };
1111
12− patches = stdenv.lib.optional stdenv.isLinux ./einval.patch
12+ patches = lib.optional stdenv.isLinux ./einval.patch
1313 # patchset from brew
14− ++ stdenv.lib.optionals stdenv.isDarwin [
14+ ++ lib.optionals stdenv.isDarwin [
1515 (fetchpatch {
1616 name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch";
1717 url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 ];
3131
3232 buildInputs = [ getopt gnused ]
33− ++ stdenv.lib.optional (!stdenv.isDarwin) libcap
33+ ++ lib.optional (!stdenv.isDarwin) libcap
3434 ;
3535
3636 postUnpack = ''
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
4040 meta = {
4141 homepage = "https://salsa.debian.org/clint/fakeroot";
4242 description = "Give a fake root environment through LD_PRELOAD";
43− license = stdenv.lib.licenses.gpl2Plus;
44− maintainers = with stdenv.lib.maintainers; [viric];
45− platforms = stdenv.lib.platforms.unix;
43+ license = lib.licenses.gpl2Plus;
44+ maintainers = with lib.maintainers; [viric];
45+ platforms = lib.platforms.unix;
4646 };
4747
4848}
pkgs/tools/system/fcron/default.nix+1−1
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
5656 description="A command scheduler with extended capabilities over cron and anacron";
5757 homepage = "http://fcron.free.fr";
5858 license = licenses.gpl2;
59− platforms = stdenv.lib.platforms.all;
59+ platforms = lib.platforms.all;
6060 };
6161}
pkgs/tools/system/fdisk/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, parted, libuuid, gettext, guile }:
1+{ fetchurl, lib, stdenv, parted, libuuid, gettext, guile }:
22
33stdenv.mkDerivation rec {
44 name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
2020 cfdisk. It uses GNU Parted.
2121 '';
2222
23− license = stdenv.lib.licenses.gpl3Plus;
23+ license = lib.licenses.gpl3Plus;
2424
2525 homepage = "https://www.gnu.org/software/fdisk/";
2626
27− platforms = stdenv.lib.platforms.linux;
27+ platforms = lib.platforms.linux;
2828 };
2929}
pkgs/tools/system/fio/default.nix+3−3
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 };
1515
1616 buildInputs = [ python zlib ]
17− ++ stdenv.lib.optional (!stdenv.isDarwin) libaio;
17+ ++ lib.optional (!stdenv.isDarwin) libaio;
1818
1919 nativeBuildInputs = [ makeWrapper ];
2020
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
2727 substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio
2828 '';
2929
30− postInstall = stdenv.lib.optionalString withGnuplot ''
30+ postInstall = lib.optionalString withGnuplot ''
3131 wrapProgram $out/bin/fio2gnuplot \
32− --prefix PATH : ${stdenv.lib.makeBinPath [ gnuplot ]}
32+ --prefix PATH : ${lib.makeBinPath [ gnuplot ]}
3333 '';
3434
3535 meta = with lib; {
pkgs/tools/system/freeipmi/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, libgcrypt, readline, libgpgerror }:
1+{ fetchurl, lib, stdenv, libgcrypt, readline, libgpgerror }:
22
33stdenv.mkDerivation rec {
44 version = "1.6.6";
@@ -33,10 +33,10 @@ stdenv.mkDerivation rec {
3333 homepage = "https://www.gnu.org/software/freeipmi/";
3434 downloadPage = "https://www.gnu.org/software/freeipmi/download.html";
3535
36− license = stdenv.lib.licenses.gpl3Plus;
36+ license = lib.licenses.gpl3Plus;
3737
38− maintainers = with stdenv.lib.maintainers; [ raskin ];
39− platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
38+ maintainers = with lib.maintainers; [ raskin ];
39+ platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
4040
4141 updateWalker = true;
4242 inherit version;
pkgs/tools/system/gptfdisk/default.nix+2−2
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 postPatch = ''
1515 patchShebangs gdisk_test.sh
16− '' + stdenv.lib.optionalString stdenv.isDarwin ''
16+ '' + lib.optionalString stdenv.isDarwin ''
1717 substituteInPlace Makefile.mac --replace \
1818 "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6"
1919 substituteInPlace Makefile.mac --replace \
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 "/opt/local/lib/libncurses.a" "${ncurses.out}/lib/libncurses.dylib"
2525 '';
2626
27− buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac";
27+ buildPhase = lib.optionalString stdenv.isDarwin "make -f Makefile.mac";
2828 buildInputs = [ libuuid popt icu ncurses ];
2929
3030 installPhase = ''
pkgs/tools/system/gt5/default.nix+5−5
@@ -1,8 +1,8 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
44 name = "gt5-1.4.0";
5−
5+
66 src = fetchurl {
77 url = "mirror://sourceforge/gt5/${name}.tar.gz";
88 sha256 = "0gm0gzyp4d9rxqddbaskbz5zvmlhyr4nyb5x9g7x4abyyxqjlnkq";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919 meta = {
2020 description = "A diff-capable 'du' browser";
2121 homepage = "http://gt5.sourceforge.net/";
22− license = stdenv.lib.licenses.gpl2Plus;
23− maintainers = with stdenv.lib.maintainers; [viric];
24− platforms = with stdenv.lib.platforms; linux;
22+ license = lib.licenses.gpl2Plus;
23+ maintainers = with lib.maintainers; [viric];
24+ platforms = with lib.platforms; linux;
2525 };
2626}
pkgs/tools/system/idle3tools/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl}:
1+{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation {
44 name = "idle3-tools-0.9.1";
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
1515 meta = {
1616 homepage = "http://idle3-tools.sourceforge.net/";
1717 description = "Tool to get/set the infamous idle3 timer in WD HDDs";
18− license = stdenv.lib.licenses.gpl3;
19− maintainers = with stdenv.lib.maintainers; [viric];
20− platforms = with stdenv.lib.platforms; linux;
18+ license = lib.licenses.gpl3;
19+ maintainers = with lib.maintainers; [viric];
20+ platforms = with lib.platforms; linux;
2121 };
2222}
pkgs/tools/system/illum/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }:
1+{ lib, stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }:
22
33stdenv.mkDerivation {
44 version = "0.4";
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
2626 meta = {
2727 homepage = "https://github.com/jmesmon/illum";
2828 description = "Daemon that wires button presses to screen backlight level";
29− platforms = stdenv.lib.platforms.linux;
30− maintainers = [ stdenv.lib.maintainers.dancek ];
31− license = stdenv.lib.licenses.agpl3;
29+ platforms = lib.platforms.linux;
30+ maintainers = [ lib.maintainers.dancek ];
31+ license = lib.licenses.agpl3;
3232 };
3333}
pkgs/tools/system/inxi/default.nix+1−1
@@ -9,7 +9,7 @@
99
1010let
1111 prefixPath = programs:
12− "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'";
12+ "--prefix PATH ':' '${lib.makeBinPath programs}'";
1313 recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [
1414 util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod
1515 lm_sensors smartmontools binutils tree upower pciutils
pkgs/tools/system/ipmitool/default.nix+3−3
@@ -29,15 +29,15 @@ stdenv.mkDerivation {
2929 configureFlags = [
3030 "--infodir=${placeholder "out"}/share/info"
3131 "--mandir=${placeholder "out"}/share/man"
32− ] ++ stdenv.lib.optionals static [
32+ ] ++ lib.optionals static [
3333 "LDFLAGS=-static"
3434 "--enable-static"
3535 "--disable-shared"
36− ] ++ stdenv.lib.optionals (!static) [
36+ ] ++ lib.optionals (!static) [
3737 "--enable-shared"
3838 ];
3939
40− makeFlags = stdenv.lib.optional static "AM_LDFLAGS=-all-static";
40+ makeFlags = lib.optional static "AM_LDFLAGS=-all-static";
4141 dontDisableStatic = static;
4242
4343 meta = with lib; {
pkgs/tools/system/ledmon/default.nix+1−1
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
3030 description = "Enclosure LED Utilities";
3131 platforms = platforms.linux;
3232 license = with licenses; [ gpl2 ];
33− maintainers = with stdenv.lib.maintainers; [ sorki ];
33+ maintainers = with lib.maintainers; [ sorki ];
3434 };
3535}
pkgs/tools/system/logrotate/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, gzip, popt, autoreconfHook
1+{ lib, stdenv, fetchFromGitHub, gzip, popt, autoreconfHook
22, mailutils ? null
33}:
44
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \
1919 -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac
2020
21− ${stdenv.lib.optionalString (mailutils != null) ''
21+ ${lib.optionalString (mailutils != null) ''
2222 sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac
2323 ''}
2424 '';
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
3333 meta = {
3434 homepage = "https://fedorahosted.org/releases/l/o/logrotate/";
3535 description = "Rotates and compresses system logs";
36− license = stdenv.lib.licenses.gpl2Plus;
37− maintainers = [ stdenv.lib.maintainers.viric ];
38− platforms = stdenv.lib.platforms.all;
36+ license = lib.licenses.gpl2Plus;
37+ maintainers = [ lib.maintainers.viric ];
38+ platforms = lib.platforms.all;
3939 };
4040}
pkgs/tools/system/mcron/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, guile, which, ed, libtool }:
1+{ fetchurl, lib, stdenv, guile, which, ed, libtool }:
22
33stdenv.mkDerivation rec {
44 name = "mcron-1.0.6";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 homepage = "https://www.gnu.org/software/mcron/";
3434
35− license = stdenv.lib.licenses.gpl3Plus;
36− platforms = stdenv.lib.platforms.unix;
35+ license = lib.licenses.gpl3Plus;
36+ platforms = lib.platforms.unix;
3737 };
3838}
pkgs/tools/system/monit/default.nix+8−8
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl, bison, flex
33, zlib
44, usePAM ? stdenv.hostPlatform.isLinux, pam
@@ -15,17 +15,17 @@ stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [ bison flex ];
1717 buildInputs = [ zlib.dev ] ++
18− stdenv.lib.optionals useSSL [ openssl ] ++
19− stdenv.lib.optionals usePAM [ pam ];
18+ lib.optionals useSSL [ openssl ] ++
19+ lib.optionals usePAM [ pam ];
2020
2121 configureFlags = [
22− (stdenv.lib.withFeature usePAM "pam")
22+ (lib.withFeature usePAM "pam")
2323 ] ++ (if useSSL then [
2424 "--with-ssl-incl-dir=${openssl.dev}/include"
2525 "--with-ssl-lib-dir=${openssl.out}/lib"
2626 ] else [
2727 "--without-ssl"
28− ]) ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
28+ ]) ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
2929 # will need to check both these are true for musl
3030 "libmonit_cv_setjmp_available=yes"
3131 "libmonit_cv_vsnprintf_c99_conformant=yes"
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
3434 meta = {
3535 homepage = "http://mmonit.com/monit/";
3636 description = "Monitoring system";
37− license = stdenv.lib.licenses.agpl3;
38− maintainers = with stdenv.lib.maintainers; [ raskin wmertens ];
39− platforms = with stdenv.lib.platforms; linux;
37+ license = lib.licenses.agpl3;
38+ maintainers = with lib.maintainers; [ raskin wmertens ];
39+ platforms = with lib.platforms; linux;
4040 };
4141}
pkgs/tools/system/netdata/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig
1+{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig
22, CoreFoundation, IOKit, libossp_uuid
33, curl, libcap, libuuid, lm_sensors, zlib, fetchpatch
44, nixosTests
@@ -10,7 +10,7 @@
1010, withDebug ? false
1111}:
1212
13−with stdenv.lib;
13+with lib;
1414
1515let
1616 go-d-plugin = callPackage ./go.d.plugin.nix {};
pkgs/tools/system/pciutils/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ pkgconfig ];
1515 buildInputs = [ zlib kmod which ] ++
16− stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
16+ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
1717
1818 preConfigure = if stdenv.cc.isGNU then null else ''
1919 substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' ""
pkgs/tools/system/plan9port/default.nix+3−3
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
3737
3838 substituteInPlace bin/9c \
3939 --replace 'which uniq' '${which}/bin/which uniq'
40− '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
40+ '' + lib.optionalString (!stdenv.isDarwin) ''
4141 #add missing ctrl+c\z\x\v keybind for non-Darwin
4242 substituteInPlace src/cmd/acme/text.c \
4343 --replace "case Kcmd+'c':" "case 0x03: case Kcmd+'c':" \
@@ -48,10 +48,10 @@ stdenv.mkDerivation {
4848
4949 buildInputs = [
5050 perl
51− ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
51+ ] ++ lib.optionals (!stdenv.isDarwin) [
5252 xorgproto libX11 libXext libXt fontconfig
5353 freetype # fontsrv wants ft2build.h provides system fonts for acme and sam.
54− ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
54+ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
5555 Carbon Cocoa IOKit Metal QuartzCore
5656 ]);
5757
pkgs/tools/system/proot/default.nix+2−2
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
1919 sed -i /CROSS_COMPILE/d src/GNUmakefile
2020 '';
2121
22− buildInputs = [ talloc ] ++ stdenv.lib.optional enablePython python;
23− nativeBuildInputs = [ docutils ] ++ stdenv.lib.optional enablePython swig;
22+ buildInputs = [ talloc ] ++ lib.optional enablePython python;
23+ nativeBuildInputs = [ docutils ] ++ lib.optional enablePython swig;
2424
2525 enableParallelBuilding = true;
2626
pkgs/tools/system/rofi-systemd/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper, jq
1+{ lib, stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper, jq
22}:
33
44stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 cp -a rofi-systemd $out/bin/rofi-systemd
2222 '';
2323
24− wrapperPath = with stdenv.lib; makeBinPath [
24+ wrapperPath = with lib; makeBinPath [
2525 coreutils
2626 gawk
2727 jq
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
3939 meta = {
4040 description = "Control your systemd units using rofi";
4141 homepage = "https://github.com/IvanMalison/rofi-systemd";
42− maintainers = with stdenv.lib.maintainers; [ imalison ];
43− license = stdenv.lib.licenses.gpl3;
44− platforms = with stdenv.lib.platforms; linux;
42+ maintainers = with lib.maintainers; [ imalison ];
43+ license = lib.licenses.gpl3;
44+ platforms = with lib.platforms; linux;
4545 };
4646}
pkgs/tools/system/rowhammer-test/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i";
1111 };
1212
13− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format";
13+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-Wno-error=format";
1414
1515 buildPhase = "sh -e make.sh";
1616
pkgs/tools/system/rsyslog/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
1+{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
22, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null
33, libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null
44, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
@@ -8,7 +8,7 @@
88, nixosTests ? null
99}:
1010
11−with stdenv.lib;
11+with lib;
1212let
1313 mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
1414in
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
2929 postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl
3030 librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq
3131 rabbitmq-c hiredis mongoc libmaxminddb
32− ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient
33− ++ stdenv.lib.optional stdenv.isLinux systemd;
32+ ] ++ lib.optional (libmysqlclient != null) libmysqlclient
33+ ++ lib.optional stdenv.isLinux systemd;
3434
3535 configureFlags = [
3636 "--sysconfdir=/etc"
pkgs/tools/system/runit/default.nix+4−4
@@ -23,15 +23,15 @@ stdenv.mkDerivation rec {
2323
2424 doCheck = true;
2525
26− buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++
27− stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
26+ buildInputs = lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++
27+ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
2828
2929 postPatch = ''
3030 sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h
3131 # usernamespace sandbox of nix seems to conflict with runit's assumptions
3232 # about unix users. Therefor skip the check
3333 sed -i '/.\/chkshsgr/d' src/Makefile
34− '' + stdenv.lib.optionalString (!static) ''
34+ '' + lib.optionalString (!static) ''
3535 sed -i 's,-static,,g' src/Makefile
3636 '';
3737
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040
4141 # Both of these are originally hard-coded to gcc
4242 echo ${stdenv.cc.targetPrefix}cc > conf-cc
43− echo ${stdenv.cc.targetPrefix}cc ${stdenv.lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld
43+ echo ${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld
4444 '';
4545
4646 installPhase = ''
pkgs/tools/system/s6-rc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, skawarePackages }:
1+{ lib, stdenv, skawarePackages }:
22
33with skawarePackages;
44
@@ -8,7 +8,7 @@ buildPackage {
88 sha256 = "1qpygkajalaziszhwfv5rr6hc27q05z8dayyv7im06z6vndimchs";
99
1010 description = "A service manager for s6-based systems";
11− platforms = stdenv.lib.platforms.linux;
11+ platforms = lib.platforms.linux;
1212
1313 outputs = [ "bin" "lib" "dev" "doc" "out" ];
1414
pkgs/tools/system/safecopy/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 name = "safecopy-1.7";
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
2222
2323 homepage = "http://safecopy.sourceforge.net";
2424
25− license = stdenv.lib.licenses.gpl2Plus;
25+ license = lib.licenses.gpl2Plus;
2626
27− platforms = stdenv.lib.platforms.linux;
28− maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
27+ platforms = lib.platforms.linux;
28+ maintainers = [ lib.maintainers.bluescreen303 ];
2929 };
3030}
pkgs/tools/system/setserial/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, groff }:
1+{ lib, stdenv, fetchurl, groff }:
22
33stdenv.mkDerivation rec {
44 pname = "setserial";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 meta = {
2323 description = "Serial port configuration utility";
24− platforms = stdenv.lib.platforms.linux;
25− license = stdenv.lib.licenses.gpl2;
24+ platforms = lib.platforms.linux;
25+ license = lib.licenses.gpl2;
2626 };
2727}
pkgs/tools/system/sleuthkit/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }:
22
33stdenv.mkDerivation rec {
44 version = "4.6.5";
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
2626 meta = {
2727 description = "A forensic/data recovery tool";
2828 homepage = "https://www.sleuthkit.org/";
29− maintainers = [ stdenv.lib.maintainers.raskin ];
30− platforms = stdenv.lib.platforms.linux;
31− license = stdenv.lib.licenses.ipl10;
29+ maintainers = [ lib.maintainers.raskin ];
30+ platforms = lib.platforms.linux;
31+ license = lib.licenses.ipl10;
3232 inherit version;
3333 };
3434}
pkgs/tools/system/smartmontools/default.nix+2−2
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
2626 postPatch = "cp -v ${driverdb} drivedb.h";
2727
2828 configureFlags = [
29− "--with-scriptpath=${stdenv.lib.makeBinPath [ mailutils inetutils ]}"
29+ "--with-scriptpath=${lib.makeBinPath [ mailutils inetutils ]}"
3030 ];
3131
3232 nativeBuildInputs = [ autoreconfHook ];
33− buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices];
33+ buildInputs = [] ++ lib.optionals stdenv.isDarwin [IOKit ApplicationServices];
3434 enableParallelBuilding = true;
3535
3636 meta = with lib; {
pkgs/tools/system/socklog/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
3−with stdenv.lib;
3+with lib;
44
55stdenv.mkDerivation rec {
66 pname = "socklog";
pkgs/tools/system/stress-ng/default.nix+2−2
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 # All platforms inputs then Linux-only ones
1919 buildInputs = [ judy libbsd libgcrypt zlib ]
20− ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [
20+ ++ lib.optionals stdenv.hostPlatform.isLinux [
2121 attr keyutils libaio libapparmor libcap lksctp-tools
2222 ];
2323
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 "BASHDIR=${placeholder "out"}/share/bash-completion/completions"
2929 ];
3030
31− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1";
31+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1";
3232
3333 # Won't build on i686 because the binary will be linked again in the
3434 # install phase without checking the dependencies. This will prevent
pkgs/tools/system/supervise/default.nix+1−1
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
1515 description = "A minimal unprivileged process supervisor making use of modern Linux features";
1616 platforms = platforms.linux;
1717 license = licenses.gpl3;
18− maintainers = with stdenv.lib.maintainers; [ catern ];
18+ maintainers = with lib.maintainers; [ catern ];
1919 };
2020}
pkgs/tools/system/testdisk/default.nix+5−5
@@ -35,9 +35,9 @@ assert enableQt -> qwt != null;
3535 zlib
3636 libewf
3737 ]
38− ++ stdenv.lib.optional enableNtfs ntfs3g
39− ++ stdenv.lib.optional enableExtFs e2fsprogs
40− ++ stdenv.lib.optionals enableQt [ qtbase qttools qwt ];
38+ ++ lib.optional enableNtfs ntfs3g
39+ ++ lib.optional enableExtFs e2fsprogs
40+ ++ lib.optionals enableQt [ qtbase qttools qwt ];
4141
4242 nativeBuildInputs = [ pkgconfig ];
4343
@@ -61,8 +61,8 @@ assert enableQt -> qwt != null;
6161 it will still work even if your media's file system has been severely
6262 damaged or reformatted.
6363 '';
64− license = stdenv.lib.licenses.gpl2Plus;
65− platforms = stdenv.lib.platforms.all;
64+ license = lib.licenses.gpl2Plus;
65+ platforms = lib.platforms.all;
6666 maintainers = with maintainers; [ fgaz eelco ];
6767 };
6868}
pkgs/tools/system/thinkfan/default.nix+2−2
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
1515 cmakeFlags = [
1616 "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}"
1717 "-DUSE_NVML=OFF"
18− ] ++ stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON";
18+ ] ++ lib.optional smartSupport "-DUSE_ATASMART=ON";
1919
2020 nativeBuildInputs = [ cmake pkgconfig ];
2121
22− buildInputs = [ libyamlcpp ] ++ stdenv.lib.optional smartSupport libatasmart;
22+ buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart;
2323
2424 installPhase = ''
2525 runHook preInstall
pkgs/tools/system/tree/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33let
44 version = "1.8.0";
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
4545 meta = {
4646 homepage = "http://mama.indstate.edu/users/ice/tree/";
4747 description = "Command to produce a depth indented directory listing";
48− license = stdenv.lib.licenses.gpl2;
48+ license = lib.licenses.gpl2;
4949
5050 longDescription = ''
5151 Tree is a recursive directory listing command that produces a
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
5353 the LS_COLORS environment variable is set and output is to tty.
5454 '';
5555
56− platforms = stdenv.lib.platforms.all;
57− maintainers = [stdenv.lib.maintainers.peti];
56+ platforms = lib.platforms.all;
57+ maintainers = [lib.maintainers.peti];
5858 };
5959}
pkgs/tools/system/tuptime/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131
3232 preFixup = ''
3333 wrapProgram $out/share/tuptime/db-tuptime-migrate-4.0-to-5.0.sh \
34− --prefix PATH : "${stdenv.lib.makeBinPath [ sqlite ]}"
34+ --prefix PATH : "${lib.makeBinPath [ sqlite ]}"
3535 '';
3636
3737 meta = with lib; {
pkgs/tools/system/undaemonize/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation {
44 name = "undaemonize-2017-07-11";
@@ -14,9 +14,9 @@ stdenv.mkDerivation {
1414 meta = {
1515 description = "Tiny helper utility to force programs which insist on daemonizing themselves to run in the foreground";
1616 homepage = "https://github.com/nickstenning/undaemonize";
17− license = stdenv.lib.licenses.mit;
18− maintainers = [ stdenv.lib.maintainers.canndrew ];
19− platforms = stdenv.lib.platforms.linux;
17+ license = lib.licenses.mit;
18+ maintainers = [ lib.maintainers.canndrew ];
19+ platforms = lib.platforms.linux;
2020 };
2121}
2222
pkgs/tools/system/zenith/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "16s7swv2sp15gry1j1pcyz29cspvafczaf4v02x4fd2jbn2y3f6r";
1515
16− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
16+ buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
1717
1818 meta = with lib; {
1919 description = "Sort of like top or htop but with zoom-able charts, network, and disk usage";
pkgs/tools/text/agrep/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 };
1414
1515 # Related: https://github.com/Wikinaut/agrep/pull/11
16− prePatch = stdenv.lib.optionalString (stdenv.hostPlatform.isMusl || stdenv.isDarwin) ''
16+ prePatch = lib.optionalString (stdenv.hostPlatform.isMusl || stdenv.isDarwin) ''
1717 sed -i '1i#include <sys/stat.h>' checkfil.c newmgrep.c recursiv.c
1818 '';
1919 installPhase = ''
pkgs/tools/text/amber/default.nix+1−1
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
1515
1616 cargoSha256 = "0h47xqqq8f8m28rl1s6r305cf3dvk94aa86j6m0rk535i2jqfvhp";
1717
18− buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
18+ buildInputs = lib.optional stdenv.isDarwin Security;
1919
2020 meta = with lib; {
2121 description = "A code search-and-replace tool";
pkgs/tools/text/boxes/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config"
2626 '';
2727
28− makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
28+ makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
2929
3030 installPhase = ''
3131 install -Dm755 -t $out/bin src/boxes
pkgs/tools/text/chars/default.nix+1−1
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
1717
1818 cargoSha256 = "1ampmw0l2wk2xp4q13aj5shxncqfh4dc3rsmpk2scaivanrsikn5";
1919
20− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
20+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
2121
2222 meta = with lib; {
2323 description = "Commandline tool to display information about unicode characters";
pkgs/tools/text/codesearch/default.nix+5−5
@@ -1,9 +1,9 @@
11# This file was generated by go2nix.
2−{ stdenv, buildGoPackage, fetchgit }:
2+{ lib, stdenv, buildGoPackage, fetchgit }:
33
44buildGoPackage rec {
55 pname = "codesearch";
6− version = "20150717-${stdenv.lib.strings.substring 0 7 rev}";
6+ version = "20150717-${lib.strings.substring 0 7 rev}";
77 rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
88
99 goPackagePath = "github.com/google/codesearch";
@@ -17,8 +17,8 @@ buildGoPackage rec {
1717 meta = {
1818 description = "Fast, indexed regexp search over large file trees";
1919 homepage = "https://github.com/google/codesearch";
20− license = [ stdenv.lib.licenses.bsd3 ];
21− maintainers = [ stdenv.lib.maintainers.bennofs ];
22− platforms = stdenv.lib.platforms.unix;
20+ license = [ lib.licenses.bsd3 ];
21+ maintainers = [ lib.maintainers.bennofs ];
22+ platforms = lib.platforms.unix;
2323 };
2424}
pkgs/tools/text/coloursum/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "1w0q5w0bf1682jvzcml8cgmr9mrgi4if0p63wzchyjav330dp6pk";
1515
16− buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
16+ buildInputs = lib.optional stdenv.isDarwin Security;
1717
1818 meta = with lib; {
1919 description = "Colourise your checksum output";
pkgs/tools/text/convertlit/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip, libtommath}:
1+{lib, stdenv, fetchzip, libtommath}:
22
33stdenv.mkDerivation {
44 name = "convertlit-1.8";
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
3030 meta = {
3131 homepage = "http://www.convertlit.com/";
3232 description = "A tool for converting Microsoft Reader ebooks to more open formats";
33− license = stdenv.lib.licenses.gpl2;
34− platforms = stdenv.lib.platforms.linux;
33+ license = lib.licenses.gpl2;
34+ platforms = lib.platforms.linux;
3535 };
3636}
pkgs/tools/text/diction/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "diction";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 characteristics of a document, including sentence length and other
1818 readability measures.
1919 '';
20− license = stdenv.lib.licenses.gpl3Plus;
21− platforms = stdenv.lib.platforms.unix;
20+ license = lib.licenses.gpl3Plus;
21+ platforms = lib.platforms.unix;
2222 };
2323}
pkgs/tools/text/diffr/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "09yn02985yv40n9y0ipz0jmj7iqhz7l8hd3ry9ib3fyw9pyklnfa";
1515
16− buildInputs = (stdenv.lib.optional stdenv.isDarwin Security);
16+ buildInputs = (lib.optional stdenv.isDarwin Security);
1717
1818 preCheck = ''
1919 export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr
pkgs/tools/text/diffutils/default.nix+2−2
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
2222 configureFlags =
2323 # "pr" need not be on the PATH as a run-time dep, so we need to tell
2424 # configure where it is. Covers the cross and native case alike.
25− stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr"
26− ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes";
25+ lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr"
26+ ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes";
2727
2828 meta = with lib; {
2929 homepage = "https://www.gnu.org/software/diffutils/diffutils.html";
pkgs/tools/text/ebook-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }:
1+{ lib, stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }:
22
33stdenv.mkDerivation rec {
44 name = "ebook-tools-0.2.2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libzip)"
1717 '';
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = "http://ebook-tools.sourceforge.net";
2121 description = "Tools and library for dealing with various ebook file formats";
2222 maintainers = [ ];
pkgs/tools/text/enscript/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gettext }:
1+{ lib, stdenv, fetchurl, gettext }:
22
33stdenv.mkDerivation rec {
44 name = "enscript-1.6.6";
@@ -33,11 +33,11 @@ stdenv.mkDerivation rec {
3333 it has many options that can be used to customize printouts.
3434 '';
3535
36− license = stdenv.lib.licenses.gpl3Plus;
36+ license = lib.licenses.gpl3Plus;
3737
3838 homepage = "https://www.gnu.org/software/enscript/";
3939
4040 maintainers = [ ];
41− platforms = stdenv.lib.platforms.all;
41+ platforms = lib.platforms.all;
4242 };
4343}
pkgs/tools/text/fastmod/default.nix+1−1
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
1717
1818 cargoSha256 = "18bspi59vfnqijxgipmv2h6h5iy7qynpk1ph46yhjsnndjlxxcba";
1919
20− buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
20+ buildInputs = lib.optional stdenv.isDarwin Security;
2121
2222 meta = with lib; {
2323 description = "A utility that makes sweeping changes to large, shared code bases";
pkgs/tools/text/gawk/default.nix+1−1
@@ -16,7 +16,7 @@
1616assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
1717
1818let
19− inherit (stdenv.lib) optional;
19+ inherit (lib) optional;
2020in
2121stdenv.mkDerivation rec {
2222 name = "gawk-5.1.0";
pkgs/tools/text/gawk/gawkextlib.nix+2−2
@@ -4,7 +4,7 @@
44, expat, tre, makeWrapper }:
55
66let
7− buildExtension = stdenv.lib.makeOverridable
7+ buildExtension = lib.makeOverridable
88 ({ name, gawkextlib, extraBuildInputs ? [ ], doCheck ? true }:
99 let is_extension = !isNull gawkextlib;
1010 in stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ let
3232 ];
3333
3434 buildInputs = [ gawk ] ++ extraBuildInputs;
35− propagatedBuildInputs = stdenv.lib.optional is_extension gawkextlib;
35+ propagatedBuildInputs = lib.optional is_extension gawkextlib;
3636
3737 setupHook = if is_extension then ./setup-hook.sh else null;
3838 inherit gawk;
pkgs/tools/text/glogg/default.nix+2−2
@@ -11,7 +11,7 @@ mkDerivation rec {
1111 sha256 = "0hf1c2m8n88frmxmyn0ndr8129p7iky49nq565sw1asaydm5z6pb";
1212 };
1313
14− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
14+ postPatch = lib.optionalString stdenv.isDarwin ''
1515 substituteInPlace glogg.pro \
1616 --replace "boost_program_options-mt" "boost_program_options"
1717 '';
@@ -22,7 +22,7 @@ mkDerivation rec {
2222 qmakeFlags = [ "VERSION=${version}" ];
2323 enableParallelBuilding = true;
2424
25− postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
25+ postInstall = lib.optionalString stdenv.isDarwin ''
2626 mkdir -p $out/Applications
2727 mv $out/bin/glogg.app $out/Applications/glogg.app
2828 rm -fr $out/{bin,share}
pkgs/tools/text/gnupatch/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl
1+{ lib, stdenv, fetchurl
22, ed, autoreconfHook
33}:
44
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 nativeBuildInputs = [ autoreconfHook ];
3434
35− configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
35+ configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
3636 "ac_cv_func_strnlen_working=yes"
3737 ];
3838
@@ -50,9 +50,9 @@ stdenv.mkDerivation rec {
5050
5151 homepage = "https://savannah.gnu.org/projects/patch";
5252
53− license = stdenv.lib.licenses.gpl3Plus;
53+ license = lib.licenses.gpl3Plus;
5454
5555 maintainers = [ ];
56− platforms = stdenv.lib.platforms.all;
56+ platforms = lib.platforms.all;
5757 };
5858}
pkgs/tools/text/gnused/422.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 name = "gnused-4.2.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";
99 };
1010
11− configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMinGW "ac_cv_func__set_invalid_parameter_handler=no";
11+ configureFlags = lib.optional stdenv.hostPlatform.isMinGW "ac_cv_func__set_invalid_parameter_handler=no";
1212
1313 outputs = [ "out" "info" ];
1414
@@ -25,9 +25,9 @@ stdenv.mkDerivation {
2525 multiple occurrences of a string within a file.
2626 '';
2727
28− license = stdenv.lib.licenses.gpl3Plus;
28+ license = lib.licenses.gpl3Plus;
2929
30− platforms = stdenv.lib.platforms.all;
30+ platforms = lib.platforms.all;
3131 maintainers = [ ];
3232 };
3333}
pkgs/tools/text/gnused/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl }:
1+{ lib, stdenv, fetchurl, perl }:
22
33stdenv.mkDerivation rec {
44 pname = "gnused";
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
3030 multiple occurrences of a string within a file.
3131 '';
3232
33− license = stdenv.lib.licenses.gpl3Plus;
33+ license = lib.licenses.gpl3Plus;
3434
35− platforms = stdenv.lib.platforms.unix;
35+ platforms = lib.platforms.unix;
3636 maintainers = [ ];
3737 };
3838}
pkgs/tools/text/grin/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python2Packages }:
1+{ lib, stdenv, fetchFromGitHub, python2Packages }:
22
33python2Packages.buildPythonApplication rec {
44 program = "grin";
@@ -18,7 +18,7 @@ python2Packages.buildPythonApplication rec {
1818 meta = {
1919 homepage = "https://github.com/rkern/grin";
2020 description = "A grep program configured the way I like it";
21− platforms = stdenv.lib.platforms.all;
22− maintainers = [ stdenv.lib.maintainers.sjagoe ];
21+ platforms = lib.platforms.all;
22+ maintainers = [ lib.maintainers.sjagoe ];
2323 };
2424}
pkgs/tools/text/groff/default.nix+12−12
@@ -24,18 +24,18 @@ stdenv.mkDerivation rec {
2424 ./0001-Fix-cross-compilation-by-looking-for-ar.patch
2525 ];
2626
27− postPatch = stdenv.lib.optionalString (psutils != null) ''
27+ postPatch = lib.optionalString (psutils != null) ''
2828 substituteInPlace src/preproc/html/pre-html.cpp \
2929 --replace "psselect" "${psutils}/bin/psselect"
30− '' + stdenv.lib.optionalString (netpbm != null) ''
30+ '' + lib.optionalString (netpbm != null) ''
3131 substituteInPlace src/preproc/html/pre-html.cpp \
32− --replace "pnmcut" "${stdenv.lib.getBin netpbm}/bin/pnmcut" \
33− --replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \
34− --replace "pnmtopng" "${stdenv.lib.getBin netpbm}/bin/pnmtopng"
32+ --replace "pnmcut" "${lib.getBin netpbm}/bin/pnmcut" \
33+ --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
34+ --replace "pnmtopng" "${lib.getBin netpbm}/bin/pnmtopng"
3535 substituteInPlace tmac/www.tmac \
36− --replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \
37− --replace "pngtopnm" "${stdenv.lib.getBin netpbm}/bin/pngtopnm" \
38− --replace "@PNMTOPS_NOSETPAGE@" "${stdenv.lib.getBin netpbm}/bin/pnmtops -nosetpage"
36+ --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
37+ --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \
38+ --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage"
3939 '';
4040
4141 buildInputs = [ ghostscript psutils netpbm perl ];
@@ -48,14 +48,14 @@ stdenv.mkDerivation rec {
4848 # have to pass "--with-appresdir", too.
4949 configureFlags = [
5050 "--without-x"
51− ] ++ stdenv.lib.optionals (ghostscript != null) [
51+ ] ++ lib.optionals (ghostscript != null) [
5252 "--with-gs=${ghostscript}/bin/gs"
53− ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
53+ ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
5454 "ac_cv_path_PERL=${buildPackages.perl}/bin/perl"
5555 "gl_cv_func_signbit=yes"
5656 ];
5757
58− makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
58+ makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
5959 # Trick to get the build system find the proper 'native' groff
6060 # http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html
6161 "GROFF_BIN_PATH=${buildPackages.groff}/bin"
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
9999 substituteInPlace $perl/bin/grog \
100100 --replace $out/lib/groff/grog $perl/lib/groff/grog
101101
102− '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
102+ '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
103103 find $perl/ -type f -print0 | xargs --null sed -i 's|${buildPackages.perl}|${perl}|'
104104 '';
105105
pkgs/tools/text/gtranslator/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 version = "3.38.0";
2626
2727 src = fetchurl {
28− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
28+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
2929 sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU=";
3030 };
3131
pkgs/tools/text/highlight/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitLab, getopt, lua, boost, pkgconfig, swig, perl, gcc }:
22
3−with stdenv.lib;
3+with lib;
44
55let
66 self = stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ let
2020
2121 buildInputs = [ getopt lua boost ];
2222
23− prePatch = stdenv.lib.optionalString stdenv.cc.isClang ''
23+ prePatch = lib.optionalString stdenv.cc.isClang ''
2424 substituteInPlace src/makefile \
2525 --replace 'CXX=g++' 'CXX=clang++'
2626 '';
pkgs/tools/text/html2text/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 name = "html2text-1.3.2a";
@@ -25,8 +25,8 @@ stdenv.mkDerivation {
2525 meta = {
2626 description = "Convert HTML to plain text";
2727 homepage = "http://www.mbayer.de/html2text/";
28− license = stdenv.lib.licenses.gpl2Plus;
29− platforms = stdenv.lib.platforms.unix;
30− maintainers = [ stdenv.lib.maintainers.eikek ];
28+ license = lib.licenses.gpl2Plus;
29+ platforms = lib.platforms.unix;
30+ maintainers = [ lib.maintainers.eikek ];
3131 };
3232}
pkgs/tools/text/invoice2data/default.nix+1−1
@@ -9,7 +9,7 @@ python3Packages.buildPythonPackage rec {
99 sha256 = "1phz0a8jxg074k0im7shrrdfvdps7bn1fa4zwcf8q3sa2iig26l4";
1010 };
1111
12− makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ imagemagick xpdf tesseract ]) ];
12+ makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ imagemagick xpdf tesseract ]) ];
1313
1414 propagatedBuildInputs = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ];
1515
pkgs/tools/text/ispell/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727
2828 postPatch = ''
2929 cat >> local.h <<EOF
30− ${stdenv.lib.optionalString (!stdenv.isDarwin) "#define USG"}
30+ ${lib.optionalString (!stdenv.isDarwin) "#define USG"}
3131 #define TERMLIB "-lncurses"
3232 #define LANGUAGES "{american,MASTERDICTS=american.med,HASHFILES=americanmed.hash}"
3333 #define MASTERHASH "americanmed.hash"
pkgs/tools/text/jsawk/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey_38 }:
1+{ lib, stdenv, fetchFromGitHub, makeWrapper, spidermonkey_38 }:
22
33stdenv.mkDerivation {
44 pname = "jsawk";
@@ -21,8 +21,8 @@ stdenv.mkDerivation {
2121 meta = {
2222 description = "Like awk, but for JSON";
2323 homepage = "https://github.com/micha/jsawk";
24− license = stdenv.lib.licenses.publicDomain;
25− maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
26− platforms = stdenv.lib.platforms.unix;
24+ license = lib.licenses.publicDomain;
25+ maintainers = with lib.maintainers; [ puffnfresh ];
26+ platforms = lib.platforms.unix;
2727 };
2828}
pkgs/tools/text/kakasi/default.nix+1−1
@@ -3,7 +3,7 @@
33stdenv.mkDerivation rec {
44 name = "kakasi-2.3.6";
55
6− buildInputs = stdenv.lib.optional stdenv.isDarwin [ libiconv ];
6+ buildInputs = lib.optional stdenv.isDarwin [ libiconv ];
77
88 meta = with lib; {
99 description = "Kanji Kana Simple Inverter";
pkgs/tools/text/kytea/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 patches = [ ./gcc-O3.patch ];
1414
15− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
15+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
1616
1717 meta = with lib; {
1818 homepage = "http://www.phontron.com/kytea/";
pkgs/tools/text/ledger2beancount/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchFromGitHub, makeWrapper, perlPackages, beancount }:
1+{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages, beancount }:
22
3−with stdenv.lib;
3+with lib;
44
55let
66 perlDeps = with perlPackages; [
pkgs/tools/text/mairix/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, zlib, bzip2, bison, flex }:
1+{ lib, stdenv, fetchurl, zlib, bzip2, bison, flex }:
22
33stdenv.mkDerivation rec {
44 name = "mairix-0.24";
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
1717
1818 meta = {
1919 homepage = "http://www.rc0.org.uk/mairix";
20− license = stdenv.lib.licenses.gpl2Plus;
20+ license = lib.licenses.gpl2Plus;
2121 description = "Program for indexing and searching email messages stored in maildir, MH or mbox";
22− maintainers = with stdenv.lib.maintainers; [viric];
23− platforms = with stdenv.lib.platforms; all;
22+ maintainers = with lib.maintainers; [viric];
23+ platforms = with lib.platforms; all;
2424 };
2525}
pkgs/tools/text/mdbook/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "1psgqj04hzv7p18h4phsahxg4rj9yz38b8mh111k6l8m4r83kd75";
1515
16− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
16+ buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
1717
1818 meta = with lib; {
1919 description = "Create books from MarkDown";
pkgs/tools/text/mdcat/default.nix+1−1
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
2121 };
2222
2323 nativeBuildInputs = [ pkgconfig asciidoctor installShellFiles ];
24− buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
24+ buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
2525
2626 cargoSha256 = "sha256-mnDUIJhEGNoh3eq2Vhww1T/tpZh9RP+RxbRsBNrpOzw=";
2727
pkgs/tools/text/mpage/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv }:
1+{ fetchurl, lib, stdenv }:
22
33stdenv.mkDerivation rec {
44 name = "mpage-2.5.7";
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
2424
2525 license = "liberal"; # a non-copyleft license, see `Copyright' file
2626 homepage = "http://www.mesa.nl/pub/mpage/";
27− platforms = stdenv.lib.platforms.linux;
27+ platforms = lib.platforms.linux;
2828 };
2929}
pkgs/tools/text/multitran/data/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl} :
1+{lib, stdenv, fetchurl} :
22
33# This package requires a locale ru_RU.cp1251 locale entry.
44# Waiting for a better idea, I created it modifying a store file using:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 meta = {
2020 homepage = "http://multitran.sourceforge.net/";
2121 description = "Multitran data english-russian";
22− license = stdenv.lib.licenses.gpl2;
23− platforms = stdenv.lib.platforms.unix;
22+ license = lib.licenses.gpl2;
23+ platforms = lib.platforms.unix;
2424 };
2525}
pkgs/tools/text/multitran/libbtree/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl} :
1+{lib, stdenv, fetchurl} :
22
33stdenv.mkDerivation {
44 name = "libbtree-0.0.1alpha2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 meta = {
1414 homepage = "http://multitran.sourceforge.net/";
1515 description = "Multitran lib: library for reading Multitran's BTREE database format";
16− license = stdenv.lib.licenses.gpl2;
17− platforms = stdenv.lib.platforms.linux;
16+ license = lib.licenses.gpl2;
17+ platforms = lib.platforms.linux;
1818 };
1919}
pkgs/tools/text/multitran/libfacet/default.nix+4−4
@@ -1,8 +1,8 @@
1−{ stdenv, fetchurl, libmtsupport }:
1+{ lib, stdenv, fetchurl, libmtsupport }:
22
33stdenv.mkDerivation {
44 name = "libfacet-0.0.1alpha2";
5−
5+
66 src = fetchurl {
77 url = "mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2";
88 sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 meta = {
2020 homepage = "http://multitran.sourceforge.net/";
2121 description = "Multitran lib: enchanced locale facets";
22− license = stdenv.lib.licenses.gpl2;
23− platforms = stdenv.lib.platforms.linux;
22+ license = lib.licenses.gpl2;
23+ platforms = lib.platforms.linux;
2424 };
2525}
pkgs/tools/text/multitran/libmtquery/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libmtsupport, libfacet, libbtree, multitrandata } :
1+{lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, multitrandata } :
22
33stdenv.mkDerivation {
44 name = "libmtquery-0.0.1alpha3";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
2323 meta = {
2424 homepage = "http://multitran.sourceforge.net/";
2525 description = "Multitran lib: main engine to query translations";
26− license = stdenv.lib.licenses.gpl2;
27− platforms = stdenv.lib.platforms.linux;
26+ license = lib.licenses.gpl2;
27+ platforms = lib.platforms.linux;
2828 };
2929}
pkgs/tools/text/multitran/libmtsupport/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl} :
1+{lib, stdenv, fetchurl} :
22
33stdenv.mkDerivation {
44 name = "libmtsupport-0.0.1alpha2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 meta = {
1414 homepage = "http://multitran.sourceforge.net/";
1515 description = "Multitran lib: basic useful functions";
16− license = stdenv.lib.licenses.gpl2;
17− platforms = stdenv.lib.platforms.linux;
16+ license = lib.licenses.gpl2;
17+ platforms = lib.platforms.linux;
1818 };
1919}
pkgs/tools/text/multitran/mtutils/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libmtsupport, libfacet, libbtree, libmtquery, help2man} :
1+{lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, libmtquery, help2man} :
22
33stdenv.mkDerivation {
44 name = "mt-utils-0.0.1alpha3";
@@ -25,8 +25,8 @@ stdenv.mkDerivation {
2525 meta = {
2626 homepage = "http://multitran.sourceforge.net/";
2727 description = "Multitran: simple command line utilities for dictionary maintenance";
28− license = stdenv.lib.licenses.gpl2;
29− maintainers = with stdenv.lib.maintainers; [viric];
30− platforms = with stdenv.lib.platforms; linux;
28+ license = lib.licenses.gpl2;
29+ maintainers = with lib.maintainers; [viric];
30+ platforms = with lib.platforms; linux;
3131 };
3232}
pkgs/tools/text/namazu/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, perl }:
1+{ fetchurl, lib, stdenv, perl }:
22
33stdenv.mkDerivation rec {
44 name = "namazu-2.0.21";
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
3434 but also as a personal search system for email or other files.
3535 '';
3636
37− license = stdenv.lib.licenses.gpl2Plus;
37+ license = lib.licenses.gpl2Plus;
3838 homepage = "http://namazu.org/";
3939
40− platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
40+ platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
4141 maintainers = [ ];
4242 broken = true; # File-MMagic is not compatible with our Perl version
4343 };
pkgs/tools/text/nawk/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, yacc }:
1+{ lib, stdenv, fetchFromGitHub, yacc }:
22
33stdenv.mkDerivation rec {
44 pname = "nawk";
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
3131 (Addison-Wesley, 1988, ISBN 0-201-07981-X).
3232 '';
3333 homepage = "https://www.cs.princeton.edu/~bwk/btl.mirror/";
34− license = stdenv.lib.licenses.mit;
35− maintainers = [ stdenv.lib.maintainers.konimex ];
36− platforms = stdenv.lib.platforms.linux;
34+ license = lib.licenses.mit;
35+ maintainers = [ lib.maintainers.konimex ];
36+ platforms = lib.platforms.linux;
3737 };
3838}
pkgs/tools/text/nkf/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "nkf";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
1414 meta = {
1515 description = "Tool for converting encoding of Japanese text";
1616 homepage = "https://nkf.osdn.jp/";
17− license = stdenv.lib.licenses.zlib;
18− platforms = stdenv.lib.platforms.unix;
19− maintainers = [ stdenv.lib.maintainers.auntie ];
17+ license = lib.licenses.zlib;
18+ platforms = lib.platforms.unix;
19+ maintainers = [ lib.maintainers.auntie ];
2020 };
2121}
pkgs/tools/text/ocrmypdf/default.nix+2−2
@@ -74,11 +74,11 @@ buildPythonApplication rec {
7474 patches = [
7575 (substituteAll {
7676 src = ./liblept.patch;
77− liblept = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}";
77+ liblept = "${lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}";
7878 })
7979 ];
8080
81− makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ];
81+ makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ];
8282
8383 meta = with lib; {
8484 homepage = "https://github.com/jbarlow83/OCRmyPDF";
pkgs/tools/text/odt2txt/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, zlib, libiconv }:
1+{ lib, stdenv, fetchurl, zlib, libiconv }:
22
33stdenv.mkDerivation rec {
44 pname = "odt2txt";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
1616 meta = {
1717 description = "Simple .odt to .txt converter";
1818 homepage = "https://github.com/dstosberg/odt2txt";
19− platforms = stdenv.lib.platforms.all;
20− license = stdenv.lib.licenses.gpl2;
19+ platforms = lib.platforms.all;
20+ license = lib.licenses.gpl2;
2121 maintainers = [ ];
2222 };
2323}
pkgs/tools/text/opencc/default.nix+2−2
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ cmake python ];
1515
1616 # let intermediate tools find intermediate library
17− preBuild = stdenv.lib.optionalString stdenv.isLinux ''
17+ preBuild = lib.optionalString stdenv.isLinux ''
1818 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/src
19− '' + stdenv.lib.optionalString stdenv.isDarwin ''
19+ '' + lib.optionalString stdenv.isDarwin ''
2020 export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$(pwd)/src
2121 '';
2222
pkgs/tools/text/poedit/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 ];
3232
3333 preFixup = ''
34− gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}")
34+ gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ gettext ]}")
3535 '';
3636
3737 enableParallelBuilding = true;
pkgs/tools/text/popfile/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, makeWrapper, perlPackages,
1+{ lib, stdenv, fetchzip, makeWrapper, perlPackages,
22... }:
33
44stdenv.mkDerivation rec {
@@ -49,11 +49,11 @@ stdenv.mkDerivation rec {
4949 meta = {
5050 description = "An email classification system that automatically sorts messages and fights spam";
5151 homepage = "http://getpopfile.org";
52− license = stdenv.lib.licenses.gpl2;
52+ license = lib.licenses.gpl2;
5353
5454 # Should work on macOS, but havent tested it.
5555 # Windows support is more complicated.
5656 # http://getpopfile.org/docs/faq:systemrequirements
57− platforms = stdenv.lib.platforms.linux;
57+ platforms = lib.platforms.linux;
5858 };
5959}
pkgs/tools/text/qgrep/default.nix+4−4
@@ -12,21 +12,21 @@ stdenv.mkDerivation rec {
1212 fetchSubmodules = true;
1313 };
1414
15− patches = stdenv.lib.optionals stdenv.isDarwin [
15+ patches = lib.optionals stdenv.isDarwin [
1616 (fetchpatch {
1717 url = "https://github.com/zeux/qgrep/commit/21c4d1a5ab0f0bdaa0b5ca993c1315c041418cc6.patch";
1818 sha256 = "0wpxzrd9pmhgbgby17vb8279xwvkxfdd99gvv7r74indgdxqg7v8";
1919 })
2020 ];
2121
22− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ];
22+ buildInputs = lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ];
2323
24− postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
24+ postPatch = lib.optionalString stdenv.isAarch64 ''
2525 substituteInPlace Makefile \
2626 --replace "-msse2" "" --replace "-DUSE_SSE2" ""
2727 '';
2828
29− installPhase = ''
29+ installPhase = ''
3030 install -Dm755 qgrep $out/bin/qgrep
3131 '';
3232
pkgs/tools/text/qprint/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv }:
1+{ fetchurl, lib, stdenv }:
22
33stdenv.mkDerivation rec {
44 name = "qprint-1.1";
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
1919
2020 meta = {
2121 homepage = "http://www.fourmilab.ch/webtools/qprint/";
22− license = stdenv.lib.licenses.publicDomain;
22+ license = lib.licenses.publicDomain;
2323 description = "Encode and decode Quoted-Printable files";
24− maintainers = [ stdenv.lib.maintainers.tv ];
25− platforms = stdenv.lib.platforms.all;
24+ maintainers = [ lib.maintainers.tv ];
25+ platforms = lib.platforms.all;
2626 };
2727
2828}
pkgs/tools/text/qshowdiff/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, qt4, perl, pkgconfig }:
1+{lib, stdenv, fetchurl, qt4, perl, pkgconfig }:
22
33stdenv.mkDerivation rec {
44 pname = "qshowdiff";
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 homepage = "http://qshowdiff.danfis.cz/";
2222 description = "Colourful diff viewer";
23− license = stdenv.lib.licenses.gpl3Plus;
23+ license = lib.licenses.gpl3Plus;
2424 };
2525}
pkgs/tools/text/recode/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python3, perl, intltool, flex, texinfo, libiconv, libintl }:
1+{ lib, stdenv, fetchurl, python3, perl, intltool, flex, texinfo, libiconv, libintl }:
22
33stdenv.mkDerivation rec {
44 pname = "recode";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 homepage = "https://github.com/rrthomas/recode";
2020 description = "Converts files between various character sets and usages";
21− platforms = stdenv.lib.platforms.unix;
22− license = stdenv.lib.licenses.gpl2Plus;
23− maintainers = with stdenv.lib.maintainers; [ jcumming ];
21+ platforms = lib.platforms.unix;
22+ license = lib.licenses.gpl2Plus;
23+ maintainers = with lib.maintainers; [ jcumming ];
2424 };
2525}
pkgs/tools/text/replace/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 name = "replace-2.24";
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
2424 meta = {
2525 homepage = "https://replace.richardlloyd.org.uk/";
2626 description = "A tool to replace verbatim strings";
27− platforms = stdenv.lib.platforms.unix;
27+ platforms = lib.platforms.unix;
2828 };
2929}
pkgs/tools/text/ripgrep/default.nix+3−3
@@ -22,11 +22,11 @@ rustPlatform.buildRustPackage rec {
2222
2323 cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp";
2424
25− cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2";
25+ cargoBuildFlags = lib.optional withPCRE2 "--features pcre2";
2626
2727 nativeBuildInputs = [ asciidoctor installShellFiles ];
28− buildInputs = (stdenv.lib.optional withPCRE2 pcre2)
29− ++ (stdenv.lib.optional stdenv.isDarwin Security);
28+ buildInputs = (lib.optional withPCRE2 pcre2)
29+ ++ (lib.optional stdenv.isDarwin Security);
3030
3131 preFixup = ''
3232 installManPage $releaseDir/build/ripgrep-*/out/rg.1
pkgs/tools/text/ruplacer/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "0wrv4k63pc1v0apmxmmci9qaykcv9ig3nfxy6id5caqrckp73cr4";
1515
16− buildInputs = (stdenv.lib.optional stdenv.isDarwin Security);
16+ buildInputs = (lib.optional stdenv.isDarwin Security);
1717
1818 meta = with lib; {
1919 description = "Find and replace text in source files";
pkgs/tools/text/sd/default.nix+1−1
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
1414
1515 cargoSha256 = "1mksmdp1wnsjd8gw1g3l16a24fk05xa9mxygc0qklr41bqf8kw8b";
1616
17− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
17+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
1818
1919 meta = with lib; {
2020 description = "Intuitive find & replace CLI (sed alternative)";
pkgs/tools/text/sgml/jade/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gnum4 }:
1+{ lib, stdenv, fetchurl, gnum4 }:
22
33stdenv.mkDerivation rec {
44 name = "jade-${version}-${debpatch}";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 description = "James Clark's DSSSL Engine";
3434 license = "custom";
3535 homepage = "http://www.jclark.com/jade/";
36− platforms = with stdenv.lib.platforms; linux;
37− maintainers = with stdenv.lib.maintainers; [ e-user ];
36+ platforms = with lib.platforms; linux;
37+ maintainers = with lib.maintainers; [ e-user ];
3838 };
3939}
pkgs/tools/text/sgml/openjade/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, opensp, perl }:
1+{ lib, stdenv, fetchurl, opensp, perl }:
22
33stdenv.mkDerivation rec {
44 name = "openjade-1.3.2";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919
2020 meta = {
2121 description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents";
22− license = stdenv.lib.licenses.mit;
22+ license = lib.licenses.mit;
2323 homepage = "http://openjade.sourceforge.net/";
24− platforms = stdenv.lib.platforms.linux;
24+ platforms = lib.platforms.linux;
2525 };
2626}
pkgs/tools/text/sgml/opensp/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412
1+{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412
22, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}:
33
44stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020 sha256 = "04q14s8qsad0bkjmj067dn831i0r6v7742rafdlnbfm5y249m2q6";
2121 })
2222 ];
23−
23+
2424 setupHook = ./setup-hook.sh;
2525
2626 postFixup = ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
3232 preConfigure = if stdenv.isCygwin then "autoreconf -fi" else null;
3333
3434 # need autoconf, automake, gettext, and libtool for reconfigure
35− nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
35+ nativeBuildInputs = lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
3636
3737 buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl gettext libiconv ];
3838
@@ -40,8 +40,8 @@ stdenv.mkDerivation {
4040
4141 meta = {
4242 description = "A suite of SGML/XML processing tools";
43− license = stdenv.lib.licenses.mit;
43+ license = lib.licenses.mit;
4444 homepage = "http://openjade.sourceforge.net/";
45− platforms = stdenv.lib.platforms.unix;
45+ platforms = lib.platforms.unix;
4646 };
4747}
pkgs/tools/text/silver-searcher/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 patches = [ ./bash-completion.patch ];
1515
16− NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
16+ NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
1717
1818 nativeBuildInputs = [ autoreconfHook pkgconfig ];
1919 buildInputs = [ pcre zlib lzma ];
pkgs/tools/text/source-highlight/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, boost }:
1+{ lib, stdenv, fetchurl, boost }:
22
33let
44 name = "source-highlight";
@@ -21,8 +21,8 @@ stdenv.mkDerivation {
2121 meta = {
2222 description = "Source code renderer with syntax highlighting";
2323 homepage = "https://www.gnu.org/software/src-highlite/";
24− license = stdenv.lib.licenses.gpl3Plus;
25− platforms = with stdenv.lib.platforms; linux ++ darwin;
24+ license = lib.licenses.gpl3Plus;
25+ platforms = with lib.platforms; linux ++ darwin;
2626 longDescription =
2727 ''
2828 GNU Source-highlight, given a source file, produces a document
pkgs/tools/text/txt2tags/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python }:
1+{ lib, stdenv, fetchurl, python }:
22
33stdenv.mkDerivation rec {
44 version = "2.6";
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828 meta = {
2929 homepage = "https://txt2tags.org/";
3030 description = "A KISS markup language";
31− license = stdenv.lib.licenses.gpl2;
32− maintainers = with stdenv.lib.maintainers; [ kovirobi ];
33− platforms = with stdenv.lib.platforms; unix;
31+ license = lib.licenses.gpl2;
32+ maintainers = with lib.maintainers; [ kovirobi ];
33+ platforms = with lib.platforms; unix;
3434 };
3535}
pkgs/tools/text/uni2ascii/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 name = "uni2ascii-4.18";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
88 };
99
1010 meta = {
11− license = stdenv.lib.licenses.gpl3;
11+ license = lib.licenses.gpl3;
1212 homepage = "http://billposer.org/Software/uni2ascii.html";
1313 description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back";
1414
15− longDescription = ''
15+ longDescription = ''
1616 This package provides conversion in both directions between UTF-8
1717 Unicode and more than thirty 7-bit ASCII equivalents, including
1818 RFC 2396 URI format and RFC 2045 Quoted Printable format, the
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 It also provides ways of converting non-ASCII characters to
3434 similar ASCII characters, e.g. by stripping diacritics.
3535 '';
36− maintainers = with stdenv.lib.maintainers; [ goibhniu ];
37− platforms = stdenv.lib.platforms.linux;
36+ maintainers = with lib.maintainers; [ goibhniu ];
37+ platforms = lib.platforms.linux;
3838 };
3939}
pkgs/tools/text/wdiff/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, texinfo, which }:
1+{ lib, stdenv, fetchurl, texinfo, which }:
22
33stdenv.mkDerivation rec {
44 name = "wdiff-1.2.2";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
1515 meta = {
1616 homepage = "https://www.gnu.org/software/wdiff/";
1717 description = "Comparing files on a word by word basis";
18− license = stdenv.lib.licenses.gpl3Plus;
19− maintainers = [ stdenv.lib.maintainers.eelco ];
20− platforms = stdenv.lib.platforms.unix;
18+ license = lib.licenses.gpl3Plus;
19+ maintainers = [ lib.maintainers.eelco ];
20+ platforms = lib.platforms.unix;
2121 };
2222}
pkgs/tools/text/wgetpaste/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, wget, bash }:
1+{ lib, stdenv, fetchurl, wget, bash }:
22
33stdenv.mkDerivation rec {
44 version = "2.30";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
2323 meta = {
2424 description = "Command-line interface to various pastebins";
2525 homepage = "http://wgetpaste.zlin.dk/";
26− license = stdenv.lib.licenses.publicDomain;
27− maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ];
28− platforms = stdenv.lib.platforms.all;
26+ license = lib.licenses.publicDomain;
27+ maintainers = with lib.maintainers; [ qknight domenkozar ];
28+ platforms = lib.platforms.all;
2929 };
3030}
pkgs/tools/text/xml/rxp/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl} :
1+{lib, stdenv, fetchurl} :
22
33stdenv.mkDerivation rec {
44 pname = "rxp";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 meta = {
13− license = stdenv.lib.licenses.gpl2Plus;
13+ license = lib.licenses.gpl2Plus;
1414 description = "A validating XML parser written in C";
1515 homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html";
16− platforms = stdenv.lib.platforms.unix;
16+ platforms = lib.platforms.unix;
1717 };
1818}
pkgs/tools/text/xml/xmlformat/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl }:
1+{ lib, stdenv, fetchurl, perl }:
22stdenv.mkDerivation rec {
33 pname = "xmlformat";
44 version = "1.04";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 meta = {
2323 description = "a configurable formatter (or 'pretty-printer') for XML documents";
2424 homepage = "http://www.kitebird.com/software/xmlformat/";
25− license = stdenv.lib.licenses.bsd3;
26− platforms = stdenv.lib.platforms.all;
25+ license = lib.licenses.bsd3;
26+ platforms = lib.platforms.all;
2727 };
2828}
pkgs/tools/text/xml/xmlstarlet/default.nix+4−4
@@ -1,8 +1,8 @@
1−{ stdenv, fetchurl, pkgconfig, libxml2, libxslt }:
1+{ lib, stdenv, fetchurl, pkgconfig, libxml2, libxslt }:
22
33stdenv.mkDerivation rec {
44 name = "xmlstarlet-1.6.1";
5−
5+
66 src = fetchurl {
77 url = "mirror://sourceforge/xmlstar/${name}.tar.gz";
88 sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 meta = {
2828 description = "A command line tool for manipulating and querying XML data";
2929 homepage = "http://xmlstar.sourceforge.net/";
30− license = stdenv.lib.licenses.mit;
31− platforms = stdenv.lib.platforms.unix;
30+ license = lib.licenses.mit;
31+ platforms = lib.platforms.unix;
3232 };
3333}
pkgs/tools/text/xml/xpf/default.nix+4−4
@@ -1,20 +1,20 @@
1−{stdenv, fetchurl, python2, libxml2}:
1+{lib, stdenv, fetchurl, python2, libxml2}:
22
33assert libxml2.pythonSupport == true;
44
55stdenv.mkDerivation {
66 name = "xpf-0.2";
7−
7+
88 src = fetchurl {
99 url = "http://tarballs.nixos.org/xpf-0.2.tar.gz";
1010 sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz";
1111 };
12−
12+
1313 buildInputs = [ python2 libxml2 ];
1414
1515 meta = {
1616 description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";
1717 homepage = "http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters";
18− platforms = stdenv.lib.platforms.unix;
18+ platforms = lib.platforms.unix;
1919 };
2020}
pkgs/tools/text/xsv/default.nix+1−1
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "1q59nvklh5r2mrsz656z6js3j2l6rqyhfz6l0yq28df5kyahk91b";
1515
16− buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
16+ buildInputs = lib.optional stdenv.isDarwin Security;
1717
1818 meta = with lib; {
1919 description = "A fast CSV toolkit written in Rust";
pkgs/tools/text/zimreader/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool
22, zimlib, cxxtools, tntnet
33}:
44
@@ -31,8 +31,8 @@ stdenv.mkDerivation {
3131 meta = {
3232 description = "A tool to serve ZIM files using HTTP";
3333 homepage = "http://git.wikimedia.org/log/openzim";
34− license = stdenv.lib.licenses.gpl2;
35− maintainers = with stdenv.lib.maintainers; [ robbinch juliendehos ];
34+ license = lib.licenses.gpl2;
35+ maintainers = with lib.maintainers; [ robbinch juliendehos ];
3636 platforms = [ "x86_64-linux" ];
3737 };
3838}
pkgs/tools/text/zimwriterfs/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchFromGitHub
33
44, autoconf
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
3636 meta = {
3737 description = "A console tool to create ZIM files";
3838 homepage = "http://git.wikimedia.org/log/openzim";
39− maintainers = with stdenv.lib.maintainers; [ robbinch ];
40− license = stdenv.lib.licenses.gpl3;
41− platforms = with stdenv.lib.platforms; [ linux ];
39+ maintainers = with lib.maintainers; [ robbinch ];
40+ license = lib.licenses.gpl3;
41+ platforms = with lib.platforms; [ linux ];
4242 };
4343}
pkgs/tools/typesetting/asciidoc/default.nix+3−3
@@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
154154 buildInputs = [ python2 unzip ];
155155
156156 # install filters early, so their shebangs are patched too
157− patchPhase = with stdenv.lib; ''
157+ patchPhase = with lib; ''
158158 mkdir -p "$out/etc/asciidoc/filters"
159159 mkdir -p "$out/etc/asciidoc/backends"
160160 '' + optionalString _enableDitaaFilter ''
@@ -239,7 +239,7 @@ stdenv.mkDerivation rec {
239239 # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm).
240240 # We can remove PATH= when those impurities are fixed.
241241 # TODO: Is this still necessary when using texlive?
242− sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ texlive coreutils gnused ]}')|" \
242+ sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${lib.makeBinPath [ texlive coreutils gnused ]}')|" \
243243 -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
244244 -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
245245 -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
@@ -259,7 +259,7 @@ stdenv.mkDerivation rec {
259259 '';
260260
261261 preInstall = "mkdir -p $out/etc/vim";
262− makeFlags = stdenv.lib.optional stdenv.isCygwin "DESTDIR=/.";
262+ makeFlags = lib.optional stdenv.isCygwin "DESTDIR=/.";
263263
264264 meta = with lib; {
265265 description = "Text-based document generation system";
pkgs/tools/typesetting/biber/default.nix+3−3
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, fetchpatch, perlPackages, shortenPerlShebang, texlive }:
22
33let
4− biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs);
4+ biberSource = lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs);
55
66 # perl 5.32.0 ships with U:C 1.27
77 UnicodeCollate_1_29 = perlPackages.buildPerlPackage rec {
@@ -35,9 +35,9 @@ perlPackages.buildPerlModule {
3535 TestDifferences
3636 PerlIOutf8_strict
3737 ];
38− nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
38+ nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
3939
40− postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
40+ postInstall = lib.optionalString stdenv.isDarwin ''
4141 shortenPerlShebang $out/bin/biber
4242 '';
4343
pkgs/tools/typesetting/djvu2pdf/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, makeWrapper, fetchurl, djvulibre, ghostscript, which }:
1+{ lib, stdenv, makeWrapper, fetchurl, djvulibre, ghostscript, which }:
22
33stdenv.mkDerivation rec {
44 version = "0.9.2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 installPhase = ''
1515 mkdir -p $out/bin
1616 cp -p djvu2pdf $out/bin
17− wrapProgram $out/bin/djvu2pdf --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript djvulibre which ]}
17+ wrapProgram $out/bin/djvu2pdf --prefix PATH : ${lib.makeBinPath [ ghostscript djvulibre which ]}
1818
1919 mkdir -p $out/man/man1
2020 cp -p djvu2pdf.1.gz $out/man/man1
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
2323 meta = {
2424 description = "Convert DjVu files to PDF files";
2525 homepage = "https://0x2a.at/s/projects/djvu2pdf";
26− license = stdenv.lib.licenses.gpl2;
27− platforms = stdenv.lib.platforms.all;
26+ license = lib.licenses.gpl2;
27+ platforms = lib.platforms.all;
2828 inherit version;
2929 };
3030}
pkgs/tools/typesetting/docbook2odf/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf"
2727
2828 wrapProgram "$out/bin/docbook2odf" \
29− --prefix PATH : "${stdenv.lib.makeBinPath [ zip libxslt ]}" \
29+ --prefix PATH : "${lib.makeBinPath [ zip libxslt ]}" \
3030 --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.PerlMagick ]}"
3131 '';
3232
pkgs/tools/typesetting/kindlegen/default.nix+1−1
@@ -33,7 +33,7 @@ in stdenv.mkDerivation {
3333
3434 sourceRoot = ".";
3535
36− nativeBuildInputs = stdenv.lib.optional (stdenv.lib.hasSuffix ".zip" url) unzip;
36+ nativeBuildInputs = lib.optional (stdenv.lib.hasSuffix ".zip" url) unzip;
3737
3838 installPhase = ''
3939 mkdir -p $out/bin $out/share/kindlegen/doc
pkgs/tools/typesetting/lout/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, ghostscript}:
1+{lib, stdenv, fetchurl, ghostscript}:
22
33stdenv.mkDerivation rec {
44 name = "lout-3.40";
@@ -44,9 +44,9 @@ stdenv.mkDerivation rec {
4444 # Wiki: https://sourceforge.net/p/lout/wiki/
4545 homepage = "https://savannah.nongnu.org/projects/lout/";
4646
47− license = stdenv.lib.licenses.gpl3Plus;
47+ license = lib.licenses.gpl3Plus;
4848
49− platforms = stdenv.lib.platforms.all;
49+ platforms = lib.platforms.all;
5050 maintainers = [ ];
5151 };
5252}
pkgs/tools/typesetting/mmark/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub }:
1+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
22
33buildGoPackage rec {
44 pname = "mmark";
@@ -19,8 +19,8 @@ buildGoPackage rec {
1919 meta = {
2020 description = "A powerful markdown processor in Go geared towards the IETF";
2121 homepage = "https://github.com/miekg/mmark";
22− license = with stdenv.lib.licenses; bsd2;
23− maintainers = with stdenv.lib.maintainers; [ yrashk ];
24− platforms = stdenv.lib.platforms.unix;
22+ license = with lib.licenses; bsd2;
23+ maintainers = with lib.maintainers; [ yrashk ];
24+ platforms = lib.platforms.unix;
2525 };
2626}
pkgs/tools/typesetting/multimarkdown/default.nix+2−2
@@ -45,8 +45,8 @@ stdenv.mkDerivation {
4545 homepage = "https://fletcherpenney.net/multimarkdown/";
4646 # licensed under GPLv2+ or MIT:
4747 # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE
48− license = with stdenv.lib.licenses; [ gpl2Plus mit ];
48+ license = with lib.licenses; [ gpl2Plus mit ];
4949 platforms = platforms.all;
50− maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ];
50+ maintainers = with lib.maintainers; [ lowfatcomputing ];
5151 };
5252}
pkgs/tools/typesetting/pdfgrep/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }:
1+{ lib, stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }:
22
33stdenv.mkDerivation rec {
44 pname = "pdfgrep";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121 meta = {
2222 description = "Commandline utility to search text in PDF files";
2323 homepage = "https://pdfgrep.org/";
24− license = stdenv.lib.licenses.gpl2Plus;
25− maintainers = with stdenv.lib.maintainers; [ qknight fpletz ];
26− platforms = with stdenv.lib.platforms; unix;
24+ license = lib.licenses.gpl2Plus;
25+ maintainers = with lib.maintainers; [ qknight fpletz ];
26+ platforms = with lib.platforms; unix;
2727 };
2828}
pkgs/tools/typesetting/pdfsandwich/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 installPhase = ''
1515 mkdir -p $out/bin
1616 cp -p pdfsandwich $out/bin
17− wrapProgram $out/bin/pdfsandwich --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick ghostscript poppler_utils unpaper tesseract ]}
17+ wrapProgram $out/bin/pdfsandwich --prefix PATH : ${lib.makeBinPath [ imagemagick ghostscript poppler_utils unpaper tesseract ]}
1818
1919 mkdir -p $out/man/man1
2020 cp -p pdfsandwich.1.gz $out/man/man1
pkgs/tools/typesetting/pdftk/legacy.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, gcj, unzip }:
1+{ fetchurl, lib, stdenv, gcj, unzip }:
22
33stdenv.mkDerivation {
44 name = "pdftk-2.02";
@@ -35,9 +35,9 @@ stdenv.mkDerivation {
3535 meta = {
3636 description = "Simple tool for doing everyday things with PDF documents";
3737 homepage = "https://www.pdflabs.com/tools/pdftk-server/";
38− license = stdenv.lib.licenses.gpl2;
39− maintainers = with stdenv.lib.maintainers; [raskin];
40− platforms = with stdenv.lib.platforms; linux;
38+ license = lib.licenses.gpl2;
39+ maintainers = with lib.maintainers; [raskin];
40+ platforms = with lib.platforms; linux;
4141 broken = true; # Broken on Hydra since 2020-08-24
4242 };
4343}
pkgs/tools/typesetting/sile/default.nix+4−4
@@ -63,17 +63,17 @@ stdenv.mkDerivation rec {
6363 libiconv
6464 luaEnv
6565 ]
66− ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
66+ ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
6767 ;
6868 checkInputs = [
6969 poppler_utils
7070 ];
7171
72− preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
72+ preConfigure = lib.optionalString stdenv.isDarwin ''
7373 sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m
7474 '';
7575
76− NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework AppKit";
76+ NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit";
7777
7878 FONTCONFIG_FILE = makeFontsConf {
7979 fontDirectories = [
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
8585
8686 enableParallelBuilding = true;
8787
88− preBuild = stdenv.lib.optionalString stdenv.cc.isClang ''
88+ preBuild = lib.optionalString stdenv.cc.isClang ''
8989 substituteInPlace libtexpdf/dpxutil.c \
9090 --replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);"
9191 '';
pkgs/tools/typesetting/skribilo/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, pkgconfig
44, gettext
@@ -18,7 +18,7 @@
1818let
1919 pname = "skribilo";
2020 version = "0.9.5";
21− inherit (stdenv.lib) optional;
21+ inherit (lib) optional;
2222in stdenv.mkDerivation {
2323 inherit pname version;
2424
@@ -42,7 +42,7 @@ in stdenv.mkDerivation {
4242 --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site"
4343 '';
4444
45− meta = with stdenv.lib;{
45+ meta = with lib;{
4646 description = "The Ultimate Document Programming Framework";
4747 longDescription = ''
4848 Skribilo is a free document production tool that takes a
pkgs/tools/typesetting/sshlatex/default.nix+3−3
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 buildInputs = [ makeWrapper ];
1515
1616 installPhase = let
17− binPath = stdenv.lib.makeBinPath [ openssh perl gnutar bash inotify-tools ];
17+ binPath = lib.makeBinPath [ openssh perl gnutar bash inotify-tools ];
1818 in ''
1919 mkdir -p $out/bin
2020 cp sshlatex $out/bin
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
3131 purely local setting.
3232 '';
3333 homepage = "https://github.com/iblech/sshlatex";
34− license = stdenv.lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus
35− platforms = stdenv.lib.platforms.all;
34+ license = lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus
35+ platforms = lib.platforms.all;
3636 maintainers = [ maintainers.iblech ];
3737 };
3838}
pkgs/tools/typesetting/tectonic/default.nix+2−2
@@ -17,9 +17,9 @@ rustPlatform.buildRustPackage rec {
1717 nativeBuildInputs = [ pkgconfig ];
1818
1919 buildInputs = [ fontconfig harfbuzz openssl ]
20− ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);
20+ ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);
2121
22− postInstall = stdenv.lib.optionalString stdenv.isLinux ''
22+ postInstall = lib.optionalString stdenv.isLinux ''
2323 install -D dist/appimage/tectonic.desktop -t $out/share/applications/
2424 install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/
2525 '';
pkgs/tools/typesetting/ted/default.nix+1−1
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949 pushd $out/share/Ted/examples
5050 for f in rtf2*.sh
5151 do
52− makeWrapper "$PWD/$f" "$out/bin/$f" --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ ghostscript ]}
52+ makeWrapper "$PWD/$f" "$out/bin/$f" --prefix PATH : $out/bin:${lib.makeBinPath [ ghostscript ]}
5353 done
5454 popd
5555
pkgs/tools/typesetting/tex/auctex/default.nix+4−4
@@ -1,5 +1,5 @@
1−{ stdenv, fetchurl, emacs, texlive, ghostscript }:
2−
1+{ lib, stdenv, fetchurl, emacs, texlive, ghostscript }:
2+
33let auctex = stdenv.mkDerivation ( rec {
44 version = "12.3";
55
@@ -30,8 +30,8 @@ let auctex = stdenv.mkDerivation ( rec {
3030 meta = {
3131 description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
3232 homepage = "https://www.gnu.org/software/auctex";
33− platforms = stdenv.lib.platforms.unix;
34− license = stdenv.lib.licenses.gpl3;
33+ platforms = lib.platforms.unix;
34+ license = lib.licenses.gpl3;
3535 };
3636});
3737
pkgs/tools/typesetting/tex/dblatex/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python2, libxslt, texlive
1+{ lib, stdenv, fetchurl, python2, libxslt, texlive
22, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null
33
44, tex ? texlive.combine { # satisfy all packages that ./configure mentions
@@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
2929 };
3030
3131 buildInputs = [ python2 libxslt tex ]
32− ++ stdenv.lib.optionals enableAllFeatures [ imagemagick transfig ];
32+ ++ lib.optionals enableAllFeatures [ imagemagick transfig ];
3333
3434 # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have
3535 # that yet. In Ubuntu, texindy is a part of the xindy package.
3636 preConfigure = ''
3737 sed -i 's|self.install_layout == "deb"|False|' setup.py
38− '' + stdenv.lib.optionalString enableAllFeatures ''
38+ '' + lib.optionalString enableAllFeatures ''
3939 for file in $(find -name "*.py"); do
4040 sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt.bin}/bin/xsltproc|g' \
4141 -e 's|Popen(\["xsltproc|Popen(\["${libxslt.bin}/bin/xsltproc|g' \
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
6666 meta = {
6767 description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt";
6868 homepage = "http://dblatex.sourceforge.net/";
69− license = stdenv.lib.licenses.gpl2Plus;
70− platforms = stdenv.lib.platforms.unix;
69+ license = lib.licenses.gpl2Plus;
70+ platforms = lib.platforms.unix;
7171 };
7272}
pkgs/tools/typesetting/tex/tetex/default.nix+2−2
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 hardeningDisable = [ "format" ];
1919
2020 # fixes "error: conflicting types for 'calloc'", etc.
21− preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
21+ preBuild = lib.optionalString stdenv.isDarwin ''
2222 sed -i 57d texk/kpathsea/c-std.h
2323 '';
2424
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
3535 "--without-oxdvik" "--without-texinfo" "--without-texi2html"
3636 "--with-system-zlib" "--with-system-pnglib" "--with-system-ncurses" ]
3737 # couldn't get gsftopk working on darwin
38− ++ stdenv.lib.optional stdenv.isDarwin "--without-gsftopk";
38+ ++ lib.optional stdenv.isDarwin "--without-gsftopk";
3939
4040 postUnpack = ''
4141 mkdir -p $out/share/texmf
pkgs/tools/typesetting/tex/texlive/bin.nix+10−10
@@ -145,7 +145,7 @@ core = stdenv.mkDerivation rec {
145145 meta = with lib; {
146146 description = "Basic binaries for TeX Live";
147147 homepage = "http://www.tug.org/texlive";
148− license = stdenv.lib.licenses.gpl2;
148+ license = lib.licenses.gpl2;
149149 maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ];
150150 platforms = platforms.all;
151151 };
@@ -169,13 +169,13 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
169169 ++ map (prog: "--disable-${prog}") # don't build things we already have
170170 ([ "tex" "ptex" "eptex" "uptex" "euptex" "aleph" "pdftex"
171171 "web-progs" "synctex"
172− ] ++ stdenv.lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ]);
172+ ] ++ lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ]);
173173
174174 configureScript = ":";
175175
176176 # we use static libtexlua, because it's only used by a single binary
177177 postConfigure = let
178− luajit = stdenv.lib.optionalString withLuaJIT ",luajit";
178+ luajit = lib.optionalString withLuaJIT ",luajit";
179179 in ''
180180 mkdir ./WorkDir && cd ./WorkDir
181181 for path in libs/{teckit,lua53${luajit}} texk/web2c; do
@@ -220,7 +220,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
220220 mv "$out/bin"/{luatex,texlua,texluac} "$luatex/bin/"
221221 mv "$out/bin"/luahbtex "$luahbtex/bin/"
222222 mv "$out/bin"/xetex "$xetex/bin/"
223− '' + stdenv.lib.optionalString withLuaJIT ''
223+ '' + lib.optionalString withLuaJIT ''
224224 mv "$out/bin"/mfluajit{,-nowin} "$mflua/bin/"
225225 mv "$out/bin"/{luajittex,luajithbtex,texluajit,texluajitc} "$luajittex/bin/"
226226 '' ;
@@ -294,11 +294,11 @@ latexindent = perlPackages.buildPerlPackage rec {
294294 pname = "latexindent";
295295 inherit (src) version;
296296
297− src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs);
297+ src = lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs);
298298
299299 outputs = [ "out" ];
300300
301− nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
301+ nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
302302 propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ];
303303
304304 postPatch = ''
@@ -315,7 +315,7 @@ latexindent = perlPackages.buildPerlPackage rec {
315315 install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent
316316 mkdir -p "$out"/${perl.libPrefix}
317317 cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/
318− '' + stdenv.lib.optionalString stdenv.isDarwin ''
318+ '' + lib.optionalString stdenv.isDarwin ''
319319 shortenPerlShebang "$out"/bin/latexindent
320320 '';
321321};
@@ -325,7 +325,7 @@ pygmentex = python2Packages.buildPythonApplication rec {
325325 pname = "pygmentex";
326326 inherit (src) version;
327327
328− src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs);
328+ src = lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs);
329329
330330 propagatedBuildInputs = with python2Packages; [ pygments chardet ];
331331
@@ -361,7 +361,7 @@ pygmentex = python2Packages.buildPythonApplication rec {
361361texlinks = stdenv.mkDerivation rec {
362362 name = "texlinks.sh";
363363
364− src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs);
364+ src = lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs);
365365
366366 dontBuild = true;
367367 doCheck = false;
@@ -425,7 +425,7 @@ xdvi = stdenv.mkDerivation {
425425
426426} # un-indented
427427
428−// stdenv.lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062)
428+// lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062)
429429{
430430
431431xindy = stdenv.mkDerivation {
pkgs/tools/typesetting/xmlto/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, libxml2, libxslt
1+{ fetchurl, lib, stdenv, libxml2, libxslt
22, docbook_xml_dtd_45, docbook_xsl, w3m
33, bash, getopt, makeWrapper }:
44
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
2929 postInstall = ''
3030 wrapProgram "$out/bin/xmlto" \
31− --prefix PATH : "${stdenv.lib.makeBinPath [ libxslt libxml2 getopt ]}"
31+ --prefix PATH : "${lib.makeBinPath [ libxslt libxml2 getopt ]}"
3232
3333 # `w3m' is needed for HTML to text conversions.
3434 substituteInPlace "$out/share/xmlto/format/docbook/txt" \
@@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
4545 necessary post-processing.
4646 '';
4747
48− license = stdenv.lib.licenses.gpl2Plus;
48+ license = lib.licenses.gpl2Plus;
4949 homepage = "https://fedorahosted.org/xmlto/";
50− platforms = stdenv.lib.platforms.unix;
50+ platforms = lib.platforms.unix;
5151 };
5252}
pkgs/tools/video/atomicparsley/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ cmake ];
1515
1616 buildInputs = [ zlib ]
17− ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
17+ ++ lib.optionals stdenv.isDarwin [ Cocoa ];
1818
1919 installPhase = ''
2020 runHook preInstall
pkgs/tools/video/gopro/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 install -Dm755 gopro -t $out/bin
2525 wrapProgram $out/bin/gopro \
26− --prefix PATH ":" "${stdenv.lib.makeBinPath [ ffmpeg_3 imagemagick mplayer ]}"
26+ --prefix PATH ":" "${lib.makeBinPath [ ffmpeg_3 imagemagick mplayer ]}"
2727
2828 runHook postInstall
2929 '';
pkgs/tools/video/rtmpdump/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, fetchpatch, zlib
1+{ lib, stdenv, fetchgit, fetchpatch, zlib
22, gnutlsSupport ? false, gnutls ? null, nettle ? null
33, opensslSupport ? true, openssl ? null
44}:
@@ -8,7 +8,7 @@ assert (gnutlsSupport || opensslSupport);
88assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSupport;
99assert opensslSupport -> openssl != null && !gnutlsSupport;
1010
11−with stdenv.lib;
11+with lib;
1212stdenv.mkDerivation {
1313 pname = "rtmpdump";
1414 version = "2019-03-30";
pkgs/tools/video/swfmill/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl
1+{ lib, stdenv, fetchurl
22, pkgconfig, libxslt, freetype, libpng, libxml2
33}:
44
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 meta = {
2020 description = "An xml2swf and swf2xml processor with import functionalities";
2121 homepage = "http://swfmill.org";
22− license = stdenv.lib.licenses.gpl2;
23− platforms = stdenv.lib.platforms.linux;
22+ license = lib.licenses.gpl2;
23+ platforms = lib.platforms.linux;
2424 };
2525}
pkgs/tools/video/swftools/default.nix+3−3
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl, freetype, libjpeg, libungif, zlib }:
1+{ lib, stdenv, fetchurl, freetype, libjpeg, libungif, zlib }:
22
3−with stdenv.lib;
3+with lib;
44stdenv.mkDerivation rec {
55 pname = "swftools";
66 version = "0.9.2";
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
1919 homepage = "http://www.swftools.org/about.html";
2020 license = licenses.gpl2;
2121 maintainers = [ maintainers.koral ];
22− platforms = stdenv.lib.platforms.unix;
22+ platforms = lib.platforms.unix;
2323 };
2424}
pkgs/tools/video/vnc2flv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pythonPackages }:
1+{ lib, stdenv, fetchurl, pythonPackages }:
22
33pythonPackages.buildPythonApplication rec {
44 pname = "vnc2flv";
@@ -15,6 +15,6 @@ pythonPackages.buildPythonApplication rec {
1515 meta = {
1616 description = "Tool to record VNC sessions to Flash Video";
1717 homepage = "http://www.unixuser.org/~euske/python/vnc2flv/";
18− license = stdenv.lib.licenses.mit;
18+ license = lib.licenses.mit;
1919 };
2020}
pkgs/tools/video/vncrec/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libX11, xorgproto, imake, gccmakedep, libXt, libXmu
1+{ lib, stdenv, fetchurl, libX11, xorgproto, imake, gccmakedep, libXt, libXmu
22, libXaw, libXext, libSM, libICE, libXpm, libXp
33}:
44
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
2727 meta = {
2828 description = "VNC recorder";
2929 homepage = "http://ronja.twibright.com/utils/vncrec/";
30− platforms = stdenv.lib.platforms.linux;
31− license = stdenv.lib.licenses.gpl2;
30+ platforms = lib.platforms.linux;
31+ license = lib.licenses.gpl2;
3232 };
3333}
pkgs/tools/virtualization/aws/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl, curl }:
1+{ lib, stdenv, fetchurl, perl, curl }:
22
33stdenv.mkDerivation {
44 name = "aws-1.75";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
2222 meta = {
2323 homepage = "https://www.timkay.com/aws/";
2424 description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB";
25− license = stdenv.lib.licenses.gpl3Plus;
26− platforms = stdenv.lib.platforms.unix;
25+ license = lib.licenses.gpl3Plus;
26+ platforms = lib.platforms.unix;
2727 };
2828}
pkgs/tools/virtualization/distrobuilder/default.nix+1−1
@@ -2,7 +2,7 @@
22, makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap
33}:
44
5−let binPath = stdenv.lib.makeBinPath [
5+let binPath = lib.makeBinPath [
66 coreutils gnupg gnutar squashfsTools debootstrap
77];
88in
pkgs/tools/virtualization/ec2-ami-tools/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
1+{ lib, stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 pname = "ec2-ami-tools";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 for i in $out/bin/*; do
3030 wrapProgram $i \
3131 --set EC2_HOME $out \
32− --prefix PATH : ${stdenv.lib.makeBinPath [ ruby openssl ]}
32+ --prefix PATH : ${lib.makeBinPath [ ruby openssl ]}
3333 done
3434
3535 sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 meta = {
3939 homepage = "https://aws.amazon.com/developertools/Amazon-EC2/368";
4040 description = "Command-line tools to create and manage Amazon EC2 virtual machine images";
41− license = stdenv.lib.licenses.amazonsl;
41+ license = lib.licenses.amazonsl;
4242 };
4343
4444}
pkgs/tools/virtualization/ec2-api-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip, makeWrapper, jre }:
1+{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }:
22
33stdenv.mkDerivation rec {
44 name = "ec2-api-tools-1.7.5.1";
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
2929 meta = {
3030 homepage = "http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351";
3131 description = "Command-line tools to create and manage Amazon EC2 virtual machines";
32− license = stdenv.lib.licenses.amazonsl;
32+ license = lib.licenses.amazonsl;
3333 };
3434}
pkgs/tools/virtualization/euca2ools/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, python2Packages }:
1+{ lib, stdenv, fetchgit, python2Packages }:
22
33let
44 inherit (python2Packages) buildPythonApplication boto m2crypto;
@@ -17,7 +17,7 @@ in buildPythonApplication {
1717 meta = {
1818 homepage = "https://github.com/eucalyptus/euca2ools";
1919 description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services";
20− maintainers = [ stdenv.lib.maintainers.eelco ];
21− platforms = stdenv.lib.platforms.linux;
20+ maintainers = [ lib.maintainers.eelco ];
21+ platforms = lib.platforms.linux;
2222 };
2323}
pkgs/tools/virtualization/nixos-shell/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 postInstall = ''
1717 wrapProgram $out/bin/nixos-shell \
18− --prefix PATH : ${stdenv.lib.makeBinPath [ nix ]}
18+ --prefix PATH : ${lib.makeBinPath [ nix ]}
1919 '';
2020
2121 installFlags = [ "PREFIX=${placeholder "out"}" ];
pkgs/tools/virtualization/xe-guest-utilities/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }:
1+{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }:
22
33stdenv.mkDerivation (rec {
44 pname = "xe-guest-utilities";
@@ -6,9 +6,9 @@ stdenv.mkDerivation (rec {
66 meta = {
77 description = "Citrix XenServer Tools";
88 homepage = "http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US";
9− maintainers = with stdenv.lib.maintainers; [ benwbooth ];
10− platforms = stdenv.lib.platforms.linux;
11− license = [ stdenv.lib.licenses.gpl2 stdenv.lib.licenses.lgpl21 ];
9+ maintainers = with lib.maintainers; [ benwbooth ];
10+ platforms = lib.platforms.linux;
11+ license = [ lib.licenses.gpl2 stdenv.lib.licenses.lgpl21 ];
1212 };
1313 src = fetchurl {
1414 url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz";