Merge branch 'master' into staging-next

2021-01-24 00:09:45 +01:00
parent 58752914f4 f1778cd90e
commit 01ee4ea574
871 changed files with 3294 additions and 3821 deletions
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, coreutils, makeWrapper }:
+{ fetchurl, lib, stdenv, coreutils, makeWrapper }:

 let version = "1.9.15"; in

@@ -105,8 +105,8 @@ stdenv.mkDerivation {
      by an object that implements a particular Task interface.
    '';

-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.all;
  };
 }
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, coreutils, makeWrapper }:
+{ fetchurl, lib, stdenv, coreutils, makeWrapper }:

 let version = "1.10.9"; in

@@ -105,8 +105,8 @@ stdenv.mkDerivation {
      by an object that implements a particular Task interface.
    '';

-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.all;
  };
 }
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk, makeWrapper }:
+{ lib, stdenv, fetchurl, jdk, makeWrapper }:

 assert jdk != null;

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

  inherit jdk;

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Build automation tool (used primarily for Java projects)";
    homepage = "http://maven.apache.org/";
    license = licenses.asl20;
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:

 stdenv.mkDerivation rec {
  pname = "arpa2cm";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "CMake Module library for the ARPA2 project";
    license = licenses.bsd2;
    maintainers = with maintainers; [ leenaars ];
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lua5_3, python }:
+{ lib, stdenv, fetchFromGitHub, lua5_3, python }:

 stdenv.mkDerivation rec {
  pname = "bam";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
    cp bam "$out/bin"
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Yet another build manager";
    maintainers = with maintainers;
    [
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , git
 , go
-, stdenv
+, lib, stdenv
 }:

 buildBazelPackage rec {
@@ -80,7 +80,7 @@ buildBazelPackage rec {
    '';
  };

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = "https://github.com/buchgr/bazel-remote";
    description = "A remote HTTP/1.1 cache for Bazel";
    license = licenses.asl20;
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  pname = "bazel-buildtools";
@@ -19,7 +19,7 @@ buildGoPackage rec {

  buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps";
    homepage = "https://github.com/bazelbuild/buildtools";
    license = licenses.asl20;
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
    ./no-double-relative.patch
  ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Tool that generates a compilation database for clang tooling";
    longDescription = ''
      Note: the bear command is very useful to generate compilation commands
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
    installShellCompletion --name bloop.fish --fish ${bloop-fish}
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = "https://scalacenter.github.io/bloop/";
    license = licenses.asl20;
    description = "A Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way";
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , getopt
 }:

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    ./fix-unexport-env-test.patch
  ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Portable version of NetBSD 'make'";
    homepage    = "http://www.crufty.net/help/sjg/bmake.html";
    license     = licenses.bsd3;
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk }:
+{ lib, stdenv, fetchurl, jdk }:

 stdenv.mkDerivation rec {
  version = "2.7.2";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

  propagatedBuildInputs = [ jdk ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Build tooling for Clojure";
    homepage = "https://boot-clj.com/";
    license = licenses.epl10;
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }:

 stdenv.mkDerivation rec {
  pname = "buck";
@@ -30,10 +30,10 @@ stdenv.mkDerivation rec {
    install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck
    wrapProgram $out/bin/buck \
      --prefix PYTHONPATH : $PYTHONPATH \
-      --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}"
+      --prefix PATH : "${lib.makeBinPath [jdk watchman]}"
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = "https://buck.build/";
    description = "A high-performance build tool";
    maintainers = [ maintainers.jgertm maintainers.marsam ];
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2
+{ lib, stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2
 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps
 }:

-with stdenv.lib;
+with lib;

 assert stdenv ? cc;
 assert stdenv.cc ? libc;

 let
-  os = stdenv.lib.optionalString;
+  os = lib.optionalString;
  majorVersion = "2.8";
  minorVersion = "12.2";
  version = "${majorVersion}.${minorVersion}";
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
    "--mandir=/share/man"
    "--system-libs"
    "--no-system-libarchive"
-   ] ++ stdenv.lib.optional useQt4 "--qt-gui";
+   ] ++ lib.optional useQt4 "--qt-gui";

  setupHook = ./setup-hook.sh;

@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "https://cmake.org";
    description = "Cross-Platform Makefile Generator";
-    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ xfix ];
-    license = stdenv.lib.licenses.bsd3;
+    platforms = if useQt4 then qt4.meta.platforms else lib.platforms.unix;
+    maintainers = with lib.maintainers; [ xfix ];
+    license = lib.licenses.bsd3;
  };
 }
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ lib, stdenv, fetchFromGitHub, perl }:

 stdenv.mkDerivation {
  pname = "colormake";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
    cp -fa colormake.pl colormake colormake-short clmake clmake-short $out/bin
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Simple wrapper around make to colorize the output";
    homepage = "https://bre.klaki.net/programs/colormake/";
    license = licenses.gpl2;
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3Packages }:
+{ lib, stdenv, fetchurl, python3Packages }:

 let

@@ -16,15 +16,15 @@ in python3Packages.buildPythonApplication {
  buildInputs = with python3Packages; [ mock pytest ];

  propagatedBuildInputs = with python3Packages; [ cloudpickle ]
-    ++ stdenv.lib.optional stdenv.isLinux pyinotify
-    ++ stdenv.lib.optional stdenv.isDarwin macfsevents;
+    ++ lib.optional stdenv.isLinux pyinotify
+    ++ lib.optional stdenv.isDarwin macfsevents;

  # Tests fail due to mysterious gdbm.open() resource temporarily
  # unavailable errors.
  doCheck = false;
  checkPhase = "py.test";

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = "https://pydoit.org/";
    description = "A task management & automation tool";
    license = licenses.mit;
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
+{ lib, stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:

 stdenv.mkDerivation rec {
  pname = "dub";
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
    cp bin/dub $out/bin
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Package and build manager for D applications and libraries";
    homepage = "https://code.dlang.org/";
    license = licenses.mit;
@@ -1,4 +1,4 @@
-{ stdenv, git, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, git, fetchFromGitHub, rustPlatform }:

 rustPlatform.buildRustPackage rec {
  pname = "fac-build";
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
        'std::process::Command::new("${git}/bin/git")'
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = ''
      A build system that uses ptrace to handle dependencies automatically
    '';
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
+{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:

 assert guileSupport -> ( pkg-config != null && guile != null );

@@ -25,10 +25,10 @@ stdenv.mkDerivation {
    ./glibc-2.27-glob.patch
  ];

-  nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ];
-  buildInputs = stdenv.lib.optionals guileSupport [ guile ];
+  nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];
+  buildInputs = lib.optionals guileSupport [ guile ];

-  configureFlags = stdenv.lib.optional guileSupport "--with-guile"
+  configureFlags = lib.optional guileSupport "--with-guile"

    # Make uses this test to decide whether it should keep track of
    # subseconds. Apple made this possible with APFS and macOS 10.13.
@@ -37,11 +37,11 @@ stdenv.mkDerivation {
    # a second. So, tell Make to ignore nanoseconds in mtime here by
    # overriding the autoconf test for the struct.
    # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
-    ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
+    ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";

  outputs = [ "out" "man" "info" ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = "https://www.gnu.org/software/make/";
    description = "A tool to control the generation of non-source files from sources";
    license = licenses.gpl3Plus;
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
+{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:

 assert guileSupport -> ( pkg-config != null && guile != null );

@@ -21,10 +21,10 @@ stdenv.mkDerivation {
    ./impure-dirs.patch
  ];

-  nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ];
-  buildInputs = stdenv.lib.optionals guileSupport [ guile ];
+  nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];
+  buildInputs = lib.optionals guileSupport [ guile ];

-  configureFlags = stdenv.lib.optional guileSupport "--with-guile"
+  configureFlags = lib.optional guileSupport "--with-guile"

    # Make uses this test to decide whether it should keep track of
    # subseconds. Apple made this possible with APFS and macOS 10.13.
@@ -33,11 +33,11 @@ stdenv.mkDerivation {
    # a second. So, tell Make to ignore nanoseconds in mtime here by
    # overriding the autoconf test for the struct.
    # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
-    ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
+    ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";

  outputs = [ "out" "man" "info" ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = "https://www.gnu.org/software/make/";
    description = "A tool to control the generation of non-source files from sources";
    license = licenses.gpl3Plus;
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
+{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:

 rec {
  gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation {
@@ -46,8 +46,8 @@ rec {
        build-by-convention behavior.
      '';
      homepage = "http://www.gradle.org/";
-      license = stdenv.lib.licenses.asl20;
-      platforms = stdenv.lib.platforms.unix;
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.unix;
    };
  };

@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
  meta = {
    inherit (src.meta) homepage;
    description = "A better make, inspired by djb's redo";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.timbertson ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.lgpl2Plus;
+    maintainers = [ lib.maintainers.timbertson ];
+    platforms = lib.platforms.all;
  };
 }
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }:
+{ lib, stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }:

 stdenv.mkDerivation rec {
  pname = "icmake";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     --prefix PATH : ${ncurses}/bin
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "A program maintenance (make) utility using a C-like grammar";
    homepage = "https://fbb-git.gitlab.io/icmake/";
    license = licenses.gpl3;
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, yacc }:
+{ lib, stdenv, fetchurl, yacc }:

 stdenv.mkDerivation rec {
  name = "jam-2.6.1";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = "https://www.perforce.com/resources/documentation/jam";
    license = licenses.free;
    description = "Just Another Make";
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:

 stdenv.mkDerivation {
  pname = "kati-unstable";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
    install -D ckati $out/bin/ckati
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "An experimental GNU make clone";
    homepage = "https://github.com/google/kati";
    platforms = platforms.all;
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper
+{ lib, stdenv, fetchurl, makeWrapper
 , coreutils, jdk, rlwrap, gnupg }:

 stdenv.mkDerivation rec {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
    substituteInPlace $out/bin/lein \
      --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME"
    wrapProgram $out/bin/lein \
-      --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \
+      --prefix PATH ":" "${lib.makeBinPath [ rlwrap coreutils ]}" \
      --set LEIN_GPG ${gnupg}/bin/gpg \
      --set JAVA_CMD ${jdk}/bin/java
  '';
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "https://leiningen.org/";
    description = "Project automation for Clojure";
-    license = stdenv.lib.licenses.epl10;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ thiagokokada ];
+    license = lib.licenses.epl10;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ thiagokokada ];
  };
 }
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ lib, stdenv, fetchurl, jre, makeWrapper }:

 stdenv.mkDerivation rec {
  pname = "mill";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = "https://www.lihaoyi.com/mill";
    license = licenses.mit;
    description = "A build tool for Scala, Java and more";
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
      modules (written in Java or Scala) or through an external subprocesses.
    '';
    maintainers = with maintainers; [ scalavision ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
  };
 }
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:

 stdenv.mkDerivation {
  name = "mk-2006-01-31";
@@ -9,6 +9,6 @@ stdenv.mkDerivation {
  builder = ./builder.sh;

  meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
  };
 }
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }:
+{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }:

 let

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {

  # https://github.com/NixOS/nixpkgs/issues/38991
  # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
-  LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
+  LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux
      "${glibcLocales}/lib/locale/locale-archive";

  buildPhase = ''
@@ -122,7 +122,7 @@ EOF
    ${mono}/bin/mono Helloworld.exe | grep "Hello, world!"
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio";
    homepage = "https://github.com/mono/msbuild";
    license = licenses.mit;
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, fetchpatch, python3, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:

-with stdenv.lib;
+with lib;

 stdenv.mkDerivation rec {
  pname = "ninja";
@@ -1,6 +1,6 @@
-{ stdenv, pythonPackages }:
+{ lib, stdenv, pythonPackages }:

-with stdenv.lib;
+with lib;
 with pythonPackages;

 buildPythonApplication rec {
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, qtscript }:
+{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtscript }:

 stdenv.mkDerivation rec {
  pname = "qbs";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "A tool that helps simplify the build process for developing projects across multiple platforms";
    homepage = "https://wiki.qt.io/Qbs";
    license = licenses.lgpl3;
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, erlang }:
+{ lib, stdenv, fetchurl, erlang }:


 let
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
      variety of locations (git, hg, etc).
      '';

-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
  };
 }
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub,
+{ lib, stdenv, fetchFromGitHub,
  fetchHex, erlang,
  tree }:

@@ -135,8 +135,8 @@ stdenv.mkDerivation rec {
      variety of locations (hex.pm, git, hg, and so on).
      '';

-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ gleber tazjin ];
-    license = stdenv.lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ gleber tazjin ];
+    license = lib.licenses.asl20;
  };
 }
@@ -30,7 +30,7 @@
      --replace "/bin/ls" "ls"

    substituteInPlace t/110-compile/hello.o.do \
-      --replace "/usr/include" "${stdenv.lib.getDev stdenv.cc.libc}/include"
+      --replace "/usr/include" "${lib.getDev stdenv.cc.libc}/include"

    substituteInPlace t/200-shell/nonshelltest.do \
      --replace "/usr/bin/env perl" "${perl}/bin/perl"
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
  pname = "redo-c";
  version = "0.2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
    cp '${./Makefile}' Makefile
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "An implementation of the redo build system in portable C with zero dependencies";
    homepage = "https://github.com/leahneukirchen/redo-c";
    license = licenses.cc0;
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, coreutils }:
+{ lib, stdenv, fetchurl, makeWrapper, coreutils }:

 stdenv.mkDerivation {
  version = "4.0.4";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
    done
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Redo implementation in Bourne Shell";
    homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html";
    license  = licenses.agpl3;
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl }:
+{lib, stdenv, fetchurl, perl }:

 stdenv.mkDerivation rec {
  name = "redo-1.4";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "https://jdebp.eu./Softwares/redo/";
    description = "A system for building target files from source files";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = [ stdenv.lib.maintainers.vrthra ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.vrthra ];
+    platforms = lib.platforms.unix;
  };
 }
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline }:
+{ lib, stdenv, fetchurl, readline }:

 stdenv.mkDerivation rec {
  pname = "remake";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {

  meta = {
    homepage = "http://bashdb.sourceforge.net/remake/";
-    license = stdenv.lib.licenses.gpl3;
+    license = lib.licenses.gpl3;
    description = "GNU Make with comprehensible tracing and a debugger";
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ bjornfor ];
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ bjornfor ];
  };
 }
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:

 stdenv.mkDerivation rec {
  pname = "rocm-cmake";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "CMake modules for common build tasks for the ROCm stack";
    homepage = "https://github.com/RadeonOpenCompute/rocm-cmake";
    license = licenses.mit;
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
  pname = "samurai";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "ninja-compatible build tool written in C";
    homepage = "https://github.com/michaelforney/samurai";
    license = with licenses; [ mit asl20 ]; # see LICENSE
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript
+{ lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript
 , common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused
 , nixosTests }:

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
    install bin/sbt $out/bin

    wrapProgram $out/bin/sbt --prefix PATH : ${
-      stdenv.lib.makeBinPath [ which curl ]
+      lib.makeBinPath [ which curl ]
    }
  '';

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
      #!${stdenv.shell}
      set -xo errexit
      PATH=${
-        stdenv.lib.makeBinPath [
+        lib.makeBinPath [
          common-updater-scripts
          curl
          cacert
@@ -70,8 +70,8 @@ stdenv.mkDerivation rec {
    description =
      "A more featureful runner for sbt, the simple/scala/standard build tool";
    homepage = "https://github.com/paulp/sbt-extras";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ nequissimus puffnfresh ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ nequissimus puffnfresh ];
+    platforms = lib.platforms.unix;
  };
 }
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript
+{ lib, stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript
 , common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }:

 stdenv.mkDerivation rec {
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
    echo -java-home ${jre.home} >>conf/sbtopts
  '';

-  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ];
+  nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];

-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ zlib ];
+  buildInputs = lib.optionals stdenv.isLinux [ zlib ];

  installPhase = ''
    mkdir -p $out/share/sbt $out/bin
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
    } $out/bin/sbtn
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = "https://www.scala-sbt.org/";
    license = licenses.bsd3;
    description = "A build tool for Scala, Java and more";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
      #!${stdenv.shell}
      set -o errexit
      PATH=${
-        stdenv.lib.makeBinPath [
+        lib.makeBinPath [
          common-updater-scripts
          git
          nixfmt
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
    mv "$out/"*.1 "$out/share/man/man1/"
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "An improved, cross-platform substitute for Make";
    longDescription = ''
      SCons is an Open Source software construction tool. Think of
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , crystal_0_34
 , crystal_0_35
@@ -26,7 +26,7 @@ let
      # tries to execute git which fails spectacularly
      doCheck = false;

-      meta = with stdenv.lib; {
+      meta = with lib; {
        description = "Dependency manager for the Crystal language";
        license = licenses.asl20;
        maintainers = with maintainers; [ peterhoeg ];
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }:
+{ lib, stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }:

 stdenv.mkDerivation rec {
  pname = "tup";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {

  setupHook = ./setup-hook.sh;

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "A fast, file-based build system";
    longDescription = ''
      Tup is a file-based build system for Linux, OSX, and Windows. It inputs a list
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook
+{ lib, stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook
 # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]`
 , withTools ? null
 }:
 let
-  wafToolsArg = with stdenv.lib.strings;
+  wafToolsArg = with lib.strings;
    optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\"";
 in
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    install -D waf $out/bin/waf
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Meta build system";
    homepage    = "https://waf.io";
    license     = licenses.bsd3;